X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..1a39cc6fdc908c33507b5b0f8bae61f7286fd4ca:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 4ae0157e1f..c4a79957bd 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -1,7 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo. - All rights reserved. */ +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -62,11 +60,11 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->host = xbt_dict_new(); simix_global->process_to_run = - xbt_swag_new(xbt_swag_offset(proc, synchro_hookup)); + xbt_swag_new(xbt_swag_offset(proc, synchro_hookup)); simix_global->process_list = - xbt_swag_new(xbt_swag_offset(proc, process_hookup)); + xbt_swag_new(xbt_swag_offset(proc, process_hookup)); simix_global->process_to_destroy = - xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); + xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); simix_global->current_process = NULL; simix_global->maestro_process = NULL; @@ -98,47 +96,71 @@ void SIMIX_display_process_status(void) smx_action_t act; int nbprocess = xbt_swag_size(simix_global->process_list); - INFO1("%d processes are still running, waiting for something.", nbprocess); + INFO1("%d processes are still running, waiting for something.", + nbprocess); /* List the process and their state */ INFO0 - ("Legend of the following listing: \" on : .\""); + ("Legend of the following listing: \" on : .\""); xbt_swag_foreach(process, simix_global->process_list) { char *who, *who2; - asprintf(&who, "%s on %s: %s", - process->name, - process->smx_host->name, - (process->blocked) ? "[BLOCKED] " - : ((process->suspended) ? "[SUSPENDED] " : "")); + who = bprintf("%s on %s: %s", + process->name, + process->smx_host->name, + (process->blocked) ? "[BLOCKED] " + : ((process->suspended) ? "[SUSPENDED] " : "")); if (process->mutex) { who2 = - bprintf("%s Blocked on mutex %p", who, - (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ? - process->mutex : (void *) 0xdead); + bprintf("%s Blocked on mutex %p", who, + (XBT_LOG_ISENABLED + (simix_kernel, + xbt_log_priority_verbose)) ? process->mutex : (void *) + 0xdead); free(who); who = who2; } 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)) ? - process->cond : (void *) 0xdead); + bprintf + ("%s Blocked on condition %p; Waiting for the following actions:", + who, + (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ? + process->cond : (void *) 0xdead); free(who); who = who2; 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)) - ? act : (void *) 0xdead); + bprintf("%s '%s'(%p)", who, act->name, + (XBT_LOG_ISENABLED + (simix_kernel, xbt_log_priority_verbose)) + ? act : (void *) 0xdead); free(who); who = who2; } + } else if (process->sem) { + who2 = + bprintf + ("%s Blocked on semaphore %p; Waiting for the following actions:", + who, + (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ? + process->sem : (void *) 0xdead); + free(who); + who = who2; + xbt_fifo_foreach(process->sem->actions, item, act, smx_action_t) { + who2 = + bprintf("%s '%s'(%p)", who, act->name, + (XBT_LOG_ISENABLED + (simix_kernel, xbt_log_priority_verbose)) + ? act : (void *) 0xdead); + free(who); + who = who2; + } + } else { who2 = - bprintf - ("%s Blocked in an unknown status (please report this bug)", who); + bprintf + ("%s Blocked in an unknown status (please report this bug)", + who); free(who); who = who2; } @@ -209,7 +231,8 @@ void __SIMIX_main(void) void SIMIX_process_killall() { smx_process_t p = NULL; - xbt_assert0((simix_global->current_process == simix_global->maestro_process), + xbt_assert0((simix_global->current_process == + simix_global->maestro_process), "You are not supposed to run this function here!"); while ((p = xbt_swag_extract(simix_global->process_list))) @@ -242,13 +265,13 @@ void SIMIX_clean(void) /* Let's free maestro now */ SIMIX_context_free(simix_global->maestro_process->context); xbt_free(simix_global->maestro_process->exception); - xbt_free(simix_global->maestro_process); + xbt_free(simix_global->maestro_process); simix_global->maestro_process = NULL; /* Restore the default exception setup */ __xbt_ex_ctx = &__xbt_ex_ctx_default; __xbt_ex_terminate = &__xbt_ex_terminate_default; - + /* Finish context module and SURF */ SIMIX_context_mod_exit(); @@ -266,7 +289,7 @@ void SIMIX_clean(void) * * \return Return the clock. */ -double SIMIX_get_clock(void) +XBT_INLINE double SIMIX_get_clock(void) { return surf_get_clock(); } @@ -276,7 +299,7 @@ double SIMIX_get_clock(void) * * Must be called before the first call to SIMIX_solve() */ -void SIMIX_init(void) +XBT_INLINE void SIMIX_init(void) { surf_presolve(); } @@ -296,9 +319,11 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) unsigned int iter; double elapsed_time = 0.0; static int state_modifications = 1; + int actions_on_system = 0; SIMIX_process_empty_trash(); - if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) { + if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug) && + xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) { DEBUG0("**************************************************"); } @@ -321,15 +346,22 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) state_modifications = 1; break; } + if (xbt_swag_size(model->states.running_action_set) + || xbt_swag_size(model->states.ready_action_set)) { + actions_on_system = 1; + } } - - if (!state_modifications) { + /* only calls surf_solve if there are actions to run */ + if (!state_modifications && actions_on_system) { DEBUG1("%f : Calling surf_solve", SIMIX_get_clock()); elapsed_time = surf_solve(); DEBUG1("Elapsed_time %f", elapsed_time); } + actions_on_system = 0; while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) { + /* change in process, don't quit */ + actions_on_system = 1; DEBUG2("got %p %p", fun, arg); if (fun == SIMIX_process_create) { smx_process_arg_t args = arg; @@ -339,72 +371,83 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) args->argc, args->argv, args->properties); /* verify if process has been created */ - if (!process) { - xbt_free(args); - continue; - } - if (args->kill_time > SIMIX_get_clock()) { - surf_timer_model->extension.timer.set(args->kill_time, (void *) - &SIMIX_process_kill, - (void *) process); - } + if (!process) { + xbt_free(args); + continue; + } + + if (args->kill_time > SIMIX_get_clock()) { + surf_timer_model->extension.timer.set(args->kill_time, (void *) + &SIMIX_process_kill, + (void *) process); + } xbt_free(args); - } - if (fun == simix_global->create_process_function) { + } else if (fun == simix_global->create_process_function) { smx_process_arg_t args = arg; DEBUG2("Launching %s on %s", args->name, args->hostname); process = - (*simix_global->create_process_function) (args->name, args->code, - args->data, - args->hostname, - args->argc, args->argv, - args->properties); + (*simix_global->create_process_function) (args->name, + args->code, + args->data, + args->hostname, + args->argc, + args->argv, + args->properties); /* verify if process has been created */ if (!process) { - xbt_free(args); - continue; + xbt_free(args); + continue; } if (args->kill_time > SIMIX_get_clock()) { - if (simix_global->kill_process_function) - surf_timer_model->extension.timer.set(args->kill_time, (void *) - simix_global-> - kill_process_function, - process); - else - surf_timer_model->extension.timer.set(args->kill_time, (void *) - &SIMIX_process_kill, - (void *) process); + if (simix_global->kill_process_function) + surf_timer_model->extension.timer.set(args->kill_time, (void *) + simix_global-> + kill_process_function, + process); + else + surf_timer_model->extension.timer.set(args->kill_time, (void *) + &SIMIX_process_kill, + (void *) process); } xbt_free(args); - } - if (fun == SIMIX_process_kill) { + } else if (fun == SIMIX_process_kill) { process = arg; DEBUG2("Killing %s on %s", process->name, process->smx_host->name); SIMIX_process_kill(process); - } - if (fun == simix_global->kill_process_function) { + } else if (fun == simix_global->kill_process_function) { process = arg; (*simix_global->kill_process_function) (process); + } else { + THROW_IMPOSSIBLE; } } /* Wake up all process waiting for the action finish */ xbt_dynar_foreach(model_list, iter, model) { + /* stop simulation case there are no actions to run */ + if ((xbt_swag_size(model->states.running_action_set)) || + (xbt_swag_size(model->states.ready_action_set)) || + (xbt_swag_size(model->states.done_action_set)) || + (xbt_swag_size(model->states.failed_action_set))) + actions_on_system = 1; + while ((action = xbt_swag_extract(model->states.failed_action_set))) { smx_action = action->data; if (smx_action) { - xbt_fifo_unshift(actions_failed, smx_action); + SIMIX_action_signal_all(smx_action); } } while ((action = xbt_swag_extract(model->states.done_action_set))) { smx_action = action->data; if (smx_action) { - xbt_fifo_unshift(actions_done, smx_action); + SIMIX_action_signal_all(smx_action); } } } } state_modifications = 0; + if (!actions_on_system) + elapsed_time = -1; if (elapsed_time == -1) { if (xbt_swag_size(simix_global->process_list) == 0) { @@ -432,12 +475,12 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) * \param arg Parameters of the function * */ -void SIMIX_timer_set(double date, void *function, void *arg) +XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg) { surf_timer_model->extension.timer.set(date, function, arg); } -int SIMIX_timer_get(void **function, void **arg) +XBT_INLINE int SIMIX_timer_get(void **function, void **arg) { return surf_timer_model->extension.timer.get(function, arg); } @@ -449,7 +492,8 @@ int SIMIX_timer_get(void **function, void **arg) * \param function Create process function * */ -void SIMIX_function_register_process_create(smx_creation_func_t function) +XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t + function) { xbt_assert0((simix_global->create_process_function == NULL), "Data already set"); @@ -464,7 +508,8 @@ void SIMIX_function_register_process_create(smx_creation_func_t function) * \param function Kill process function * */ -void SIMIX_function_register_process_kill(void_f_pvoid_t function) +XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t + function) { xbt_assert0((simix_global->kill_process_function == NULL), "Data already set"); @@ -479,7 +524,8 @@ void SIMIX_function_register_process_kill(void_f_pvoid_t function) * \param function cleanup process function * */ -void SIMIX_function_register_process_cleanup(void_f_pvoid_t function) +XBT_INLINE void SIMIX_function_register_process_cleanup(void_f_pvoid_t + function) { simix_global->cleanup_process_function = function; }