X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a97de8c98502af9f74cfceb924fa02e0fd80925..9dbeb2372ad9a123d0558132ebb6e003e10aa641:/src/msg/msg_process.c
diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 927a4a982f..419e710c35 100644
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -15,11 +15,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
/** @addtogroup m_process_management
* \htmlonly \endhtmlonly
*
- * We need to simulate many independent scheduling decisions, so
- * the concept of process is at the heart of the
- * simulator. A process may be defined as a code, with
- * some private data, executing in a location.
- * \see msg_process_t
+ * Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing your code interacting with the simulated world.
+ * A process may be defined as a code with some private data.
+ * Processes must be located on hosts (#msg_host_t), and they exchange data by sending tasks (#msg_task_t) that are similar to envelops containing data.
*/
/******************************** Process ************************************/
@@ -43,9 +41,7 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
simcall_process_set_data(smx_proc, NULL);
}
-#ifdef HAVE_TRACING
TRACE_msg_process_end(smx_proc);
-#endif
// free the data if a function was provided
if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(msg_proc->data);
@@ -155,7 +151,7 @@ msg_process_t MSG_process_create_with_environment(const char *name,
int argc, char **argv,
xbt_dict_t properties)
{
- xbt_assert(code != NULL && host != NULL, "Invalid parameters");
+ xbt_assert(code != NULL && host != NULL, "Invalid parameters: host and code params must not be NULL");
simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
msg_process_t process;
@@ -168,14 +164,14 @@ msg_process_t MSG_process_create_with_environment(const char *name,
simdata->data = data;
simdata->last_errno = MSG_OK;
+ int future_simix_process_pid = SIMIX_process_get_maxpid();
+ TRACE_msg_process_create(name, future_simix_process_pid, host);
+
/* 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, sg_host_name(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, SIMIX_process_get_PID(process), host);
-#endif
+ xbt_assert(future_simix_process_pid == SIMIX_process_get_PID(process));
if (!process) {
/* Undo everything we have just changed */
@@ -183,9 +179,7 @@ msg_process_t MSG_process_create_with_environment(const char *name,
return NULL;
}
else {
- #ifdef HAVE_TRACING
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
- #endif
}
return process;
}
@@ -229,10 +223,8 @@ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
simdata_process_t simdata = simcall_process_get_data(process);
simdata->m_host = host;
-#ifdef HAVE_TRACING
msg_host_t now = simdata->m_host;
TRACE_msg_process_change_host(process, now, host);
-#endif
simcall_process_change_host(process, host);
return MSG_OK;
}
@@ -245,11 +237,14 @@ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
*/
void* MSG_process_get_data(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: first parameter must not be NULL!");
/* get from SIMIX the MSG process data, and then the user data */
simdata_process_t simdata = simcall_process_get_data(process);
- return simdata->data;
+ if (simdata)
+ return simdata->data;
+ else
+ return NULL;
}
/** \ingroup m_process_management
@@ -260,7 +255,7 @@ void* MSG_process_get_data(msg_process_t process)
*/
msg_error_t MSG_process_set_data(msg_process_t process, void *data)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: first parameter must not be NULL!");
simdata_process_t simdata = simcall_process_get_data(process);
simdata->data = data;
@@ -358,7 +353,7 @@ int MSG_process_get_PID(msg_process_t process)
*/
int MSG_process_get_PPID(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
return simcall_process_get_PPID(process);
}
@@ -371,7 +366,7 @@ int MSG_process_get_PPID(msg_process_t process)
*/
const char *MSG_process_get_name(msg_process_t process)
{
- xbt_assert(process, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
return simcall_process_get_name(process);
}
@@ -396,7 +391,7 @@ const char *MSG_process_get_property_value(msg_process_t process,
*/
xbt_dict_t MSG_process_get_properties(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
return simcall_process_get_properties(process);
@@ -441,12 +436,9 @@ msg_process_t MSG_process_self(void)
*/
msg_error_t MSG_process_suspend(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
-#ifdef HAVE_TRACING
TRACE_msg_process_suspend(process);
-#endif
-
simcall_process_suspend(process);
MSG_RETURN(MSG_OK);
}
@@ -459,12 +451,9 @@ msg_error_t MSG_process_suspend(msg_process_t process)
*/
msg_error_t MSG_process_resume(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
-#ifdef HAVE_TRACING
TRACE_msg_process_resume(process);
-#endif
-
simcall_process_resume(process);
MSG_RETURN(MSG_OK);
}
@@ -477,7 +466,7 @@ msg_error_t MSG_process_resume(msg_process_t process)
*/
int MSG_process_is_suspended(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter: First argument must not be NULL");
return simcall_process_is_suspended(process);
}