X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d045730df220c1b78e758d1d7a7fc1c6a53a424f..419d880cf5ea0cc1f4c2b299923a6002811e55e3:/src/msg/m_process.c
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 79aef14891..c2cab1b011 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -13,7 +13,7 @@
#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
@@ -21,7 +21,7 @@ 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
@@ -47,33 +47,34 @@ 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);
+ argc, argv, properties);
}
/** \ingroup m_process_management
* \brief Creates and runs a new #m_process_t.
*
- * Does exactly the same as #MSG_process_create_with_arguments but without
+ * Does exactly the same as #MSG_process_create_with_arguments but without
providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
* \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
* \brief Creates and runs a new #m_process_t.
- * A constructor for #m_process_t taking four arguments and returning the
+ * A constructor for #m_process_t taking four arguments and returning the
* corresponding object. The structure (and the corresponding thread) is
* created, and put in the list of ready process.
* \param name a name for the object. It is for user-level information
@@ -96,18 +97,18 @@ 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);
+ return MSG_process_create_with_environment(name, code, data, host,
+ argc, argv, NULL);
}
/** \ingroup m_process_management
* \brief Creates and runs a new #m_process_t.
- * A constructor for #m_process_t taking four arguments and returning the
+ * A constructor for #m_process_t taking four arguments and returning the
* corresponding object. The structure (and the corresponding thread) is
* created, and put in the list of ready process.
* \param name a name for the object. It is for user-level information
@@ -130,23 +131,34 @@ 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);
+ 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->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);
+ simdata->s_process = smx_process;
if (SIMIX_process_self()) {
simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
@@ -182,17 +194,18 @@ void MSG_process_kill(m_process_t process)
simdata_process_t p_simdata = process->simdata;
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_communication_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);
@@ -210,14 +223,15 @@ 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);
+ SIMIX_process_change_host(process->simdata->s_process, now->name,
+ host->name);
return MSG_OK;
}
/** \ingroup m_process_management
* \brief Return the user data of a #m_process_t.
*
- * This function checks whether \a process is a valid pointer or not
+ * This function checks whether \a process is a valid pointer or not
and return the user data associated to \a process if it is possible.
*/
void *MSG_process_get_data(m_process_t process)
@@ -230,13 +244,12 @@ void *MSG_process_get_data(m_process_t process)
/** \ingroup m_process_management
* \brief Set the user data of a #m_process_t.
*
- * This function checks whether \a process is a valid pointer or not
+ * This function checks whether \a process is a valid pointer or not
and set the user data associated to \a process if it is possible.
*/
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;
@@ -246,14 +259,14 @@ MSG_error_t MSG_process_set_data(m_process_t process, void *data)
/** \ingroup m_process_management
* \brief Return the location on which an agent is running.
*
- * This function checks whether \a process is a valid pointer or not
- and return the m_host_t corresponding to the location on which \a
+ * This function checks whether \a process is a valid pointer or not
+ and return the m_host_t corresponding to the location on which \a
process is running.
*/
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);
}
@@ -262,8 +275,8 @@ m_host_t MSG_process_get_host(m_process_t process)
*
* \brief Return a #m_process_t given its PID.
*
- * This function search in the list of all the created m_process_t for a m_process_t
- whose PID is equal to \a PID. If no host is found, \c NULL is returned.
+ * This function search in the list of all the created m_process_t for a m_process_t
+ whose PID is equal to \a PID. If no host is found, \c NULL is returned.
Note that the PID are uniq in the whole simulation, not only on a given host.
*/
m_process_t MSG_process_from_PID(int PID)
@@ -281,12 +294,12 @@ m_process_t MSG_process_from_PID(int PID)
/** \ingroup m_process_management
* \brief Returns the process ID of \a process.
*
- * This function checks whether \a process is a valid pointer or not
+ * This function checks whether \a process is a valid pointer or not
and return its PID (or 0 in case of problem).
*/
int MSG_process_get_PID(m_process_t process)
{
- /* Do not raise an exception here: this function is used in the logs,
+ /* Do not raise an exception here: this function is used in the logs,
and it will be called back by the exception handling stuff */
if (process == NULL || process->simdata == NULL)
return 0;
@@ -297,14 +310,14 @@ int MSG_process_get_PID(m_process_t process)
/** \ingroup m_process_management
* \brief Returns the process ID of the parent of \a process.
*
- * This function checks whether \a process is a valid pointer or not
- and return its PID. Returns -1 if the agent has not been created by
+ * This function checks whether \a process is a valid pointer or not
+ and return its PID. Returns -1 if the agent has not been created by
another agent.
*/
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);
}
@@ -312,13 +325,14 @@ int MSG_process_get_PPID(m_process_t process)
/** \ingroup m_process_management
* \brief Return the name of an agent.
*
- * This function checks whether \a process is a valid pointer or not
+ * This function checks whether \a process is a valid pointer or not
and return its name.
*/
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 +344,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 +357,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_process_get_properties
+ (((simdata_process_t) process->simdata)->s_process));
}
@@ -394,7 +410,7 @@ 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);
@@ -411,7 +427,7 @@ 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);
@@ -427,6 +443,6 @@ 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");
+ && (process->simdata)), "Invalid parameters");
return SIMIX_process_is_suspended(process->simdata->s_process);
}