X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11ae3bfac7b4c85a23e220b9d0755449a622a37b..b2f3150048cd87c9e16e251fea65c40221fd56ea:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 7a53a102dd..fbd34dc674 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -35,9 +35,8 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, { // TODO, when autorestart is used, the std::function is copied so the new // instance will get a fresh (reinitialized) state. Is this what we want? - smx_process_t process = simcall_process_create( - name, std::move(code), nullptr, host->name().c_str(), - killTime, nullptr, 0); + smx_actor_t process = simcall_process_create( + name, std::move(code), nullptr, host, killTime, nullptr, 0); return ActorPtr(&process->getIface()); } @@ -46,9 +45,8 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, { simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); simgrid::simix::ActorCode code = factory(std::move(args)); - smx_process_t process = simcall_process_create( - name, std::move(code), nullptr, host->name().c_str(), - killTime, nullptr, 0); + smx_actor_t process = simcall_process_create( + name, std::move(code), nullptr, host, killTime, nullptr, 0); return ActorPtr(&process->getIface()); } @@ -97,7 +95,7 @@ void Actor::kill(int pid) { } } -smx_process_t Actor::getImpl() { +smx_actor_t Actor::getImpl() { return pimpl_; } @@ -109,7 +107,7 @@ void Actor::kill() { ActorPtr Actor::forPid(int pid) { - smx_process_t process = SIMIX_process_from_PID(pid); + smx_actor_t process = SIMIX_process_from_PID(pid); if (process != nullptr) return ActorPtr(&process->getIface()); else