X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..c32579154fc3d877f58348eb6a15d2eed8706b56:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index e0ca93b82d..12829ade27 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -22,7 +22,7 @@ XBT_LOG_EXTERNAL_CATEGORY(simix_context); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); -SIMIX_Global_t simix_global = NULL; +smx_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] */ @@ -37,6 +37,11 @@ static void _XBT_CALL inthandler(int ignored) /********************************* SIMIX **************************************/ +XBT_INLINE double SIMIX_timer_next(void) +{ + return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; +} + /** * \brief Initialize SIMIX internal data. * @@ -58,7 +63,7 @@ void SIMIX_global_init(int *argc, char **argv) XBT_LOG_CONNECT(simix_synchro, simix); XBT_LOG_CONNECT(simix_context, simix); - simix_global = xbt_new0(s_SIMIX_Global_t, 1); + simix_global = xbt_new0(s_smx_global_t, 1); simix_global->host = xbt_dict_new(); simix_global->process_to_run = @@ -68,7 +73,6 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); - simix_global->current_process = NULL; simix_global->maestro_process = NULL; simix_global->registered_functions = xbt_dict_new(); @@ -80,6 +84,7 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->latency_limited_dict = xbt_dict_new(); #endif + surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); SIMIX_create_maestro_process(); @@ -92,10 +97,9 @@ void SIMIX_global_init(int *argc, char **argv) /* 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 */ } if (!simix_timers) { simix_timers = xbt_heap_new(8, &free); @@ -114,10 +118,10 @@ void SIMIX_clean(void) /* 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); @@ -173,12 +177,12 @@ void SIMIX_run(void) 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())){ + while ((req = SIMIX_request_pop())) { DEBUG1("Handling request %p", req); SIMIX_request_pre(req); } @@ -189,7 +193,7 @@ void SIMIX_run(void) /* 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 @@ -200,194 +204,18 @@ void SIMIX_run(void) } /* 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) { + 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 - * - * Executes a step in the surf simulation, adding to the two lists all the actions that finished on this turn. Schedules all processus in the process_to_run list. - * \param actions_done List of actions done - * \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) -{ - - smx_process_t process = NULL; - unsigned int iter; - 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) && - 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);*/ - } - - { - surf_action_t action = NULL; - surf_model_t model = NULL; - smx_action_t smx_action = NULL; - - void *fun = NULL; - void *arg = NULL; - - xbt_dynar_foreach(model_list, iter, model) { - if (xbt_swag_size(model->states.failed_action_set) - || xbt_swag_size(model->states.done_action_set)) { - 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 (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("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 (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; - 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); - process = SIMIX_process_create(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()) { - 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); - /* 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) - SIMIX_timer_set(args->kill_time, simix_global->kill_process_function, process); - else - 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_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; + SIMIX_request_post((smx_action_t) action->data); } } + } while (time != -1.0); - /* 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) { -// SIMIX_action_signal_all(smx_action); - } - } - while ((action = xbt_swag_extract(model->states.done_action_set))) { - smx_action = action->data; - if (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; - - if (elapsed_time == -1) { - if (xbt_swag_size(simix_global->process_list) == 0) { -/* INFO0("Congratulations ! Simulation terminated : all processes are over"); */ - } else { - INFO0("Oops ! Deadlock or code not perfectly clean."); - SIMIX_display_process_status(); - if (XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) || - XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) { - DEBUG0("Aborting!"); - xbt_abort(); - } - 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 @@ -408,11 +236,6 @@ XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg) xbt_heap_push(simix_timers, timer, date); } -XBT_INLINE double SIMIX_timer_next(void) -{ - return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; -} - /** * \brief Registers a function to create a process. * @@ -465,13 +288,14 @@ void SIMIX_display_process_status(void) return; } - smx_process_t process = NULL; - /*xbt_fifo_item_t item = NULL; + /*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 */ + /* FIXME: reimplement me INFO0 ("Legend of the following listing: \" on : .\""); xbt_swag_foreach(process, simix_global->process_list) { @@ -487,7 +311,6 @@ void SIMIX_display_process_status(void) who2 = bprintf("Waiting for action %p to finish", process->waiting_action); } - /* if (process->mutex) { who2 = bprintf("%s Blocked on mutex %p", who, @@ -537,8 +360,8 @@ void SIMIX_display_process_status(void) free(who); who = who2; } - */ INFO1("%s.", who); free(who); } + */ }