X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ddd4202532d54d217533b97ffde98f1ab078a11..2c8e75834bbb63acef15c560c3de978ab3cb6fbf:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index bc2f6f4ebb..481afb22fe 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. */ @@ -18,6 +16,7 @@ XBT_LOG_EXTERNAL_CATEGORY(simix_environment); XBT_LOG_EXTERNAL_CATEGORY(simix_host); XBT_LOG_EXTERNAL_CATEGORY(simix_process); XBT_LOG_EXTERNAL_CATEGORY(simix_synchro); +XBT_LOG_EXTERNAL_CATEGORY(simix_context); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -55,6 +54,7 @@ void SIMIX_global_init(int *argc, char **argv) XBT_LOG_CONNECT(simix_kernel, simix); XBT_LOG_CONNECT(simix_process, simix); XBT_LOG_CONNECT(simix_synchro, simix); + XBT_LOG_CONNECT(simix_context, simix); simix_global = xbt_new0(s_SIMIX_Global_t, 1); @@ -75,7 +75,12 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->cleanup_process_function = SIMIX_process_cleanup; SIMIX_context_mod_init(); - __SIMIX_create_maestro_process(); + SIMIX_create_maestro_process(); + + /* context exception handlers */ + __xbt_ex_ctx = SIMIX_process_get_exception; + __xbt_ex_terminate = SIMIX_process_exception_terminate; + /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); @@ -128,6 +133,24 @@ void SIMIX_display_process_status(void) 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 @@ -197,24 +220,20 @@ void __SIMIX_main(void) /** * \brief Kill all running process - * + * Only maestro can kill everyone :) */ void SIMIX_process_killall() { smx_process_t p = NULL; - smx_process_t self = SIMIX_process_self(); + 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))) { - if (p != self) - SIMIX_process_kill(p); - } + while ((p = xbt_swag_extract(simix_global->process_list))) + SIMIX_process_kill(p); SIMIX_process_empty_trash(); - if (self != simix_global->maestro_process) { - __SIMIX_process_yield(); - } - return; } @@ -228,23 +247,31 @@ void SIMIX_clean(void) /* Kill everyone (except maestro) */ SIMIX_process_killall(); - /* Free the remaining data structures*/ + /* 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; + simix_global->process_to_destroy = NULL; xbt_dict_free(&(simix_global->registered_functions)); xbt_dict_free(&(simix_global->host)); /* Let's free maestro now */ SIMIX_context_free(simix_global->maestro_process->context); - free(simix_global->maestro_process); + xbt_free(simix_global->maestro_process->exception); + 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(); + surf_exit(); - free(simix_global); + xbt_free(simix_global); simix_global = NULL; return; @@ -256,7 +283,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(); } @@ -266,7 +293,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(); } @@ -286,15 +313,17 @@ 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("**************************************************"); } while ((process = xbt_swag_extract(simix_global->process_to_run))) { DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name); - __SIMIX_process_schedule(process); + SIMIX_process_schedule(process); } { @@ -311,15 +340,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; @@ -328,38 +364,82 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) args->data, args->hostname, args->argc, args->argv, args->properties); - if (process && args->kill_time > SIMIX_get_clock()) { + /* 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); } xbt_free(args); - } - if (fun == SIMIX_process_kill) { + } 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); + /* verify if process has been created */ + if (!process) { + 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); + } + xbt_free(args); + } else if (fun == SIMIX_process_kill) { process = arg; - DEBUG2("Killing %s on %s", process->name, - process->smx_host->name); + DEBUG2("Killing %s on %s", process->name, process->smx_host->name); SIMIX_process_kill(process); + } 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) { @@ -387,12 +467,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); } @@ -404,7 +484,7 @@ 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"); @@ -419,7 +499,7 @@ 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"); @@ -434,7 +514,7 @@ 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; }