X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..8cd3936c33b4d66eaf5dd3bdb944d72603e87c37:/src/msg/m_process.c diff --git a/src/msg/m_process.c b/src/msg/m_process.c index 185a1ed652..17904de6a9 100644 --- a/src/msg/m_process.c +++ b/src/msg/m_process.c @@ -7,7 +7,6 @@ #include "msg/private.h" #include "xbt/sysdep.h" #include "xbt/log.h" -#include "../simix/private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); @@ -27,15 +26,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, */ /******************************** Process ************************************/ -void __MSG_process_cleanup(void *arg) +void __MSG_process_cleanup(smx_process_t smx_proc) { - /* 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; + /* This function should be always be executed by the process being + * cleaned up */ + if(smx_proc != SIMIX_process_self()) + THROW_IMPOSSIBLE; + + /* arg is no longer used, just kept to avoid changing the interface */ + m_process_t proc = SIMIX_process_self_get_data(); + #ifdef HAVE_TRACING - TRACE_msg_process_end (proc); + TRACE_msg_process_end(proc); #endif - xbt_fifo_remove(msg_global->process_list, proc); - SIMIX_process_cleanup(arg); + + if (msg_global) + xbt_swag_remove(proc, msg_global->process_list); + + SIMIX_process_cleanup(smx_proc); if (proc->name) { free(proc->name); proc->name = NULL; @@ -50,14 +58,16 @@ void __MSG_process_cleanup(void *arg) } /* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */ -void *_MSG_process_create_from_SIMIX(const char *name, - xbt_main_func_t code, void *data, - char *hostname, int argc, char **argv, - xbt_dict_t properties) +void _MSG_process_create_from_SIMIX(void* process, const char *name, + xbt_main_func_t code, void *data, + char *hostname, int argc, char **argv, + xbt_dict_t properties) { m_host_t host = MSG_get_host_by_name(hostname); - return (void *) MSG_process_create_with_environment(name, code, data, host, - argc, argv, properties); + m_process_t p = MSG_process_create_with_environment(name, code, data, + host, argc, argv, + properties); + *((m_process_t*) process) = p; } /** \ingroup m_process_management @@ -142,17 +152,8 @@ m_process_t MSG_process_create_with_environment(const char *name, { simdata_process_t simdata = NULL; m_process_t process = xbt_new0(s_m_process_t, 1); - smx_process_t smx_process = NULL; xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters"); - smx_process = SIMIX_process_create(name, code, - (void *) process, host->name, - argc, argv, properties); - if (!smx_process) { - xbt_free(process); - return NULL; - } - simdata = xbt_new0(s_simdata_process_t, 1); /* Simulator Data */ @@ -162,31 +163,46 @@ m_process_t MSG_process_create_with_environment(const char *name, simdata->m_host = host; simdata->argc = argc; simdata->argv = argv; - simdata->s_process = smx_process; if (SIMIX_process_self()) { - simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data); + simdata->PPID = MSG_process_get_PID(SIMIX_process_self_get_data()); } else { simdata->PPID = -1; } simdata->last_errno = MSG_OK; - /* Process structure */ process->name = xbt_strdup(name); process->simdata = simdata; process->data = data; + xbt_swag_insert(process, msg_global->process_list); - xbt_fifo_unshift(msg_global->process_list, process); +#ifdef HAVE_TRACING + TRACE_msg_process_create (process); +#endif - return process; + /* Let's create the process: SIMIX may decide to start it right now, + * even before returning the flow control to us */ + SIMIX_req_process_create(&simdata->s_process, name, code, (void *) process, host->name, + argc, argv, properties); + if (!simdata->s_process) { + /* Undo everything we have just changed */ + msg_global->PID--; + xbt_swag_remove(process, msg_global->process_list); + xbt_free(process->name); + xbt_free(process); + xbt_free(simdata); + return NULL; + } + + return process; } void _MSG_process_kill_from_SIMIX(void *p) { #ifdef HAVE_TRACING - TRACE_msg_process_kill ((m_process_t) p); + TRACE_msg_process_kill((m_process_t) p); #endif MSG_process_kill((m_process_t) p); } @@ -201,24 +217,18 @@ void MSG_process_kill(m_process_t process) simdata_process_t p_simdata = process->simdata; #ifdef HAVE_TRACING - TRACE_msg_process_kill (process); + TRACE_msg_process_kill(process); #endif DEBUG3("Killing %s(%d) on %s", process->name, p_simdata->PID, p_simdata->m_host->name); if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) { - SIMIX_communication_cancel(p_simdata->waiting_task->simdata->comm); + SIMIX_req_comm_cancel(p_simdata->waiting_task->simdata->comm); } - if (p_simdata->waiting_action) { - DEBUG1("Canceling waiting task %s", - SIMIX_action_get_name(p_simdata->waiting_action)); - SIMIX_action_cancel(p_simdata->waiting_action); - } - - xbt_fifo_remove(msg_global->process_list, process); - SIMIX_process_kill(process->simdata->s_process); + xbt_swag_remove(process, msg_global->process_list); + SIMIX_req_process_kill(process->simdata->s_process); return; } @@ -235,9 +245,9 @@ MSG_error_t MSG_process_change_host(m_host_t host) m_host_t now = process->simdata->m_host; process->simdata->m_host = host; #ifdef HAVE_TRACING - TRACE_msg_process_change_host (process, now, host); + TRACE_msg_process_change_host(process, now, host); #endif - SIMIX_process_change_host(process->simdata->s_process, now->name, + SIMIX_req_process_change_host(process->simdata->s_process, now->name, host->name); return MSG_OK; } @@ -295,10 +305,9 @@ m_host_t MSG_process_get_host(m_process_t process) */ m_process_t MSG_process_from_PID(int PID) { - xbt_fifo_item_t i = NULL; m_process_t process = NULL; - xbt_fifo_foreach(msg_global->process_list, i, process, m_process_t) { + xbt_swag_foreach(process, msg_global->process_list) { if (MSG_process_get_PID(process) == PID) return process; } @@ -373,7 +382,7 @@ xbt_dict_t MSG_process_get_properties(m_process_t process) { xbt_assert0((process != NULL), "Invalid parameters"); - return (SIMIX_process_get_properties + return (SIMIX_req_process_get_properties (((simdata_process_t) process->simdata)->s_process)); } @@ -406,13 +415,9 @@ int MSG_process_self_PPID(void) */ m_process_t MSG_process_self(void) { - smx_process_t proc = SIMIX_process_self(); - if (proc != NULL) { - return (m_process_t) proc->data; - } else { - return NULL; - } - + /* we cannot make a SIMIX request here because this may create an exception or a logging + event, and both mechanisms call MSG_process_self() again (via xbt_getpid()) */ + return (m_process_t) SIMIX_process_self_get_data(); } /** \ingroup m_process_management @@ -428,10 +433,10 @@ MSG_error_t MSG_process_suspend(m_process_t process) CHECK_HOST(); #ifdef HAVE_TRACING - TRACE_msg_process_suspend (process); + TRACE_msg_process_suspend(process); #endif - SIMIX_process_suspend(process->simdata->s_process); + SIMIX_req_process_suspend(process->simdata->s_process); MSG_RETURN(MSG_OK); } @@ -449,10 +454,10 @@ MSG_error_t MSG_process_resume(m_process_t process) CHECK_HOST(); #ifdef HAVE_TRACING - TRACE_msg_process_resume (process); + TRACE_msg_process_resume(process); #endif - SIMIX_process_resume(process->simdata->s_process); + SIMIX_req_process_resume(process->simdata->s_process); MSG_RETURN(MSG_OK); } @@ -466,5 +471,10 @@ int MSG_process_is_suspended(m_process_t process) { xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); - return SIMIX_process_is_suspended(process->simdata->s_process); + return SIMIX_req_process_is_suspended(process->simdata->s_process); +} + + +smx_context_t MSG_process_get_smx_ctx(m_process_t process) { + return SIMIX_process_get_context(process->simdata->s_process); }