X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8dc7c0693d2606e9cb9f21bcced90a5174bd503..412a7b3712a71356caefcff17c554dbdd22284d2:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 161321033c..a599e878da 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -19,6 +19,7 @@ #include "src/surf/cpu_interface.hpp" #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); @@ -57,7 +58,7 @@ int get_maxpid() return maxpid; } -ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this) +ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this) { pid_ = maxpid++; simcall.issuer_ = this; @@ -296,7 +297,7 @@ void ActorImpl::yield() xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls."); suspended_ = false; - suspend(this); + suspend(); } if (exception_ != nullptr) { @@ -356,7 +357,7 @@ s4u::Actor* ActorImpl::restart() return actor->ciface(); } -void ActorImpl::suspend(ActorImpl* issuer) +void ActorImpl::suspend() { if (suspended_) { XBT_DEBUG("Actor '%s' is already suspended", get_cname()); @@ -367,7 +368,7 @@ void ActorImpl::suspend(ActorImpl* issuer) /* If the suspended actor is waiting on a sync, suspend its synchronization. */ if (waiting_synchro == nullptr) { - activity::ExecImpl* exec = new activity::ExecImpl(); + auto exec = new activity::ExecImpl(); exec->set_name("suspend").set_host(host_).set_flops_amount(0.0).start(); waiting_synchro = activity::ExecImplPtr(exec); @@ -412,8 +413,8 @@ activity::ActivityImplPtr ActorImpl::sleep(double duration) throw_exception(std::make_exception_ptr(simgrid::HostFailureException( XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); - activity::SleepImpl* sleep = new activity::SleepImpl(); - (*sleep).set_name("sleep").set_host(host_).set_duration(duration).start(); + auto sleep = new activity::SleepImpl(); + sleep->set_name("sleep").set_host(host_).set_duration(duration).start(); return activity::SleepImplPtr(sleep); } @@ -556,7 +557,7 @@ int SIMIX_process_count() return simix_global->process_list.size(); } -void* SIMIX_process_self_get_data() // deprecated +void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); @@ -566,7 +567,7 @@ void* SIMIX_process_self_get_data() // deprecated return self->get_user_data(); } -void SIMIX_process_self_set_data(void* data) // deprecated +void SIMIX_process_self_set_data(void* data) { SIMIX_process_self()->set_user_data(data); }