X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d17a58bd84c5a28373c06bc2bc1e0026997f708..83eac0d2fba299311b07779b4de686124ce0905b:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 6176ef7954..010aff431f 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -35,7 +35,7 @@ s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv) : s4u::Actor::Actor(name,host, argc,argv, -1) { } s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv, double killTime) { - p_smx_process = simcall_process_create(name, s4u_actor_runner, this, host->name(), killTime, argc, argv, NULL/*properties*/,0); + p_smx_process = simcall_process_create(name, s4u_actor_runner, this, host->name().c_str(), killTime, argc, argv, NULL/*properties*/,0); xbt_assert(p_smx_process,"Cannot create the actor"); // TRACE_msg_process_create(procname, simcall_process_get_PID(p_smx_process), host->getInferior()); @@ -62,7 +62,7 @@ void s4u::Actor::setAutoRestart(bool autorestart) { } s4u::Host *s4u::Actor::getHost() { - return s4u::Host::byName(sg_host_get_name(simcall_process_get_host(p_smx_process))); + return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(p_smx_process))); } const char* s4u::Actor::getName() { return simcall_process_get_name(p_smx_process); @@ -89,8 +89,8 @@ void s4u::Actor::sleep(double duration) { } e_smx_state_t s4u::Actor::execute(double flops) { - smx_synchro_t s = simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/); - return simcall_process_execution_wait(s); + smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/); + return simcall_execution_wait(s); } void *s4u::Actor::recv(Mailbox &chan) {