From 8927eb822dce4bffe473d272e506e03435cee833 Mon Sep 17 00:00:00 2001 From: thiery Date: Thu, 2 Dec 2010 14:14:42 +0000 Subject: [PATCH] Remove deprectaed function SIMIX_solve() git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8891 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_global.c | 176 ----------------------------------------- 1 file changed, 176 deletions(-) diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index e0ca93b82d..afdf097733 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -213,182 +213,6 @@ void SIMIX_run(void) } - -/** - * \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; - } - } - - /* 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 * -- 2.20.1