static void SIMIX_clean(void);
-SIMCALL_LIST(SIMCALL_RES_GETSET, SIMCALL_SEP_NOTHING)
-SIMCALL_LIST(SIMCALL_ARG_GETSET, SIMCALL_SEP_NOTHING)
-
/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
#include <signal.h>
-int _surf_do_verbose_exit = 1;
+int _sg_do_verbose_exit = 1;
static void _XBT_CALL inthandler(int ignored)
{
- if ( _surf_do_verbose_exit ) {
+ if ( _sg_do_verbose_exit ) {
XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
SIMIX_display_process_status();
}
#endif
/* Kill everyone (except maestro) */
- SIMIX_process_killall(simix_global->maestro_process);
+ SIMIX_process_killall(simix_global->maestro_process, 1);
/* Exit the SIMIX network module */
SIMIX_network_exit();
timer = xbt_heap_pop(simix_timers);
if (timer->func)
((void (*)(void*))timer->func)(timer->args);
+ xbt_free(timer);
}
/* Wake up all processes waiting for a Surf action to finish */
xbt_dynar_foreach(model_list, iter, model) {
while ((action = xbt_swag_extract(set)))
SIMIX_simcall_post((smx_action_t) action->data);
set = model->states.done_action_set;
- while ((action = xbt_swag_extract(set)))
- SIMIX_simcall_post((smx_action_t) action->data);
+
+ while ((action = xbt_swag_extract(set))) {
+ if (action->data == NULL)
+ XBT_DEBUG("probably vcpu's action %p, skip", action);
+ else
+ SIMIX_simcall_post((smx_action_t) action->data);
+ }
}
/* Clean processes to destroy */
SIMIX_process_empty_trash();
+
+ XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
+ // !(time == -1.0 && xbt_dynar_is_empty())
+
+
} while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
if (xbt_swag_size(simix_global->process_list) != 0) {
break;
}
XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",
- process->pid, process->name, process->smx_host->name,
+ process->pid, process->name, sg_host_name(process->smx_host),
action_description, process->waiting_action,
process->waiting_action->name, (int)process->waiting_action->state);
}
else {
- XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, process->smx_host->name);
+ XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, sg_host_name(process->smx_host));
}
}
}