X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9aa001ef0746e32402c0c9542df3016d1f015595..07c319ec54d6fc778ee3cc5e75a747242006723e:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 7df72d6e62..e0ca93b82d 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -1,16 +1,16 @@ -/* $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. */ #include "private.h" +#include "xbt/heap.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/ex.h" /* ex_backtrace_display */ + XBT_LOG_EXTERNAL_CATEGORY(simix); XBT_LOG_EXTERNAL_CATEGORY(simix_action); XBT_LOG_EXTERNAL_CATEGORY(simix_deployment); @@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); SIMIX_Global_t simix_global = NULL; - +static xbt_heap_t simix_timers = NULL; /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include @@ -62,11 +62,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; @@ -76,169 +76,32 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->kill_process_function = NULL; simix_global->cleanup_process_function = SIMIX_process_cleanup; +#ifdef HAVE_LATENCY_BOUND_TRACKING + simix_global->latency_limited_dict = xbt_dict_new(); +#endif + SIMIX_context_mod_init(); SIMIX_create_maestro_process(); /* context exception handlers */ - __xbt_ex_ctx = SIMIX_process_get_exception; + __xbt_running_ctx_fetch = SIMIX_process_get_running_context; __xbt_ex_terminate = SIMIX_process_exception_terminate; + /* Initialize request mechanism */ + SIMIX_request_init(); + /* Initialize the SIMIX network module */ + SIMIX_network_init(); + /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); surf_init(argc, argv); /* Initialize SURF structures */ } -} - -/* Debug purpose, incomplete */ -void SIMIX_display_process_status(void) -{ - smx_process_t process = NULL; - xbt_fifo_item_t item = NULL; - smx_action_t act; - int nbprocess = xbt_swag_size(simix_global->process_list); - - INFO1("%d processes are still running, waiting for something.", nbprocess); - /* List the process and their state */ - INFO0 - ("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] " : "")); - - if (process->mutex) { - who2 = - 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); - 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); - 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); - free(who); - who = who2; - } - INFO1("%s.", who); - free(who); + if (!simix_timers) { + simix_timers = xbt_heap_new(8, &free); } } - -/** - * \brief Launch the SIMIX simulation, debug purpose - */ -void __SIMIX_main(void) -{ - smx_process_t process = NULL; - smx_cond_t cond = NULL; - smx_action_t smx_action; - xbt_fifo_t actions_done = xbt_fifo_new(); - xbt_fifo_t actions_failed = xbt_fifo_new(); - - /* Clean IO before the run */ - fflush(stdout); - fflush(stderr); - - //surf_solve(); /* Takes traces into account. Returns 0.0 */ - /* xbt_fifo_size(msg_global->process_to_run) */ - - while (SIMIX_solve(actions_done, actions_failed) != -1.0) { - - while ((smx_action = xbt_fifo_pop(actions_failed))) { - - xbt_fifo_item_t _cursor; - - DEBUG1("** %s failed **", smx_action->name); - 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->smx_host->name); - } - SIMIX_cond_broadcast(cond); - /* remove conditional from action */ - SIMIX_unregister_action_to_condition(smx_action, cond); - } - } - - while ((smx_action = xbt_fifo_pop(actions_done))) { - xbt_fifo_item_t _cursor; - - DEBUG1("** %s done **", smx_action->name); - 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->smx_host->name); - } - SIMIX_cond_broadcast(cond); - /* remove conditional from action */ - SIMIX_unregister_action_to_condition(smx_action, cond); - } - } - } - return; -} - -/** - * \brief Kill all running process - * Only maestro can kill everyone :) - */ -void SIMIX_process_killall() -{ - smx_process_t p = NULL; - 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))) - SIMIX_process_kill(p); - - SIMIX_process_empty_trash(); - - return; -} - /** * \brief Clean the SIMIX simulation * @@ -249,6 +112,13 @@ void SIMIX_clean(void) /* Kill everyone (except maestro) */ SIMIX_process_killall(); + /* Exit the SIMIX network module */ + SIMIX_network_exit(); + + /* Exit request mechanism */ + SIMIX_request_destroy(); + + xbt_heap_free(simix_timers); /* Free the remaining data structures */ xbt_swag_free(simix_global->process_to_run); xbt_swag_free(simix_global->process_to_destroy); @@ -258,14 +128,18 @@ void SIMIX_clean(void) xbt_dict_free(&(simix_global->registered_functions)); xbt_dict_free(&(simix_global->host)); +#ifdef HAVE_LATENCY_BOUND_TRACKING + xbt_dict_free(&(simix_global->latency_limited_dict)); +#endif + /* 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->running_ctx); xbt_free(simix_global->maestro_process); simix_global->maestro_process = NULL; /* Restore the default exception setup */ - __xbt_ex_ctx = &__xbt_ex_ctx_default; + __xbt_running_ctx_fetch = &__xbt_ex_ctx_default; __xbt_ex_terminate = &__xbt_ex_terminate_default; /* Finish context module and SURF */ @@ -290,16 +164,56 @@ XBT_INLINE double SIMIX_get_clock(void) return surf_get_clock(); } -/** - * \brief Finish the simulation initialization - * - * Must be called before the first call to SIMIX_solve() - */ -XBT_INLINE void SIMIX_init(void) +void SIMIX_run(void) { - surf_presolve(); + double time = 0; + smx_req_t req; + xbt_swag_t set; + surf_action_t action; + smx_timer_t timer; + surf_model_t model; + unsigned int iter; + + do { + do { + DEBUG0("New Schedule Round"); + SIMIX_context_runall(simix_global->process_to_run); + while((req = SIMIX_request_pop())){ + DEBUG1("Handling request %p", req); + SIMIX_request_pre(req); + } + } while (xbt_swag_size(simix_global->process_to_run)); + + time = surf_solve(SIMIX_timer_next()); + + /* Notify all the hosts that have failed */ + /* FIXME: iterate through the list of failed host and mark each of them */ + /* as failed. On each host, signal all the running processes with host_fail */ + + /* Handle any pending timer */ + while (xbt_heap_size(simix_timers) > 0 && SIMIX_get_clock() >= SIMIX_timer_next()) { + //FIXME: make the timers being real callbacks + // (i.e. provide dispatchers that read and expand the args) + timer = xbt_heap_pop(simix_timers); + if (timer->func) + ((void (*)(void*))timer->func)(timer->args); + } + /* Wake up all process waiting for the action finish */ + xbt_dynar_foreach(model_list, iter, model) { + for(set = model->states.failed_action_set; + set; + set = (set == model->states.failed_action_set) + ? model->states.done_action_set + : NULL) { + while ((action = xbt_swag_extract(set))) + SIMIX_request_post((smx_action_t)action->data); + } + } + } while(time != -1.0); + } + /** * \brief Does a turn of the simulation * @@ -308,6 +222,8 @@ XBT_INLINE void SIMIX_init(void) * \param actions_failed List of actions failed * \return The time spent to execute the simulation or -1 if the simulation ended */ +/* FIXME: this function is now deprecated, remove it */ +#if 0 double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) { @@ -316,16 +232,17 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) double elapsed_time = 0.0; static int state_modifications = 1; int actions_on_system = 0; + smx_timer_t timer; SIMIX_process_empty_trash(); - if (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_debug) && + 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);*/ } { @@ -347,18 +264,26 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) actions_on_system = 1; } } + if (xbt_heap_size(simix_timers) > 0) { + actions_on_system = 1; + } + /* 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); + DEBUG1("Calling surf_solve(%f)", SIMIX_timer_next()); + elapsed_time = surf_solve(SIMIX_timer_next()); + DEBUG1("Elapsed time %f", elapsed_time); } actions_on_system = 0; - while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) { + while (xbt_heap_size(simix_timers) > 0 && SIMIX_get_clock() >= SIMIX_timer_next()) { + timer = xbt_heap_pop(simix_timers); + fun = timer->func; + arg = timer->args; + free(timer); /* change in process, don't quit */ actions_on_system = 1; - DEBUG2("got %p %p", fun, arg); + DEBUG3("got %p %p at %f", fun, arg, timer->date); if (fun == SIMIX_process_create) { smx_process_arg_t args = arg; DEBUG2("Launching %s on %s", args->name, args->hostname); @@ -373,20 +298,20 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) } if (args->kill_time > SIMIX_get_clock()) { - surf_timer_model->extension.timer.set(args->kill_time, (void *) - &SIMIX_process_kill, - (void *) process); + SIMIX_timer_set(args->kill_time, &SIMIX_process_kill, process); } xbt_free(args); } 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); @@ -394,24 +319,20 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) } 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); + SIMIX_timer_set(args->kill_time, simix_global->kill_process_function, process); else - surf_timer_model->extension.timer.set(args->kill_time, (void *) - &SIMIX_process_kill, - (void *) process); + SIMIX_timer_set(args->kill_time, &SIMIX_process_kill, process); } xbt_free(args); } else if (fun == SIMIX_process_kill) { process = arg; DEBUG2("Killing %s on %s", process->name, process->smx_host->name); - SIMIX_process_kill(process); + SIMIX_process_kill(process, SIMIX_process_self()); } else if (fun == simix_global->kill_process_function) { process = arg; (*simix_global->kill_process_function) (process); } else { + //FIXME: ((void (*)(void*))fun)(arg); THROW_IMPOSSIBLE; } } @@ -428,21 +349,22 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) while ((action = xbt_swag_extract(model->states.failed_action_set))) { smx_action = action->data; if (smx_action) { - SIMIX_action_signal_all(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) { - /* Copy the transfered data of the completed communication actions */ - /* FIXME: find a better way to determine if its a comm action */ - if(smx_action->data != NULL) - SIMIX_network_copy_data((smx_comm_t)smx_action->data); - SIMIX_action_signal_all(smx_action); +// SIMIX_action_signal_all(smx_action); } } } } + + if (xbt_heap_size(simix_timers) > 0) { + actions_on_system = 1; + } + state_modifications = 0; if (!actions_on_system) elapsed_time = -1; @@ -461,8 +383,11 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) INFO0("Return a Warning."); } } + + DEBUG1("SIMIX_solve() finished, elapsed_time = %f", elapsed_time); return elapsed_time; } +#endif /** * \brief Set the date to execute a function @@ -475,12 +400,17 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) */ XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg) { - surf_timer_model->extension.timer.set(date, function, arg); + smx_timer_t timer = xbt_new0(s_smx_timer_t, 1); + + timer->date = date; + timer->func = function; + timer->args = arg; + xbt_heap_push(simix_timers, timer, date); } -XBT_INLINE int SIMIX_timer_get(void **function, void **arg) +XBT_INLINE double SIMIX_timer_next(void) { - return surf_timer_model->extension.timer.get(function, arg); + return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; } /** @@ -490,7 +420,8 @@ XBT_INLINE int SIMIX_timer_get(void **function, void **arg) * \param function Create process function * */ -XBT_INLINE 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"); @@ -505,7 +436,8 @@ XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t funct * \param function Kill process function * */ -XBT_INLINE 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"); @@ -520,7 +452,93 @@ XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t function) * \param function cleanup process function * */ -XBT_INLINE void SIMIX_function_register_process_cleanup(void_f_pvoid_t function) +XBT_INLINE void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t + function) { simix_global->cleanup_process_function = function; } + + +void SIMIX_display_process_status(void) +{ + if (simix_global->process_list == NULL) { + return; + } + + smx_process_t process = NULL; + /*xbt_fifo_item_t item = NULL; + smx_action_t act;*/ + int nbprocess = xbt_swag_size(simix_global->process_list); + + INFO1("%d processes are still running, waiting for something.", nbprocess); + /* List the process and their state */ + INFO0 + ("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] " : "")); + + if (process->waiting_action) { + who2 = bprintf("Waiting for action %p to finish", process->waiting_action); + } + + /* + if (process->mutex) { + who2 = + 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); + 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); + 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); + free(who); + who = who2; + } + */ + INFO1("%s.", who); + free(who); + } +}