/******************************** Process ************************************/
/**
- * \brief Creates and runs a new #smx_process_t.
- *
- * Does exactly the same as #SIMIX_process_create_with_arguments but without
- providing standard arguments (\a argc, \a argv).
- * \see SIMIX_process_create_with_arguments
+ * \brief Move a process to the list of process to destroy. *
*/
-
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)->smx_host->process_list);
- free(((smx_process_t) arg)->name);
- ((smx_process_t) arg)->name = NULL;
+ 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);
+}
- free(arg);
+/**
+ * Garbage collection
+ *
+ * Should be called some time to time to free the memory allocated for processes
+ * that have finished (or killed).
+ */
+void SIMIX_process_empty_trash(void)
+{
+ smx_process_t process = NULL;
+ int i;
+
+ while ((process = xbt_swag_extract(simix_global->process_to_destroy))){
+ free(process->name);
+ process->name = NULL;
+
+ if (process->argv) {
+ for (i = 0; i < process->argc; i++)
+ if (process->argv[i])
+ free(process->argv[i]);
+
+ free(process->argv);
+ }
+
+ free(process);
+ }
+}
+
+/**
+ * \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 *)"";
+
+ /*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;
}
/**
char **argv, xbt_dict_t properties)
{
smx_process_t process = NULL;
- smx_process_t self = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
DEBUG2("Start process %s on host %s", name, hostname);
return NULL;
}
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");
process->argv = argv;
process->mutex = NULL;
process->cond = NULL;
- process->context = xbt_context_new(name, code, NULL, NULL,
- simix_global->cleanup_process_function,
- process, process->argc, process->argv);
+
+ /*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 */
process->properties = properties;
/* 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->context);
- simix_global->current_process = self;
-
- /* Now insert it in the global process list */
+
+ SIMIX_context_start(process);
+
+ /* 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;
}
process->argv = NULL;
process->mutex = NULL;
process->cond = NULL;
- process->context = xbt_context_new(name, NULL, NULL, jprocess,
- simix_global->cleanup_process_function,
- process, 0, NULL);
+ SIMIX_context_new(&process, jprocess);
process->data = data;
/* Add the process to it's host process list */
- xbt_swag_insert(process, 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->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);
*/
void SIMIX_process_kill(smx_process_t process)
{
- DEBUG2("Killing process %s on %s", process->name,
- process->smx_host->name);
+ DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
/* Cleanup if we were waiting for something */
if (process->mutex)
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->context);
+
+ /*FIXME: If we are killing the running process we might call stop directly */
+ process->iwannadie = 1;
+ __SIMIX_process_schedule(process);
if (process == SIMIX_process_self()) {
/* I just killed myself */
- xbt_context_yield();
+ SIMIX_context_yield();
}
}
void *SIMIX_process_get_data(smx_process_t process)
{
xbt_assert0((process != NULL), "Invalid parameters");
-
return (process->data);
}
process->suspended = 1;
c = process->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->suspend(act->surf_action);
+ surf_workstation_model->suspend(act->surf_action);
}
} else {
process->suspended = 1;
cond = SIMIX_cond_init();
dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
- surf_workstation_model->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);
process->suspended = 0;
c = process->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->resume(act->simdata->surf_action);
+ surf_workstation_model->resume(act->surf_action);
}
SIMIX_cond_signal(c);
return;
*/
int SIMIX_process_is_suspended(smx_process_t process)
{
- xbt_assert0(((process != NULL), "Invalid parameters");
+ xbt_assert0((process != NULL), "Invalid parameters");
return (process->suspended);
}
{
return xbt_swag_size(simix_global->process_list);
}
+
+/**
+ * Calling this function makes the process process to yield. The process
+ * that scheduled it returns from __SIMIX_process_schedule as if nothing
+ * had happened.
+ *
+ * Only the processes can call this function, giving back the control
+ * to the maestro
+ */
+void __SIMIX_process_yield(void)
+{
+ DEBUG1("Yield process '%s'", simix_global->current_process->name);
+ xbt_assert0((simix_global->current_process != simix_global->maestro_process),
+ "You are not supposed to run this function here!");
+
+ SIMIX_context_yield();
+
+ if (simix_global->current_process->iwannadie)
+ SIMIX_context_stop(1);
+}
+
+void __SIMIX_process_schedule(smx_process_t process)
+{
+ DEBUG1("Scheduling context: '%s'", process->name);
+
+ /* save the current process */
+ smx_process_t self = simix_global->current_process;
+
+ /* update the current process */
+ simix_global->current_process = process;
+
+ /* schedule the context */
+ SIMIX_context_schedule(process);
+
+ /* restore the current process to the previously saved process */
+ simix_global->current_process = self;
+}
