X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54f9d48567e65bd17b9ad3544b5aad57bef54463..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 0cfb0896ab..c3431b5efb 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -12,8 +12,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_exec, s4u_activity, "S4U asynchronous execut namespace simgrid { namespace s4u { -simgrid::xbt::signal s4u::Exec::on_start; -simgrid::xbt::signal s4u::Exec::on_completion; +xbt::signal Exec::on_start; +xbt::signal Exec::on_completion; Exec::Exec() { @@ -55,7 +55,7 @@ Exec* Exec::wait_for(double) Exec* Exec::cancel() { - simgrid::simix::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); + simix::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); state_ = State::CANCELED; return this; } @@ -90,10 +90,10 @@ ExecPtr Exec::set_timeout(double timeout) return this; } -ExecPtr Exec::set_name(std::string name) +ExecPtr Exec::set_name(const std::string& name) { xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); - name_ = std::move(name); + name_ = name; return this; } @@ -110,10 +110,10 @@ ExecPtr Exec::set_priority(double priority) return this; } -ExecPtr Exec::set_tracing_category(std::string category) +ExecPtr Exec::set_tracing_category(const std::string& category) { xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start"); - tracing_category_ = std::move(category); + tracing_category_ = category; return this; } @@ -196,9 +196,8 @@ Exec* ExecPar::start() } double ExecPar::get_remaining_ratio() { - return simgrid::simix::simcall([this]() { - return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); - }); + return simix::simcall( + [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); } double ExecPar::get_remaining()