Repository: mesos Updated Branches: refs/heads/master e37442578 -> 631ed6412
Avoid various redundant copies. Spotted using the "performance-unnecessary-copy-initialization" clang-tidy check. Review: https://reviews.apache.org/r/58040 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ce5cb6c1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ce5cb6c1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ce5cb6c1 Branch: refs/heads/master Commit: ce5cb6c186ff83737ef67da372a770a52bbce057 Parents: e374425 Author: Neil Conway <[email protected]> Authored: Tue Mar 14 11:55:36 2017 -0700 Committer: Neil Conway <[email protected]> Committed: Mon Apr 3 11:40:55 2017 -0700 ---------------------------------------------------------------------- src/examples/dynamic_reservation_framework.cpp | 4 ++-- src/master/master.cpp | 6 +++--- src/master/master.hpp | 4 ++-- src/oci/spec.cpp | 2 +- src/tests/default_executor_tests.cpp | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ce5cb6c1/src/examples/dynamic_reservation_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/dynamic_reservation_framework.cpp b/src/examples/dynamic_reservation_framework.cpp index c1650dc..4122814 100644 --- a/src/examples/dynamic_reservation_framework.cpp +++ b/src/examples/dynamic_reservation_framework.cpp @@ -303,7 +303,7 @@ private: Resource::ReservationInfo reservationInfo; Resources taskResources; - Offer::Operation RESERVE(Resources resources) + Offer::Operation RESERVE(const Resources& resources) { Offer::Operation operation; operation.set_type(Offer::Operation::RESERVE); @@ -311,7 +311,7 @@ private: return operation; } - Offer::Operation UNRESERVE(Resources resources) + Offer::Operation UNRESERVE(const Resources& resources) { Offer::Operation operation; operation.set_type(Offer::Operation::UNRESERVE); http://git-wip-us.apache.org/repos/asf/mesos/blob/ce5cb6c1/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index ab071f5..a985465 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -144,7 +144,7 @@ public: const SlaveID& _slaveId, const PID<Master>& _master, const Option<shared_ptr<RateLimiter>>& _limiter, - const shared_ptr<Metrics> _metrics, + const shared_ptr<Metrics>& _metrics, const Duration& _slavePingTimeout, const size_t _maxSlavePingTimeouts) : ProcessBase(process::ID::generate("slave-observer")), @@ -9017,8 +9017,8 @@ Slave::Slave( const vector<SlaveInfo::Capability>& _capabilites, const Time& _registeredTime, const Resources& _checkpointedResources, - const vector<ExecutorInfo> executorInfos, - const vector<Task> tasks) + const vector<ExecutorInfo>& executorInfos, + const vector<Task>& tasks) : master(_master), id(_info.id()), info(_info), http://git-wip-us.apache.org/repos/asf/mesos/blob/ce5cb6c1/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index 98364d7..1b07742 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -122,9 +122,9 @@ struct Slave const std::vector<SlaveInfo::Capability>& _capabilites, const process::Time& _registeredTime, const Resources& _checkpointedResources, - const std::vector<ExecutorInfo> executorInfos = + const std::vector<ExecutorInfo>& executorInfos = std::vector<ExecutorInfo>(), - const std::vector<Task> tasks = + const std::vector<Task>& tasks = std::vector<Task>()); ~Slave(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ce5cb6c1/src/oci/spec.cpp ---------------------------------------------------------------------- diff --git a/src/oci/spec.cpp b/src/oci/spec.cpp index 06fceb4..6cb3255 100644 --- a/src/oci/spec.cpp +++ b/src/oci/spec.cpp @@ -192,7 +192,7 @@ Try<Index> parse(const string& s) return Error("Expecting 'manifest' to be JSON object type"); } - const JSON::Object manifest = value.as<JSON::Object>(); + const JSON::Object& manifest = value.as<JSON::Object>(); Result<JSON::String> digest = manifest.at<JSON::String>("digest"); if (digest.isError()) { return Error("Failed to find 'digest': " + digest.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/ce5cb6c1/src/tests/default_executor_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp index 6dadd89..452bab1 100644 --- a/src/tests/default_executor_tests.cpp +++ b/src/tests/default_executor_tests.cpp @@ -179,7 +179,7 @@ TEST_P(DefaultExecutorTest, TaskRunning) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); v1::TaskInfo taskInfo = v1::createTask(agentId, resources, SLEEP_COMMAND(1000)); @@ -312,7 +312,7 @@ TEST_P(DefaultExecutorTest, KillTask) EXPECT_NE(0, offers1->offers().size()); const v1::Offer& offer1 = offers1->offers(0); - const v1::AgentID agentId = offer1.agent_id(); + const v1::AgentID& agentId = offer1.agent_id(); v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, SLEEP_COMMAND(1000)); @@ -599,7 +599,7 @@ TEST_P(DefaultExecutorTest, KillTaskGroupOnTaskFailure) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); // The first task exits with a non-zero status code. v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "exit 1"); @@ -778,7 +778,7 @@ TEST_P(DefaultExecutorTest, TaskUsesExecutor) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); v1::TaskInfo taskInfo = v1::createTask(agentId, resources, SLEEP_COMMAND(1000)); @@ -995,7 +995,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorTest, CommitSuicideOnTaskFailure) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); // The task exits with a non-zero status code. v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "exit 1"); @@ -1131,7 +1131,7 @@ TEST_P(DefaultExecutorTest, CommitSuicideOnKillTask) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); // The first task finishes successfully while the second // task is explicitly killed later. @@ -1336,7 +1336,7 @@ TEST_P(DefaultExecutorTest, ReservedResources) EXPECT_NE(0, offers->offers().size()); const v1::Offer& offer = offers->offers(0); - const v1::AgentID agentId = offer.agent_id(); + const v1::AgentID& agentId = offer.agent_id(); // Launch the task using unreserved resources. v1::TaskInfo taskInfo =
