}
/* Debug purpose, incomplete */
-void __SIMIX_display_process_status(void)
+void SIMIX_display_process_status(void)
{
smx_process_t process = NULL;
xbt_fifo_item_t item = NULL;
asprintf(&who,"%s on %s: %s",
process->name,
- p_simdata->host->name,
+ p_simdata->s_host->name,
(process->simdata->blocked)?"[BLOCKED] "
:((process->simdata->suspended)?"[SUSPENDED] ":""));
static void _XBT_CALL inthandler(int ignored)
{
INFO0("CTRL-C pressed. Displaying status and bailing out");
- __SIMIX_display_process_status();
+ SIMIX_display_process_status();
exit(1);
}
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->host->name);
+ process->name, process->simdata->s_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->host->name);
+ process->name, process->simdata->s_host->name);
}
SIMIX_cond_broadcast(cond);
/* remove conditional from action */
smx_host_t h = NULL;
smx_process_t p = NULL;
-
while((p=xbt_swag_extract(simix_global->process_list))) {
SIMIX_process_kill(p);
}
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
DEBUG2("Scheduling %s on %s",
process->name,
- process->simdata->host->name);
+ process->simdata->s_host->name);
simix_global->current_process = process;
xbt_context_schedule(process->simdata->context);
/* fflush(NULL); */
while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
DEBUG2("got %p %p", fun, arg);
if(fun==SIMIX_process_create) {
- process_arg_t args = arg;
+ smx_process_arg_t args = arg;
DEBUG2("Launching %s on %s", args->name, args->hostname);
process = SIMIX_process_create(args->name, args->code,
args->data, args->hostname,
if(fun==SIMIX_process_kill) {
process = arg;
DEBUG2("Killing %s on %s", process->name,
- process->simdata->host->name);
+ process->simdata->s_host->name);
SIMIX_process_kill(process);
}
}
/* INFO0("Congratulations ! Simulation terminated : all processes are over"); */
} else {
INFO0("Oops ! Deadlock or code not perfectly clean.");
- __SIMIX_display_process_status();
+ SIMIX_display_process_status();
if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
DEBUG0("Aborting!");