X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0432353f714a914f179660603a6ce728070a7ec..6d17036094433f0304c29b6f57922cee32b0c67c:/src/msg/m_process.c diff --git a/src/msg/m_process.c b/src/msg/m_process.c index c75adcc6b5..586e756134 100644 --- a/src/msg/m_process.c +++ b/src/msg/m_process.c @@ -36,25 +36,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (proc * \sa MSG_process_create_with_arguments */ m_process_t MSG_process_create(const char *name, - m_process_code_t code, void *data, + xbt_main_func_t code, void *data, m_host_t host) { return MSG_process_create_with_arguments(name, code, data, host, -1, NULL); } -static void MSG_process_cleanup(void *arg) +void __MSG_process_cleanup(void *arg) { /* arg is a pointer to a simix process, we can get the msg process with the field data */ - m_process_t proc = ((smx_process_t)arg)->data; - xbt_fifo_remove(msg_global->process_list, proc); - SIMIX_process_cleanup(arg); - free(proc->name); - proc->name = NULL; - free(proc->simdata); - proc->simdata = NULL; - free(proc); - - return; + m_process_t proc = ((smx_process_t)arg)->data; + xbt_fifo_remove(msg_global->process_list, proc); + SIMIX_process_cleanup(arg); + free(proc->name); + proc->name = NULL; + free(proc->simdata); + proc->simdata = NULL; + free(proc); + + return; } /** \ingroup m_process_management @@ -85,7 +85,7 @@ static void MSG_process_cleanup(void *arg) m_process_t __MSG_process_create_with_arguments(const char *name, - m_process_code_t code, void *data, + xbt_main_func_t code, void *data, char * hostname, int argc, char **argv) { m_host_t host = MSG_get_host_by_name(hostname); @@ -93,7 +93,7 @@ m_process_t __MSG_process_create_with_arguments(const char *name, } m_process_t MSG_process_create_with_arguments(const char *name, - m_process_code_t code, void *data, + xbt_main_func_t code, void *data, m_host_t host, int argc, char **argv) { simdata_process_t simdata = xbt_new0(s_simdata_process_t,1); @@ -106,9 +106,9 @@ m_process_t MSG_process_create_with_arguments(const char *name, simdata->m_host = host; simdata->argc = argc; simdata->argv = argv; - simdata->s_process = SIMIX_process_create(name, (smx_process_code_t)code, + simdata->s_process = SIMIX_process_create(name, code, (void*)process, host->name, argc, argv, - MSG_process_cleanup ); + __MSG_process_cleanup ); if (SIMIX_process_self()) { simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);