X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8dc7a3bb3f1aaa0fabb9a2acc22c32483f662bab..3ce8957cfe6f904f244fdd79731800f0c61e50b0:/src/msg/m_process.c
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 8f3d6d5500..c168bbf1f4 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -10,6 +10,7 @@
#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)");
@@ -20,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
@@ -29,21 +30,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
*/
/******************************** Process ************************************/
-/** \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
- 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)
-{
- return MSG_process_create_with_arguments(name, code, data, host, -1,
- NULL);
-}
-
void __MSG_process_cleanup(void *arg)
{
/* arg is a pointer to a simix process, we can get the msg process with the field data */
@@ -69,10 +55,25 @@ void *_MSG_process_create_from_SIMIX(const char *name,
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
+ 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)
+{
+ return MSG_process_create_with_environment(name, code, data, host, -1,
+ 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
@@ -99,42 +100,14 @@ m_process_t MSG_process_create_with_arguments(const char *name,
void *data, m_host_t host,
int argc, char **argv)
{
- simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
- m_process_t process = xbt_new0(s_m_process_t, 1);
- xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
-
- /* Simulator Data */
- simdata->PID = msg_global->PID++;
- 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, NULL);
-
- if (SIMIX_process_self()) {
- simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
- } else {
- simdata->PPID = -1;
- }
- simdata->last_errno = MSG_OK;
-
-
- /* Process structure */
- process->name = xbt_strdup(name);
- process->simdata = simdata;
- process->data = data ;
-
- xbt_fifo_unshift(msg_global->process_list, process);
-
- return process;
+ 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
@@ -186,7 +159,7 @@ m_process_t MSG_process_create_with_environment(const char *name,
/* Process structure */
process->name = xbt_strdup(name);
process->simdata = simdata;
- process->data = data ;
+ process->data = data;
xbt_fifo_unshift(msg_global->process_list, process);
@@ -229,20 +202,22 @@ void MSG_process_kill(m_process_t process)
/** \ingroup m_process_management
* \brief Migrates an agent to another location.
*
- * This functions checks whether \a process and \a host are valid pointers
+ * This function checks whether \a process and \a host are valid pointers
and change the value of the #m_host_t on which \a process is running.
*/
-MSG_error_t MSG_process_change_host(m_process_t process, m_host_t host)
+MSG_error_t MSG_process_change_host(m_host_t host)
{
- xbt_die
- ("MSG_process_change_host - not implemented yet - maybe useless function");
+ 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);
return MSG_OK;
}
/** \ingroup m_process_management
* \brief Return the user data of a #m_process_t.
*
- * This functions 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)
@@ -255,7 +230,7 @@ void *MSG_process_get_data(m_process_t process)
/** \ingroup m_process_management
* \brief Set the user data of a #m_process_t.
*
- * This functions 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)
@@ -271,8 +246,8 @@ 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 functions 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)
@@ -287,8 +262,8 @@ m_host_t MSG_process_get_host(m_process_t process)
*
* \brief Return a #m_process_t given its PID.
*
- * This functions 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)
@@ -306,12 +281,12 @@ m_process_t MSG_process_from_PID(int PID)
/** \ingroup m_process_management
* \brief Returns the process ID of \a process.
*
- * This functions 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;
@@ -322,8 +297,8 @@ 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 functions 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)
@@ -337,7 +312,7 @@ int MSG_process_get_PPID(m_process_t process)
/** \ingroup m_process_management
* \brief Return the name of an agent.
*
- * This functions 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)
@@ -349,13 +324,13 @@ const char *MSG_process_get_name(m_process_t process)
}
/** \ingroup m_process_management
- * \brief Returns the value of a certain process property
+ * \brief Returns the value of a given process property
*
* \param process a process
* \param name a property name
- * \return value of a property
+ * \return value of a property (or NULL if the property is not set)
*/
-const char* MSG_process_get_property_value(m_process_t process, 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);
}
@@ -363,7 +338,7 @@ const char* MSG_process_get_property_value(m_process_t process, char* name)
/** \ingroup m_process_management
* \brief Return the list of properties
*
- * This functions returns all the parameters associated with a process
+ * This function returns all the parameters associated with a process
*/
xbt_dict_t MSG_process_get_properties(m_process_t process)
{
@@ -376,7 +351,7 @@ xbt_dict_t MSG_process_get_properties(m_process_t process)
/** \ingroup m_process_management
* \brief Return the PID of the current agent.
*
- * This functions returns the PID of the currently running #m_process_t.
+ * This function returns the PID of the currently running #m_process_t.
*/
int MSG_process_self_PID(void)
{
@@ -386,7 +361,7 @@ int MSG_process_self_PID(void)
/** \ingroup m_process_management
* \brief Return the PPID of the current agent.
*
- * This functions returns the PID of the parent of the currently
+ * This function returns the PID of the parent of the currently
* running #m_process_t.
*/
int MSG_process_self_PPID(void)
@@ -397,7 +372,7 @@ int MSG_process_self_PPID(void)
/** \ingroup m_process_management
* \brief Return the current agent.
*
- * This functions returns the currently running #m_process_t.
+ * This function returns the currently running #m_process_t.
*/
m_process_t MSG_process_self(void)
{
@@ -413,7 +388,7 @@ m_process_t MSG_process_self(void)
/** \ingroup m_process_management
* \brief Suspend the process.
*
- * This functions suspend the process by suspending the task on which
+ * This function suspends the process by suspending the task on which
* it was waiting for the completion.
*/
MSG_error_t MSG_process_suspend(m_process_t process)
@@ -429,7 +404,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
/** \ingroup m_process_management
* \brief Resume a suspended process.
*
- * This functions resume a suspended process by resuming the task on
+ * This function resumes a suspended process by resuming the task on
* which it was waiting for the completion.
*/
MSG_error_t MSG_process_resume(m_process_t process)