X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fdff8d6a639190cfc5be5b33105dab51c3c0c6d..bb1ec3ebdc8aad0b788cfded0ca9bf7b071a6721:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index d02ae9c7ae..72f92071b5 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -10,6 +10,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); +SG_BEGIN_DECL() + /** @addtogroup m_process_management * * Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing @@ -24,42 +26,35 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (proc * \brief Cleans the MSG data of a process. * \param smx_proc a SIMIX process */ -void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc) +void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor) { - simdata_process_t msg_proc; + simgrid::MsgActorExt* msg_actor; // get the MSG process from the SIMIX process - if (smx_proc == SIMIX_process_self()) { + if (smx_actor == SIMIX_process_self()) { /* avoid a SIMIX request if this function is called by the process itself */ - msg_proc = (simdata_process_t) SIMIX_process_self_get_data(); + msg_actor = (simgrid::MsgActorExt*)SIMIX_process_self_get_data(); SIMIX_process_self_set_data(nullptr); } else { - msg_proc = (simdata_process_t) simcall_process_get_data(smx_proc); - simcall_process_set_data(smx_proc, nullptr); + msg_actor = (simgrid::MsgActorExt*)smx_actor->data; + simcall_process_set_data(smx_actor, nullptr); } - TRACE_msg_process_destroy(smx_proc->name.c_str(), smx_proc->pid); + TRACE_msg_process_destroy(smx_actor->name.c_str(), smx_actor->pid); // free the data if a function was provided - if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) { - msg_global->process_data_cleanup(msg_proc->data); + if (msg_actor && msg_actor->data && msg_global->process_data_cleanup) { + msg_global->process_data_cleanup(msg_actor->data); } - // free the MSG process - xbt_free(msg_proc); - SIMIX_process_cleanup(smx_proc); + delete msg_actor; + SIMIX_process_cleanup(smx_actor); } /* 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, sg_host_t host, - double kill_time, xbt_dict_t properties, - int auto_restart, smx_actor_t parent_process) +smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function code, void* data, sg_host_t host, + xbt_dict_t properties, smx_actor_t parent_process) { - 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); - } + msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties); return p; } @@ -128,50 +123,33 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun std::function function; if (code) function = simgrid::xbt::wrapMain(code, argc, const_cast(argv)); - msg_process_t res = MSG_process_create_with_environment(name, - std::move(function), data, host, properties); + msg_process_t res = MSG_process_create_from_stdfunc(name, std::move(function), data, host, properties); for (int i = 0; i != argc; ++i) xbt_free(argv[i]); xbt_free(argv); return res; } -msg_process_t MSG_process_create_with_environment( - const char *name, std::function code, void *data, - msg_host_t host, xbt_dict_t properties) +SG_END_DECL() + +msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, + xbt_dict_t properties) { xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1); - msg_process_t process; - - /* Simulator data for MSG */ - simdata->waiting_action = nullptr; - simdata->waiting_task = nullptr; - simdata->m_host = host; - simdata->data = data; - 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 = simcall_process_create( - name, std::move(code), simdata, host, -1, properties, 0); - - if (!process) { - /* Undo everything we have just changed */ - xbt_free(simdata); + simgrid::MsgActorExt* msgExt = new simgrid::MsgActorExt(data); + + msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, properties); + + if (!process) { /* Undo everything */ + delete msgExt; return nullptr; } - else { - simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process); - } + + simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process); return process; } -static int MSG_maestro(int argc, char** argv) -{ - int res = MSG_main(); - return res; -} +SG_BEGIN_DECL() /* Become a process in the simulation * @@ -183,18 +161,10 @@ static int MSG_maestro(int argc, char** argv) msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, xbt_dict_t properties) { xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1); - msg_process_t process; - - /* Simulator data for MSG */ - simdata->waiting_action = nullptr; - simdata->waiting_task = nullptr; - simdata->m_host = host; - simdata->data = data; - 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, host->cname(), properties, nullptr); + msg_process_t process = + SIMIX_process_attach(name, new simgrid::MsgActorExt(data), 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); @@ -241,10 +211,7 @@ msg_error_t MSG_process_join(msg_process_t process, double timeout){ */ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) { - simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process); - simdata->m_host = host; - msg_host_t now = simdata->m_host; - TRACE_msg_process_change_host(process, now, host); + TRACE_msg_process_change_host(process, MSG_process_get_host(process), host); simcall_process_set_host(process, host); return MSG_OK; } @@ -265,9 +232,9 @@ void* MSG_process_get_data(msg_process_t process) xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!"); /* get from SIMIX the MSG process data, and then the user data */ - simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process); - if (simdata) - return simdata->data; + simgrid::MsgActorExt* msgExt = (simgrid::MsgActorExt*)process->data; + if (msgExt) + return msgExt->data; else return nullptr; } @@ -281,8 +248,7 @@ msg_error_t MSG_process_set_data(msg_process_t process, void *data) { xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!"); - simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process); - simdata->data = data; + static_cast(process->data)->data = data; return MSG_OK; } @@ -302,14 +268,11 @@ XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) { */ msg_host_t MSG_process_get_host(msg_process_t process) { - simdata_process_t simdata; if (process == nullptr) { - simdata = (simdata_process_t) SIMIX_process_self_get_data(); - } - else { - simdata = (simdata_process_t) simcall_process_get_data(process); + return MSG_process_self()->host; + } else { + return process->host; } - return simdata ? simdata->m_host : nullptr; } /** \ingroup m_process_management @@ -502,3 +465,5 @@ XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_re XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) { return simcall_process_restart(process); } + +SG_END_DECL()