#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
{
/* arg is a pointer to a simix process, we can get the msg process with the field data */
m_process_t proc = ((smx_process_t) arg)->data;
+#ifdef HAVE_TRACING
+ TRACE_msg_process_end (proc);
+#endif
xbt_fifo_remove(msg_global->process_list, proc);
SIMIX_process_cleanup(arg);
- free(proc->name);
- proc->name = NULL;
- free(proc->simdata);
- proc->simdata = NULL;
+ if (proc->name) {
+ free(proc->name);
+ proc->name = NULL;
+ }
+ if (proc->simdata) {
+ free(proc->simdata);
+ proc->simdata = NULL;
+ }
free(proc);
return;
/* 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
* \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
*/
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);
+ argc, argv, NULL);
}
/** \ingroup m_process_management
* \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);
void _MSG_process_kill_from_SIMIX(void *p)
{
+#ifdef HAVE_TRACING
+ TRACE_msg_process_kill ((m_process_t) p);
+#endif
MSG_process_kill((m_process_t) p);
}
{
simdata_process_t p_simdata = process->simdata;
+#ifdef HAVE_TRACING
+ TRACE_msg_process_kill (process);
+#endif
+
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);
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);
+#ifdef HAVE_TRACING
+ TRACE_msg_process_change_host (process, now, host);
+#endif
+ SIMIX_process_change_host(process->simdata->s_process, now->name,
+ host->name);
return MSG_OK;
}
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;
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);
}
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);
}
*/
const char *MSG_process_get_name(m_process_t process)
{
- xbt_assert0(process, "Invalid parameter: process is NULL");
- xbt_assert0(process->simdata, "Invalid parameter: process->simdata is NULL");
+ xbt_assert0(process, "Invalid parameter: process is NULL");
+ xbt_assert0(process->simdata,
+ "Invalid parameter: process->simdata is NULL");
return (process->name);
}
* \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);
}
*/
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));
}
MSG_error_t MSG_process_suspend(m_process_t process)
{
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
CHECK_HOST();
+#ifdef HAVE_TRACING
+ TRACE_msg_process_suspend (process);
+#endif
+
SIMIX_process_suspend(process->simdata->s_process);
MSG_RETURN(MSG_OK);
}
{
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
CHECK_HOST();
+#ifdef HAVE_TRACING
+ TRACE_msg_process_resume (process);
+#endif
+
SIMIX_process_resume(process->simdata->s_process);
MSG_RETURN(MSG_OK);
}
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);
}
