X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4814a9f448c5eeac2272ee04d2ef88810ccc951..7a7d635337f769993338c2a737bcd6a3a8f949ee:/src/msg/msg_process.c diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c index ddce625a76..097cfaa4a5 100644 --- a/src/msg/msg_process.c +++ b/src/msg/msg_process.c @@ -162,7 +162,6 @@ msg_process_t MSG_process_create_with_environment(const char *name, msg_process_t process; /* Simulator data for MSG */ - simdata->PID = msg_global->PID++; simdata->waiting_action = NULL; simdata->waiting_task = NULL; simdata->m_host = host; @@ -171,23 +170,17 @@ msg_process_t MSG_process_create_with_environment(const char *name, simdata->data = data; simdata->last_errno = MSG_OK; - if (SIMIX_process_self()) { - simdata->PPID = MSG_process_get_PID(MSG_process_self()); - } else { - simdata->PPID = -1; - } - -#ifdef HAVE_TRACING - TRACE_msg_process_create(name, simdata->PID, simdata->m_host); -#endif /* Let's create the process: SIMIX may decide to start it right now, * even before returning the flow control to us */ - simcall_process_create(&process, name, code, simdata, SIMIX_host_get_name(host->smx_host), -1, + simcall_process_create(&process, name, code, simdata, sg_host_name(host), -1, argc, argv, properties,0); + #ifdef HAVE_TRACING + TRACE_msg_process_create(name, simcall_process_get_PID(process), simdata->m_host); + #endif + if (!process) { /* Undo everything we have just changed */ - msg_global->PID--; xbt_free(simdata); return NULL; } @@ -231,7 +224,7 @@ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) msg_host_t now = simdata->m_host; TRACE_msg_process_change_host(process, now, host); #endif - simcall_process_change_host(process, host->smx_host); + simcall_process_change_host(process, host); return MSG_OK; } @@ -344,10 +337,7 @@ int MSG_process_get_PID(msg_process_t process) if (process == NULL) { return 0; } - - simdata_process_t simdata = simcall_process_get_data(process); - - return simdata != NULL ? simdata->PID : 0; + return simcall_process_get_PID(process); } /** \ingroup m_process_management @@ -361,9 +351,7 @@ int MSG_process_get_PPID(msg_process_t process) { xbt_assert(process != NULL, "Invalid parameter"); - simdata_process_t simdata = simcall_process_get_data(process); - - return simdata->PPID; + return simcall_process_get_PPID(process); } /** \ingroup m_process_management