A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more informative debug messages
[simgrid.git]
/
src
/
msg
/
m_process.c
diff --git
a/src/msg/m_process.c
b/src/msg/m_process.c
index
d36c64a
..
3b1b316
100644
(file)
--- 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 "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)");
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 <!-- DOXYGEN_NAVBAR_LABEL="Agents" --> \endhtmlonly
*/
/** @addtogroup m_process_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Agents" --> \endhtmlonly
- *
+ *
* We need to simulate many independent scheduling decisions, so
* the concept of <em>process</em> is at the heart of the
* simulator. A process may be defined as a <em>code</em>, with
* We need to simulate many independent scheduling decisions, so
* the concept of <em>process</em> is at the heart of the
* simulator. A process may be defined as a <em>code</em>, with
@@
-57,7
+58,7
@@
void *_MSG_process_create_from_SIMIX(const char *name,
/** \ingroup m_process_management
* \brief Creates and runs a new #m_process_t.
*
/** \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
*/
providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
* \sa MSG_process_create_with_arguments
*/
@@
-72,7
+73,7
@@
m_process_t MSG_process_create(const char *name,
/** \ingroup m_process_management
* \brief Creates and runs a new #m_process_t.
/** \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
* 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,14
+100,14
@@
m_process_t MSG_process_create_with_arguments(const char *name,
void *data, m_host_t host,
int argc, char **argv)
{
void *data, m_host_t host,
int argc, char **argv)
{
- return MSG_process_create_with_environment(name, code, data, host,
+ 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.
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
* 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
@@
-201,20
+202,22
@@
void MSG_process_kill(m_process_t process)
/** \ingroup m_process_management
* \brief Migrates an agent to another location.
*
/** \ingroup m_process_management
* \brief Migrates an agent to another location.
*
- * This function
s
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.
*/
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.
*
return MSG_OK;
}
/** \ingroup m_process_management
* \brief Return the user data of a #m_process_t.
*
- * This function
s 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)
and return the user data associated to \a process if it is possible.
*/
void *MSG_process_get_data(m_process_t process)
@@
-227,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.
*
/** \ingroup m_process_management
* \brief Set the user data of a #m_process_t.
*
- * This function
s 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)
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)
@@
-243,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.
*
/** \ingroup m_process_management
* \brief Return the location on which an agent is running.
*
- * This function
s 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)
process is running.
*/
m_host_t MSG_process_get_host(m_process_t process)
@@
-259,8
+262,8
@@
m_host_t MSG_process_get_host(m_process_t process)
*
* \brief Return a #m_process_t given its PID.
*
*
* \brief Return a #m_process_t given its PID.
*
- * This function
s 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)
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)
@@
-278,12
+281,12
@@
m_process_t MSG_process_from_PID(int PID)
/** \ingroup m_process_management
* \brief Returns the process ID of \a process.
*
/** \ingroup m_process_management
* \brief Returns the process ID of \a process.
*
- * This function
s 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)
{
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;
and it will be called back by the exception handling stuff */
if (process == NULL || process->simdata == NULL)
return 0;
@@
-294,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.
*
/** \ingroup m_process_management
* \brief Returns the process ID of the parent of \a process.
*
- * This function
s 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)
another agent.
*/
int MSG_process_get_PPID(m_process_t process)
@@
-309,13
+312,13
@@
int MSG_process_get_PPID(m_process_t process)
/** \ingroup m_process_management
* \brief Return the name of an agent.
*
/** \ingroup m_process_management
* \brief Return the name of an agent.
*
- * This function
s 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)
{
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);
}
return (process->name);
}
@@
-335,7
+338,7
@@
const char* MSG_process_get_property_value(m_process_t process, const char* name
/** \ingroup m_process_management
* \brief Return the list of properties
*
/** \ingroup m_process_management
* \brief Return the list of properties
*
- * This function
s
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)
{
*/
xbt_dict_t MSG_process_get_properties(m_process_t process)
{
@@
-348,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.
*
/** \ingroup m_process_management
* \brief Return the PID of the current agent.
*
- * This function
s
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)
{
*/
int MSG_process_self_PID(void)
{
@@
-358,7
+361,7
@@
int MSG_process_self_PID(void)
/** \ingroup m_process_management
* \brief Return the PPID of the current agent.
*
/** \ingroup m_process_management
* \brief Return the PPID of the current agent.
*
- * This function
s
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)
* running #m_process_t.
*/
int MSG_process_self_PPID(void)
@@
-369,7
+372,7
@@
int MSG_process_self_PPID(void)
/** \ingroup m_process_management
* \brief Return the current agent.
*
/** \ingroup m_process_management
* \brief Return the current agent.
*
- * This function
s
returns the currently running #m_process_t.
+ * This function returns the currently running #m_process_t.
*/
m_process_t MSG_process_self(void)
{
*/
m_process_t MSG_process_self(void)
{
@@
-385,7
+388,7
@@
m_process_t MSG_process_self(void)
/** \ingroup m_process_management
* \brief Suspend the process.
*
/** \ingroup m_process_management
* \brief Suspend the process.
*
- * This function
s 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)
* it was waiting for the completion.
*/
MSG_error_t MSG_process_suspend(m_process_t process)
@@
-401,7
+404,7
@@
MSG_error_t MSG_process_suspend(m_process_t process)
/** \ingroup m_process_management
* \brief Resume a suspended process.
*
/** \ingroup m_process_management
* \brief Resume a suspended process.
*
- * This function
s 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)
* which it was waiting for the completion.
*/
MSG_error_t MSG_process_resume(m_process_t process)