* \see SIMIX_process_create_with_arguments
*/
-
void SIMIX_process_cleanup(void *arg)
{
- xbt_swag_remove(arg, simix_global->process_list);
xbt_swag_remove(arg, simix_global->process_to_run);
- xbt_swag_remove(arg,
- ((smx_process_t) arg)->simdata->smx_host->
- simdata->process_list);
- free(((smx_process_t) arg)->name);
- ((smx_process_t) arg)->name = NULL;
-
- free(((smx_process_t) arg)->simdata);
- ((smx_process_t) arg)->simdata = NULL;
- free(arg);
+ xbt_swag_remove(arg, simix_global->process_list);
+ xbt_swag_remove(arg, ((smx_process_t)arg)->smx_host->process_list);
+ xbt_swag_insert(arg, simix_global->process_to_destroy);
}
+
/**
+ * \brief Creates and runs the maestro process
+ *
+ */
+
+void __SIMIX_create_maestro_process()
+{
+ smx_process_t process = NULL;
+ process = xbt_new0(s_smx_process_t, 1);
+
+ /* Process data */
+ process->name = (char *)"maestro";
+
+ /*Create the right context type (FIXME: check the return value for success)*/
+ SIMIX_context_create_maestro(&process);
+
+ /* Set it as the maestro process */
+ simix_global->maestro_process = process;
+ simix_global->current_process = process;
+
+ return;
+}
+
+/**
* \brief Creates and runs a new #smx_process_t.
*
* 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.
const char *hostname, int argc,
char **argv, xbt_dict_t properties)
{
- smx_simdata_process_t simdata = NULL;
smx_process_t process = NULL;
smx_process_t self = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
WARN2("Cannot launch process '%s' on failed host '%s'", name, hostname);
return NULL;
}
- simdata = xbt_new0(s_smx_simdata_process_t, 1);
process = xbt_new0(s_smx_process_t, 1);
- /*char alias[MAX_ALIAS_NAME + 1] = {0};
- msg_mailbox_t mailbox; */
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
- /* Simulator Data */
-
- simdata->smx_host = host;
- simdata->mutex = NULL;
- simdata->cond = NULL;
- simdata->argc = argc;
- simdata->argv = argv;
- simdata->context = xbt_context_new(name, code, NULL, NULL,
- simix_global->cleanup_process_function,
- process, simdata->argc, simdata->argv);
-
- /* Process structure */
+
+ /* Process data */
process->name = xbt_strdup(name);
- process->simdata = simdata;
+ process->smx_host = host;
+ process->argc = argc;
+ process->argv = argv;
+ process->mutex = NULL;
+ process->cond = NULL;
+
+ /*Create the right context type (FIXME: check the return value for success)*/
+ SIMIX_context_new(&process, code);
+
process->data = data;
+ process->cleanup_func = simix_global->cleanup_process_function;
+ process->cleanup_arg = process;
/* Add properties */
- simdata->properties = properties;
+ process->properties = properties;
- xbt_swag_insert(process, host->simdata->process_list);
+ /* Add the process to it's host process list */
+ xbt_swag_insert(process, host->process_list);
- /* fix current_process, about which xbt_context_start mocks around */
+ /* fix current_process, about which SIMIX_context_start mocks around */
self = simix_global->current_process;
- xbt_context_start(process->simdata->context);
+ SIMIX_context_start(process);
simix_global->current_process = self;
+ /* Now insert it in the global process list and in the process to run list */
xbt_swag_insert(process, simix_global->process_list);
DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
xbt_swag_insert(process, simix_global->process_to_run);
- /*sprintf(alias,"%s:%s",hostname,process->name);
-
- mailbox = MSG_mailbox_new(alias);
- MSG_mailbox_set_hostname(mailbox, hostname); */
-
return process;
}
void *data,
void *jprocess, void *jenv, smx_process_t * res)
{
- smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
smx_process_t process = xbt_new0(s_smx_process_t, 1);
smx_process_t self = NULL;
*/
*res = process;
-
-
DEBUG5("jprocess_create(name=%s,host=%p,data=%p,jproc=%p,jenv=%p)",
name, host, data, jprocess, jenv);
xbt_assert0(host, "Invalid parameters");
- /* Simulator Data */
- simdata->smx_host = host;
- simdata->mutex = NULL;
- simdata->cond = NULL;
- simdata->argc = 0;
- simdata->argv = NULL;
-
-
- simdata->context = xbt_context_new(name, NULL, NULL, jprocess,
- simix_global->cleanup_process_function,
- process,
- /* argc/argv */ 0, NULL);
- /* Process structure */
+ /* Process data */
process->name = xbt_strdup(name);
- process->simdata = simdata;
+ process->smx_host = host;
+ process->argc = 0;
+ process->argv = NULL;
+ process->mutex = NULL;
+ process->cond = NULL;
+ SIMIX_context_new(&process, jprocess);
process->data = data;
- xbt_swag_insert(process, host->simdata->process_list);
+ /* Add the process to it's host process list */
+ xbt_swag_insert(&process, host->process_list);
/* fix current_process, about which xbt_context_start mocks around */
self = simix_global->current_process;
-
- xbt_context_start(process->simdata->context);
-
+ SIMIX_context_start(process);
simix_global->current_process = self;
+ /* Now insert it in the global process list and in the process to run list */
xbt_swag_insert(process, simix_global->process_list);
DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
xbt_swag_insert(process, simix_global->process_to_run);
-
}
-
/** \brief Kill a SIMIX process
*
* This function simply kills a \a process... scarry isn't it ? :).
*/
void SIMIX_process_kill(smx_process_t process)
{
- smx_simdata_process_t p_simdata = process->simdata;
-
DEBUG2("Killing process %s on %s", process->name,
- p_simdata->smx_host->name);
+ process->smx_host->name);
/* Cleanup if we were waiting for something */
- if (p_simdata->mutex)
- xbt_swag_remove(process, p_simdata->mutex->sleeping);
+ if (process->mutex)
+ xbt_swag_remove(process, process->mutex->sleeping);
- if (p_simdata->cond)
- xbt_swag_remove(process, p_simdata->cond->sleeping);
+ if (process->cond)
+ xbt_swag_remove(process, process->cond->sleeping);
- xbt_swag_remove(process, simix_global->process_to_run);
- xbt_swag_remove(process, simix_global->process_list);
DEBUG2("%p here! killing %p", simix_global->current_process, process);
- xbt_context_kill(process->simdata->context);
+ SIMIX_context_kill(process);
if (process == SIMIX_process_self()) {
/* I just killed myself */
- xbt_context_yield();
+ SIMIX_context_yield();
}
}
void SIMIX_process_set_data(smx_process_t process, void *data)
{
xbt_assert0((process != NULL), "Invalid parameters");
- //xbt_assert0((process->data == NULL), "Data already set");
process->data = data;
-
return;
}
*/
smx_host_t SIMIX_process_get_host(smx_process_t process)
{
- xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
-
- return (process->simdata->smx_host);
+ xbt_assert0((process != NULL), "Invalid parameters");
+ return (process->smx_host);
}
/**
*/
const char *SIMIX_process_get_name(smx_process_t process)
{
- xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
-
+ xbt_assert0((process != NULL), "Invalid parameters");
return (process->name);
}
*/
void SIMIX_process_set_name(smx_process_t process, char *name)
{
- xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
-
+ xbt_assert0((process != NULL), "Invalid parameters");
process->name = name;
}
*/
xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
{
- return process->simdata->properties;
+ return process->properties;
}
/**
*/
void SIMIX_process_suspend(smx_process_t process)
{
- smx_simdata_process_t simdata = NULL;
-
- xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
+ xbt_assert0(process, "Invalid parameters");
if (process != SIMIX_process_self()) {
- simdata = process->simdata;
- if (simdata->mutex) {
+ if (process->mutex) {
/* process blocked on a mutex, only set suspend=1 */
- simdata->suspended = 1;
- } else if (simdata->cond) {
+ process->suspended = 1;
+ } else if (process->cond) {
/* process blocked cond, suspend all actions */
/* temporaries variables */
xbt_fifo_item_t i;
smx_action_t act;
- simdata->suspended = 1;
- c = simdata->cond;
+ process->suspended = 1;
+ c = process->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->common_public.suspend(act->
- simdata->surf_action);
+ surf_workstation_model->suspend(act->surf_action);
}
} else {
- simdata->suspended = 1;
+ process->suspended = 1;
}
} else {
/* process executing, I can create an action and suspend it */
smx_action_t dummy;
smx_cond_t cond;
char name[] = "dummy";
- process->simdata->suspended = 1;
+ process->suspended = 1;
cond = SIMIX_cond_init();
dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
- surf_workstation_model->common_public.suspend(dummy->simdata->
- surf_action);
+ surf_workstation_model->suspend(dummy->surf_action);
SIMIX_register_action_to_condition(dummy, cond);
__SIMIX_cond_wait(cond);
SIMIX_unregister_action_to_condition(dummy, cond);
*/
void SIMIX_process_resume(smx_process_t process)
{
- smx_simdata_process_t simdata = NULL;
-
- xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ xbt_assert0((process != NULL), "Invalid parameters");
SIMIX_CHECK_HOST();
- if (process == SIMIX_process_self()) {
+ if (process == SIMIX_process_self())
return;
- }
- simdata = process->simdata;
- if (simdata->mutex) {
+ if (process->mutex) {
DEBUG0("Resume process blocked on a mutex");
- simdata->suspended = 0; /* It'll wake up by itself when mutex releases */
+ process->suspended = 0; /* It'll wake up by itself when mutex releases */
return;
- } else if (simdata->cond) {
+ } else if (process->cond) {
/* temporaries variables */
smx_cond_t c;
xbt_fifo_item_t i;
smx_action_t act;
DEBUG0("Resume process blocked on a conditional");
- simdata->suspended = 0;
- c = simdata->cond;
+ process->suspended = 0;
+ c = process->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->common_public.resume(act->simdata->surf_action);
+ surf_workstation_model->resume(act->surf_action);
}
SIMIX_cond_signal(c);
return;
} else {
- simdata->suspended = 0;
+ process->suspended = 0;
xbt_swag_insert(process, simix_global->process_to_run);
}
-
}
/**
*
* This function changes the value of the host on which \a process is running.
*/
-void SIMIX_process_change_host(smx_process_t process, char *source,
- char *dest)
+void SIMIX_process_change_host(smx_process_t process, char *source, char *dest)
{
- smx_simdata_process_t p_simdata = process->simdata;
+ xbt_assert0((process != NULL), "Invalid parameters");
smx_host_t h1 = SIMIX_host_get_by_name(source);
smx_host_t h2 = SIMIX_host_get_by_name(dest);
- p_simdata->smx_host = h2;
- xbt_swag_remove(process, h1->simdata->process_list);
- xbt_swag_insert(process, h2->simdata->process_list);
+ process->smx_host = h2;
+ xbt_swag_remove(process, h1->process_list);
+ xbt_swag_insert(process, h2->process_list);
}
/**
*/
int SIMIX_process_is_suspended(smx_process_t process)
{
- xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ xbt_assert0(((process != NULL), "Invalid parameters");
- return (process->simdata->suspended);
+ return (process->suspended);
}
/**
