TRACE_msg_process_end(proc);
#endif
- if(msg_global)
- xbt_fifo_remove(msg_global->process_list, proc);
+ if (msg_global)
+ xbt_swag_remove(proc, msg_global->process_list);
SIMIX_process_cleanup(smx_proc);
if (proc->name) {
}
/* 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,
+ 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
process->name = xbt_strdup(name);
process->simdata = simdata;
process->data = data;
- xbt_fifo_unshift(msg_global->process_list, process);
+ xbt_swag_insert(process, msg_global->process_list);
- /* 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);
+#ifdef HAVE_TRACING
+ TRACE_msg_process_create (process);
+#endif
+
+ /* 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_fifo_remove(msg_global->process_list, process);
+ xbt_swag_remove(process, msg_global->process_list);
xbt_free(process->name);
xbt_free(process);
xbt_free(simdata);
return NULL;
}
-#ifdef HAVE_TRACING
- TRACE_msg_process_create (process);
-#endif
-
return 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_req_comm_cancel(p_simdata->waiting_task->simdata->comm);
}
- xbt_fifo_remove(msg_global->process_list, process);
+ xbt_swag_remove(process, msg_global->process_list);
SIMIX_req_process_kill(process->simdata->s_process);
return;
*/
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;
}