void SIMIX_global_init(int *argc, char **argv)
{
s_smx_process_t proc;
-
+
if (!simix_global) {
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(simix_action, simix);
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 */
SIMIX_process_kill(p);
}
- SIMIX_context_empty_trash();
+ SIMIX_process_empty_trash();
- if (self) {
+ if (self != simix_global->maestro_process) {
SIMIX_context_yield();
}
/**
* \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));
- surf_exit();
+ /* Let's free maestro now */
+ SIMIX_context_free(simix_global->maestro_process);
+ free(simix_global->maestro_process);
- /*FIXME Remove maestro's smx_process from the process_list before calling
- SIMIX_context_mod_exit() and delete it afterwards (it should be the last one) */
+ /* Finish context module and SURF */
SIMIX_context_mod_exit();
- xbt_swag_free(simix_global->process_list);
- xbt_swag_free(simix_global->process_to_destroy);
+ surf_exit();
+
+ free(simix_global);
+ simix_global = NULL;
- /* Let's free maestro */
- SIMIX_context_free(simix_global->maestro_process);
- free(simix_global->maestro_process);
-
return;
}
double elapsed_time = 0.0;
static int state_modifications = 1;
- SIMIX_context_empty_trash();
+ SIMIX_process_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->smx_host->name);
- simix_global->current_process = process;
+ DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
SIMIX_context_schedule(process);
- /* fflush(NULL); */
- simix_global->current_process = NULL;
}
{