#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)");
*/
/******************************** 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;
}
/* 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
{
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 */
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);
}
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",
+ XBT_DEBUG("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;
}
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;
}
*/
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;
}
{
xbt_assert0((process != NULL), "Invalid parameters");
- return (SIMIX_process_get_properties
+ return (SIMIX_req_process_get_properties
(((simdata_process_t) process->simdata)->s_process));
}
*/
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
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);
}
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);
}
{
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);
}
