X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbf96d959e4912fe445823b75cf102a0e89131e2..7d27e3c81e8c611946aaea9de4edc2714b40be8a:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index ada529cc80..6189fe77ba 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -6,11 +6,10 @@ #include +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/functional.hpp" - -#include "msg_private.hpp" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.h" @@ -57,13 +56,11 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc) /* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */ smx_actor_t MSG_process_create_from_SIMIX( - const char *name, std::function code, void *data, const char *hostname, + const char *name, std::function code, void *data, sg_host_t host, double kill_time, xbt_dict_t properties, int auto_restart, smx_actor_t parent_process) { - msg_host_t host = MSG_host_by_name(hostname); - msg_process_t p = MSG_process_create_with_environment( - name, std::move(code), data, host, properties); + msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties); if (p) { MSG_process_set_kill_time(p,kill_time); MSG_process_auto_restart_set(p,auto_restart); @@ -162,7 +159,7 @@ msg_process_t MSG_process_create_with_environment( /* Let's create the process: SIMIX may decide to start it right now, * even before returning the flow control to us */ process = simcall_process_create( - name, std::move(code), simdata, sg_host_get_name(host), -1, properties, 0); + name, std::move(code), simdata, host, -1, properties, 0); if (!process) { /* Undo everything we have just changed */ @@ -202,7 +199,7 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, simdata->last_errno = MSG_OK; /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */ - process = SIMIX_process_attach(name, simdata, sg_host_get_name(host), properties, nullptr); + process = SIMIX_process_attach(name, simdata, host->cname(), properties, nullptr); if (!process) xbt_die("Could not attach"); simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);