X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ce8957cfe6f904f244fdd79731800f0c61e50b0..f345bad939eef8e6f417c39a3d3e5fd45ca492ba:/src/msg/m_process.c diff --git a/src/msg/m_process.c b/src/msg/m_process.c index c168bbf1f4..0084efddd8 100644 --- a/src/msg/m_process.c +++ b/src/msg/m_process.c @@ -1,8 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2002-2007 Arnaud Legrand. */ -/* Copyright (c) 2007 Bruno Donassolo. */ -/* All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -10,10 +7,9 @@ #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)"); + "Logging specific to MSG (process)"); /** \defgroup m_process_management Management Functions of Agents * \brief This section describes the agent structure of MSG @@ -30,16 +26,23 @@ 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; + m_process_t proc = SIMIX_req_process_get_data(smx_proc); +#ifdef HAVE_TRACING + TRACE_msg_process_end(proc); +#endif xbt_fifo_remove(msg_global->process_list, proc); - SIMIX_process_cleanup(arg); - free(proc->name); - proc->name = NULL; - free(proc->simdata); - proc->simdata = NULL; + SIMIX_process_cleanup(smx_proc); + if (proc->name) { + free(proc->name); + proc->name = NULL; + } + if (proc->simdata) { + free(proc->simdata); + proc->simdata = NULL; + } free(proc); return; @@ -47,12 +50,14 @@ 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) + 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); + return (void *) MSG_process_create_with_environment(name, code, data, + host, argc, argv, + properties); } /** \ingroup m_process_management @@ -63,11 +68,11 @@ void *_MSG_process_create_from_SIMIX(const char *name, * \sa MSG_process_create_with_arguments */ m_process_t MSG_process_create(const char *name, - xbt_main_func_t code, void *data, - m_host_t host) + xbt_main_func_t code, void *data, + m_host_t host) { return MSG_process_create_with_environment(name, code, data, host, -1, - NULL,NULL); + NULL, NULL); } /** \ingroup m_process_management @@ -96,12 +101,12 @@ m_process_t MSG_process_create(const char *name, */ m_process_t MSG_process_create_with_arguments(const char *name, - xbt_main_func_t code, - void *data, m_host_t host, - int argc, char **argv) + xbt_main_func_t code, + void *data, m_host_t host, + int argc, char **argv) { return MSG_process_create_with_environment(name, code, data, host, - argc,argv,NULL); + argc, argv, NULL); } /** \ingroup m_process_management @@ -130,45 +135,60 @@ m_process_t MSG_process_create_with_arguments(const char *name, * \return The new corresponding object. */ m_process_t MSG_process_create_with_environment(const char *name, - xbt_main_func_t code, - void *data, m_host_t host, - int argc, char **argv, xbt_dict_t properties) + xbt_main_func_t code, + void *data, m_host_t host, + int argc, char **argv, + xbt_dict_t properties) { - simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1); + simdata_process_t simdata = NULL; m_process_t process = xbt_new0(s_m_process_t, 1); xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters"); + simdata = xbt_new0(s_simdata_process_t, 1); + /* Simulator Data */ simdata->PID = msg_global->PID++; + simdata->waiting_action = NULL; simdata->waiting_task = NULL; simdata->m_host = host; simdata->argc = argc; simdata->argv = argv; - simdata->s_process = SIMIX_process_create(name, code, - (void *) process, host->name, - argc, argv, properties); 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_fifo_unshift(msg_global->process_list, process); - return process; + /* Let's create the process (SIMIX may decide to start it right now) */ + simdata->s_process = SIMIX_req_process_create(name, code, (void *) process, host->name, + argc, argv, properties); + + if (!simdata->s_process) { + /* Undo everything we have just changed */ + msg_global->PID--; + xbt_fifo_remove(msg_global->process_list, process); + 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); +#endif MSG_process_kill((m_process_t) p); } @@ -181,20 +201,19 @@ void MSG_process_kill(m_process_t process) { simdata_process_t p_simdata = process->simdata; +#ifdef HAVE_TRACING + 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) { - DEBUG1("Canceling waiting task %s", p_simdata->waiting_task->name); - if (p_simdata->waiting_task->simdata->compute) { - SIMIX_action_cancel(p_simdata->waiting_task->simdata->compute); - } else if (p_simdata->waiting_task->simdata->comm) { - SIMIX_action_cancel(p_simdata->waiting_task->simdata->comm); - } - } + process->name, p_simdata->PID, p_simdata->m_host->name); + if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) { + SIMIX_req_comm_cancel(p_simdata->waiting_task->simdata->comm); + } + xbt_fifo_remove(msg_global->process_list, process); - SIMIX_process_kill(process->simdata->s_process); + SIMIX_req_process_kill(process->simdata->s_process); return; } @@ -210,7 +229,11 @@ MSG_error_t MSG_process_change_host(m_host_t host) m_process_t process = MSG_process_self(); m_host_t now = process->simdata->m_host; process->simdata->m_host = host; - SIMIX_process_change_host(process->simdata->s_process, now->name, host->name); +#ifdef HAVE_TRACING + TRACE_msg_process_change_host(process, now, host); +#endif + SIMIX_req_process_change_host(process->simdata->s_process, now->name, + host->name); return MSG_OK; } @@ -236,7 +259,6 @@ void *MSG_process_get_data(m_process_t process) MSG_error_t MSG_process_set_data(m_process_t process, void *data) { xbt_assert0((process != NULL), "Invalid parameters"); - xbt_assert0((process->data == NULL), "Data already set"); process->data = data; @@ -253,7 +275,7 @@ MSG_error_t MSG_process_set_data(m_process_t process, void *data) m_host_t MSG_process_get_host(m_process_t process) { xbt_assert0(((process != NULL) - && (process->simdata)), "Invalid parameters"); + && (process->simdata)), "Invalid parameters"); return (((simdata_process_t) process->simdata)->m_host); } @@ -304,7 +326,7 @@ int MSG_process_get_PID(m_process_t process) int MSG_process_get_PPID(m_process_t process) { xbt_assert0(((process != NULL) - && (process->simdata)), "Invalid parameters"); + && (process->simdata)), "Invalid parameters"); return (((simdata_process_t) process->simdata)->PPID); } @@ -317,8 +339,9 @@ int MSG_process_get_PPID(m_process_t process) */ const char *MSG_process_get_name(m_process_t process) { - xbt_assert0(((process != NULL) - && (process->simdata)), "Invalid parameters"); + xbt_assert0(process, "Invalid parameter: process is NULL"); + xbt_assert0(process->simdata, + "Invalid parameter: process->simdata is NULL"); return (process->name); } @@ -330,7 +353,8 @@ const char *MSG_process_get_name(m_process_t process) * \param name a property name * \return value of a property (or NULL if the property is not set) */ -const char* MSG_process_get_property_value(m_process_t process, const char* name) +const char *MSG_process_get_property_value(m_process_t process, + const char *name) { return xbt_dict_get_or_null(MSG_process_get_properties(process), name); } @@ -342,9 +366,10 @@ const char* MSG_process_get_property_value(m_process_t process, const char* name */ xbt_dict_t MSG_process_get_properties(m_process_t process) { - xbt_assert0((process != NULL), "Invalid parameters"); + xbt_assert0((process != NULL), "Invalid parameters"); - return (SIMIX_process_get_properties(((simdata_process_t)process->simdata)->s_process)); + return (SIMIX_req_process_get_properties + (((simdata_process_t) process->simdata)->s_process)); } @@ -376,13 +401,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 @@ -394,10 +415,14 @@ m_process_t MSG_process_self(void) MSG_error_t MSG_process_suspend(m_process_t process) { xbt_assert0(((process != NULL) - && (process->simdata)), "Invalid parameters"); + && (process->simdata)), "Invalid parameters"); CHECK_HOST(); - SIMIX_process_suspend(process->simdata->s_process); +#ifdef HAVE_TRACING + TRACE_msg_process_suspend(process); +#endif + + SIMIX_req_process_suspend(process->simdata->s_process); MSG_RETURN(MSG_OK); } @@ -411,10 +436,14 @@ MSG_error_t MSG_process_resume(m_process_t process) { xbt_assert0(((process != NULL) - && (process->simdata)), "Invalid parameters"); + && (process->simdata)), "Invalid parameters"); CHECK_HOST(); - SIMIX_process_resume(process->simdata->s_process); +#ifdef HAVE_TRACING + TRACE_msg_process_resume(process); +#endif + + SIMIX_req_process_resume(process->simdata->s_process); MSG_RETURN(MSG_OK); } @@ -427,6 +456,11 @@ MSG_error_t MSG_process_resume(m_process_t process) 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); + && (process->simdata)), "Invalid parameters"); + 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); }