xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
simix_global->process_list =
xbt_swag_new(xbt_swag_offset(proc, process_hookup));
+ simix_global->process_to_destroy =
+ xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+
simix_global->current_process = NULL;
+ simix_global->maestro_process = NULL;
simix_global->registered_functions = xbt_dict_new();
simix_global->create_process_function = NULL;
simix_global->kill_process_function = NULL;
simix_global->cleanup_process_function = SIMIX_process_cleanup;
+ SIMIX_context_mod_init();
+ __SIMIX_create_maestro_process();
+
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
surf_init(argc, argv); /* Initialize SURF structures */
INFO0
("Legend of the following listing: \"<process> on <host>: <status>.\"");
xbt_swag_foreach(process, simix_global->process_list) {
- smx_simdata_process_t p_simdata =
- (smx_simdata_process_t) process->simdata;
- // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
char *who, *who2;
asprintf(&who, "%s on %s: %s",
process->name,
- p_simdata->smx_host->name,
- (process->simdata->blocked) ? "[BLOCKED] "
- : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
+ process->smx_host->name,
+ (process->blocked) ? "[BLOCKED] "
+ : ((process->suspended) ? "[SUSPENDED] " : ""));
- if (p_simdata->mutex) {
+ if (process->mutex) {
who2 =
bprintf("%s Blocked on mutex %p", who,
(XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
- p_simdata->mutex : (void *) 0xdead);
+ process->mutex : (void *) 0xdead);
free(who);
who = who2;
- } else if (p_simdata->cond) {
+ } else if (process->cond) {
who2 =
bprintf
("%s Blocked on condition %p; Waiting for the following actions:",
who,
(XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
- p_simdata->cond : (void *) 0xdead);
+ process->cond : (void *) 0xdead);
free(who);
who = who2;
- xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
+ xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
who2 =
bprintf("%s '%s'(%p)", who, act->name,
(XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
xbt_swag_foreach(process, cond->sleeping) {
DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->smx_host->name);
+ process->name, process->smx_host->name);
}
SIMIX_cond_broadcast(cond);
/* remove conditional from action */
xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
xbt_swag_foreach(process, cond->sleeping) {
DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->smx_host->name);
+ process->name, process->smx_host->name);
}
SIMIX_cond_broadcast(cond);
/* remove conditional from action */
SIMIX_process_kill(p);
}
- xbt_context_empty_trash();
+ SIMIX_context_empty_trash();
- if (self) {
- xbt_context_yield();
+ if (self != simix_global->maestro_process) {
+ SIMIX_context_yield();
}
return;
/**
* \brief Clean the SIMIX simulation
*
- * This functions remove all memories needed to the SIMIX execution
+ * This functions remove the memory used by SIMIX
*/
void SIMIX_clean(void)
{
- smx_process_t p = NULL;
-
- while ((p = xbt_swag_extract(simix_global->process_list))) {
- SIMIX_process_kill(p);
- }
+ /* Kill everyone (except maestro) */
+ SIMIX_process_killall();
- xbt_dict_free(&(simix_global->host));
+ /* Free the remaining data structures*/
xbt_swag_free(simix_global->process_to_run);
+ xbt_swag_free(simix_global->process_to_destroy);
xbt_swag_free(simix_global->process_list);
+ simix_global->process_list = NULL;
xbt_dict_free(&(simix_global->registered_functions));
- free(simix_global);
- simix_global = NULL;
+ xbt_dict_free(&(simix_global->host));
+ /* Let's free maestro now */
+ SIMIX_context_free(simix_global->maestro_process);
+ free(simix_global->maestro_process);
+
+ /* Finish context module and SURF */
+ SIMIX_context_mod_exit();
surf_exit();
+ free(simix_global);
+ simix_global = NULL;
+
return;
}
double elapsed_time = 0.0;
static int state_modifications = 1;
- xbt_context_empty_trash();
+ SIMIX_context_empty_trash();
if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
DEBUG0("**************************************************");
}
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
- DEBUG2("Scheduling %s on %s",
- process->name, process->simdata->smx_host->name);
- simix_global->current_process = process;
- xbt_context_schedule(process->simdata->context);
- /* fflush(NULL); */
- simix_global->current_process = NULL;
+ DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+ SIMIX_context_schedule(process);
}
{
if (fun == SIMIX_process_kill) {
process = arg;
DEBUG2("Killing %s on %s", process->name,
- process->simdata->smx_host->name);
+ process->smx_host->name);
SIMIX_process_kill(process);
}
}