From 4463714490dc394b7b4703969003aaab6f805851 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 18 Nov 2020 23:51:02 +0100 Subject: [PATCH] Useless std::move. --- include/simgrid/s4u/Engine.hpp | 4 ++-- src/instr/jedule/jedule_sd_binding.cpp | 2 +- src/kernel/actor/ActorImpl.cpp | 3 +-- src/kernel/routing/DragonflyZone.cpp | 2 +- src/mc/remote/RemoteSimulation.cpp | 2 +- src/mc/sosp/Snapshot.cpp | 2 +- src/mc/sosp/Snapshot_test.cpp | 6 +----- src/s4u/s4u_Actor.cpp | 4 ++-- src/s4u/s4u_Engine.cpp | 6 +++--- src/surf/HostImpl.cpp | 2 +- src/surf/sg_platf.cpp | 2 +- src/surf/xml/surfxml_sax_cb.cpp | 4 ++-- teshsuite/s4u/cloud-sharing/cloud-sharing.cpp | 2 +- 13 files changed, 18 insertions(+), 23 deletions(-) diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 141cd5d02a..6a19ccd524 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -68,14 +68,14 @@ public: code(); }); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } template void register_actor(const std::string& name, F code) { kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { return kernel::actor::ActorCode([code, args] { code(std::move(args)); }); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } void load_deployment(const std::string& deploy) const; diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp index 4ca1e45820..3d8e88779a 100644 --- a/src/instr/jedule/jedule_sd_binding.cpp +++ b/src/instr/jedule/jedule_sd_binding.cpp @@ -22,7 +22,7 @@ void jedule_log_sd_event(const_SD_task_t task) simgrid::jedule::Event event(std::string(SD_task_get_name(task)), SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD"); event.add_resources(*task->allocation); - my_jedule->add_event(std::move(event)); + my_jedule->add_event(event); } void jedule_sd_init() diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index e631755eb2..fa893bd00e 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -350,8 +350,7 @@ s4u::Actor* ActorImpl::restart() context::Context::self()->get_actor()->kill(this); // start the new actor - ActorImplPtr actor = - ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr); + ActorImplPtr actor = ActorImpl::create(arg.name, arg.code, arg.data, arg.host, arg.properties.get(), nullptr); *actor->on_exit = std::move(*arg.on_exit); actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index b6f9584697..e310310bfe 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -152,7 +152,7 @@ void DragonflyZone::generate_link(const std::string& id, int numlinks, resource: linkTemplate.bandwidths.push_back(this->bw_ * numlinks); linkTemplate.latency = this->lat_; linkTemplate.policy = this->sharing_policy_; - linkTemplate.id = std::move(id); + linkTemplate.id = id; sg_platf_new_link(&linkTemplate); XBT_DEBUG("Generating link %s", linkTemplate.id.c_str()); resource::LinkImpl* link; diff --git a/src/mc/remote/RemoteSimulation.cpp b/src/mc/remote/RemoteSimulation.cpp index 294d641ba0..ceb818df3c 100644 --- a/src/mc/remote/RemoteSimulation.cpp +++ b/src/mc/remote/RemoteSimulation.cpp @@ -535,7 +535,7 @@ void RemoteSimulation::ignore_region(std::uint64_t addr, std::size_t size) void RemoteSimulation::ignore_heap(IgnoredHeapRegion const& region) { if (ignored_heap_.empty()) { - ignored_heap_.push_back(std::move(region)); + ignored_heap_.push_back(region); return; } diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp index 5393c8fcdf..86c806c7e9 100644 --- a/src/mc/sosp/Snapshot.cpp +++ b/src/mc/sosp/Snapshot.cpp @@ -229,7 +229,7 @@ void Snapshot::add_region(RegionType type, ObjectInformation* object_info, void* auto* region = new Region(type, start_addr, size); region->object_info(object_info); - snapshot_regions_.push_back(std::unique_ptr(std::move(region))); + snapshot_regions_.push_back(std::unique_ptr(region)); } void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr address, ReadOptions options) const diff --git a/src/mc/sosp/Snapshot_test.cpp b/src/mc/sosp/Snapshot_test.cpp index 633c89af78..f253bff778 100644 --- a/src/mc/sosp/Snapshot_test.cpp +++ b/src/mc/sosp/Snapshot_test.cpp @@ -82,11 +82,7 @@ snap_test_helper::prologue_return snap_test_helper::prologue(int n) INFO("Could not allocate destination memory"); REQUIRE(source != MAP_FAILED); - return {.size = byte_size, - .src = source, - .dstn = destination, - .region0 = std::move(region0), - .region = std::move(region)}; + return {.size = byte_size, .src = source, .dstn = destination, .region0 = region0, .region = region}; } void snap_test_helper::read_whole_region() diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 5588ce955f..1fd96f9383 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -499,13 +499,13 @@ void sg_actor_start(sg_actor_t actor, xbt_main_func_t code, int argc, const char simgrid::kernel::actor::ActorCode function; if (code) function = simgrid::xbt::wrap_main(code, argc, argv); - actor->start(std::move(function)); + actor->start(function); } sg_actor_t sg_actor_create(const char* name, sg_host_t host, xbt_main_func_t code, int argc, const char* const* argv) { simgrid::kernel::actor::ActorCode function = simgrid::xbt::wrap_main(code, argc, argv); - return simgrid::s4u::Actor::init(name, host)->start(std::move(function)).get(); + return simgrid::s4u::Actor::init(name, host)->start(function).get(); } void sg_actor_set_stacksize(sg_actor_t actor, unsigned size) diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 7737a2b16d..10502f9fb1 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -96,7 +96,7 @@ void Engine::register_function(const std::string& name, int (*code)(int, char**) kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } void Engine::register_default(int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329 { @@ -109,7 +109,7 @@ void Engine::register_function(const std::string& name, const std::function args) { return xbt::wrap_main(code, std::move(args)); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } /** Registers the main function of an actor that will be launched from the deployment file */ @@ -118,7 +118,7 @@ void Engine::register_function(const std::string& name, const std::function args) { return std::bind(std::move(code), std::move(args)); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } /** Registers a function as the default main function of actors * diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 20a039421f..2f235881e0 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -113,7 +113,7 @@ std::vector HostImpl::get_disks() const void HostImpl::set_disks(const std::vector& disks, s4u::Host* host) { - disks_ = std::move(disks); + disks_ = disks; for (auto d : disks_) d->set_host(host); } diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 9095e590dd..fbded0874a 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -467,7 +467,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); simgrid::simix::Timer::set(start_time, [arg, auto_restart]() { simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create( - arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); + arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) new_actor->set_kill_time(arg->kill_time); if (auto_restart) diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index c486699284..2fcff2f40b 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -73,7 +73,7 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string& break; } } - surf_parse_error(std::move(msg)); + surf_parse_error(msg); } double surf_parse_get_double(const std::string& s) @@ -786,7 +786,7 @@ void ETag_surfxml_config() for (std::string key : keys) { if (simgrid::config::is_default(key.c_str())) { std::string cfg = key + ":" + current_property_set->at(key); - simgrid::config::set_parse(std::move(cfg)); + simgrid::config::set_parse(cfg); } else XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str()); } diff --git a/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp b/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp index 853b08dd37..5d86a64577 100644 --- a/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp +++ b/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp @@ -42,7 +42,7 @@ static int computation_fun(std::vector argv) static void run_test_process(const std::string& name, simgrid::s4u::Host* location, int size) { std::vector arg = {std::to_string(size)}; - simgrid::s4u::Actor::create(std::move(name), location, computation_fun, arg); + simgrid::s4u::Actor::create(name, location, computation_fun, arg); } static void test_energy_consumption(const std::string& name, int nb_cores) -- 2.20.1