X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a3ff64a8ae1a5566286e3b68a5d669a1bf2949..a533429838a35ac04b4307c5509f32a0e8bce150:/src/simdag/sd_global.cpp?ds=sidebyside diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index e51bd37746..0eb1691c54 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -4,6 +4,7 @@ /* 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 "src/surf/surf_interface.hpp" #include "src/simdag/simdag_private.h" #include "instr/instr_interface.h" #include "xbt/sysdep.h" @@ -46,8 +47,6 @@ void SD_init(int *argc, char **argv) { TRACE_global_init(argc, argv); - s_SD_task_t task; - xbt_assert(sd_global == NULL, "SD_init() already called"); sd_global = xbt_new(s_SD_global_t, 1); @@ -56,26 +55,15 @@ void SD_init(int *argc, char **argv) sd_global->recyclable_route = NULL; sd_global->watch_point_reached = 0; - sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,SD_task_free_f,SD_task_recycle_f); - - sd_global->not_scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->schedulable_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->runnable_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->in_fifo_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->running_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->done_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->failed_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->return_set = - xbt_swag_new(xbt_swag_offset(task, return_hookup)); + sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f, + SD_task_free_f, + SD_task_recycle_f); + + sd_global->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL); + sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL); + sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL); + sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL); + sd_global->task_number = 0; surf_init(argc, argv); @@ -98,7 +86,8 @@ void SD_init(int *argc, char **argv) /** \brief set a configuration variable * - * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options. + * Do --help on any simgrid binary to see the list of currently existing + * configuration variables, and see Section @ref options. * * Example: * SD_config("host/model","default"); @@ -117,59 +106,35 @@ void SD_config(const char *key, const char *value){ * * @warning: this function is still experimental and not perfect. For example, * the simulation clock (and traces usage) is not reset. So, do not use it if - * you use traces in your simulation, and do not use absolute timing after using it. - * That being said, this function is still precious if you want to compare a bunch of - * heuristics on the same platforms. + * you use traces in your simulation, and do not use absolute timing after + * using it. + * That being said, this function is still precious if you want to compare a + * bunch of heuristics on the same platforms. */ void SD_application_reinit(void) { - s_SD_task_t task; +// s_SD_task_t task; - SD_task_t done_task, next_done_task; +// SD_task_t done_task, next_done_task; xbt_die("This function is not working since the C++ links and others. Please report the problem if you really need that function."); XBT_DEBUG("Recreating the swags..."); - xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->schedulable_task_set); - xbt_swag_free(sd_global->scheduled_task_set); - xbt_swag_free(sd_global->runnable_task_set); - xbt_swag_free(sd_global->in_fifo_task_set); - xbt_swag_free(sd_global->running_task_set); - xbt_swag_free(sd_global->failed_task_set); - - sd_global->not_scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->schedulable_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){ - if (xbt_dynar_is_empty(done_task->tasks_before)){ - __SD_task_set_state(done_task, SD_SCHEDULABLE); - } else{ - __SD_task_set_state(done_task, SD_NOT_SCHEDULED); - done_task->unsatisfied_dependencies = - xbt_dynar_length(done_task->tasks_before); - done_task->is_not_ready = done_task->unsatisfied_dependencies; - } - free(done_task->workstation_list); - done_task->workstation_list = NULL; - done_task->workstation_nb = 0; - } - xbt_swag_free(sd_global->done_task_set); - - sd_global->scheduled_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->runnable_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->in_fifo_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->running_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->done_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->failed_task_set = - xbt_swag_new(xbt_swag_offset(task, state_hookup)); +// xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){ +// if (xbt_dynar_is_empty(done_task->tasks_before)){ +// __SD_task_set_state(done_task, SD_SCHEDULABLE); +// } else{ +// __SD_task_set_state(done_task, SD_NOT_SCHEDULED); +// done_task->unsatisfied_dependencies = +// xbt_dynar_length(done_task->tasks_before); +// done_task->is_not_ready = done_task->unsatisfied_dependencies; +// } +// free(done_task->workstation_list); +// done_task->workstation_list = NULL; +// done_task->workstation_nb = 0; +// } + sd_global->task_number = 0; @@ -222,7 +187,7 @@ void SD_create_environment(const char *platform_file) XBT_DEBUG("Workstation number: %d, link number: %d", - SD_workstation_get_number(), SD_link_get_number()); + SD_workstation_get_count(), sg_link_count()); #ifdef HAVE_JEDULE jedule_setup_platform(); #endif @@ -239,27 +204,17 @@ void SD_create_environment(const char *platform_file) * when no more task can be executed. * Then you can call SD_simulate() again. * - * \param how_long maximum duration of the simulation (a negative value means no time limit) + * \param how_long maximum duration of the simulation (a negative value means + * no time limit) * \return a dynar of \ref SD_task_t whose state has changed. * \see SD_task_schedule(), SD_task_watch() */ xbt_dynar_t SD_simulate(double how_long) { - xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL); - SD_task_t task; - - SD_simulate_swag(how_long); - while( (task = (SD_task_t)xbt_swag_extract(sd_global->return_set)) != NULL) { - xbt_dynar_push(changed_tasks, &task); - } - - return changed_tasks; -} - -xbt_swag_t SD_simulate_swag(double how_long) { - double total_time = 0.0; /* we stop the simulation when total_time >= how_long */ + /* we stop the simulation when total_time >= how_long */ + double total_time = 0.0; double elapsed_time = 0.0; - SD_task_t task, task_safe, dst; + SD_task_t task, dst; SD_dependency_t dependency; surf_action_t action; unsigned int iter, depcnt; @@ -275,13 +230,15 @@ xbt_swag_t SD_simulate_swag(double how_long) { XBT_VERB("Run simulation for %f seconds", how_long); sd_global->watch_point_reached = 0; - xbt_swag_reset(sd_global->return_set); + xbt_dynar_reset(sd_global->return_set); /* explore the runnable tasks */ - xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) { + xbt_dynar_foreach(sd_global->executable_task_set , iter, task) { XBT_VERB("Executing task '%s'", SD_task_get_name(task)); - if (__SD_task_try_to_run(task)) - xbt_swag_insert(task,sd_global->return_set); + if (__SD_task_try_to_run(task)){ + xbt_dynar_push(sd_global->return_set, &task); + iter--; + } } /* main loop */ @@ -303,8 +260,8 @@ xbt_swag_t SD_simulate_swag(double how_long) { /* let's see which tasks are done */ xbt_dynar_foreach(all_existing_models, iter, model) { while ((action = surf_model_extract_done_action_set(model))) { - task = (SD_task_t)surf_action_get_data(action); - task->start_time = surf_action_get_start_time(task->surf_action); + task = (SD_task_t) action->getData(); + task->start_time = task->surf_action->getStartTime(); task->finish_time = surf_get_clock(); XBT_VERB("Task '%s' done", SD_task_get_name(task)); @@ -313,8 +270,10 @@ xbt_swag_t SD_simulate_swag(double how_long) { XBT_DEBUG("__SD_task_just_done called on task '%s'", SD_task_get_name(task)); - /* the state has changed */ - xbt_swag_insert(task,sd_global->return_set); + /* the state has changed. Add it only if it's the first change */ + if (xbt_dynar_search_or_negative(sd_global->return_set, &task) < 0) { + xbt_dynar_push(sd_global->return_set, &task); + } /* remove the dependencies after this task */ xbt_dynar_foreach(task->tasks_after, depcnt, dependency) { @@ -329,14 +288,15 @@ xbt_swag_t SD_simulate_swag(double how_long) { dst->is_not_ready); if (!(dst->unsatisfied_dependencies)) { - if (__SD_task_is_scheduled(dst)) - __SD_task_set_state(dst, SD_RUNNABLE); + if (SD_task_get_state(dst) == SD_SCHEDULED) + SD_task_set_state(dst, SD_RUNNABLE); else - __SD_task_set_state(dst, SD_SCHEDULABLE); + SD_task_set_state(dst, SD_SCHEDULABLE); } - if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) { - __SD_task_set_state(dst, SD_SCHEDULABLE); + if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && + !(dst->is_not_ready)) { + SD_task_set_state(dst, SD_SCHEDULABLE); } if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) { @@ -344,7 +304,7 @@ xbt_swag_t SD_simulate_swag(double how_long) { SD_task_t comm_dst; xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep); comm_dst = comm_dep->dst; - if (__SD_task_is_not_scheduled(comm_dst) && + if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->is_not_ready > 0) { comm_dst->is_not_ready--; @@ -353,49 +313,50 @@ xbt_swag_t SD_simulate_swag(double how_long) { comm_dst->is_not_ready); if (!(comm_dst->is_not_ready)) { - __SD_task_set_state(comm_dst, SD_SCHEDULABLE); + SD_task_set_state(comm_dst, SD_SCHEDULABLE); } } } /* is dst runnable now? */ - if (__SD_task_is_runnable(dst) + if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) { XBT_VERB("Executing task '%s'", SD_task_get_name(dst)); if (__SD_task_try_to_run(dst)) - xbt_swag_insert(dst,sd_global->return_set); + xbt_dynar_push(sd_global->return_set, &dst); } } } /* let's see which tasks have just failed */ while ((action = surf_model_extract_failed_action_set(model))) { - task = (SD_task_t)surf_action_get_data(action); + task = (SD_task_t) action->getData(); task->start_time = surf_action_get_start_time(task->surf_action); task->finish_time = surf_get_clock(); XBT_VERB("Task '%s' failed", SD_task_get_name(task)); - __SD_task_set_state(task, SD_FAILED); - surf_action_unref(action); + SD_task_set_state(task, SD_FAILED); + action->unref(); task->surf_action = NULL; - xbt_swag_insert(task,sd_global->return_set); + xbt_dynar_push(sd_global->return_set, &task); } } } if (!sd_global->watch_point_reached && how_long<0){ - if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){ + if ((int) xbt_dynar_length(sd_global->completed_task_set) < + sd_global->task_number){ XBT_WARN("Simulation is finished but %d tasks are still not done", - (sd_global->task_number - xbt_swag_size(sd_global->done_task_set))); - xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){ - XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task)); - } - xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){ - XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task)); - } - xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){ - XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task)); - } + (sd_global->task_number - + (int) xbt_dynar_length(sd_global->completed_task_set))); + static const char* state_names[] = + { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", + "SD_RUNNABLE", "SD_IN_INFO", "SD_RUNNING", "SD_DONE", + "SD_FAILED" }; + xbt_dynar_foreach(sd_global->initial_task_set, iter, task){ + XBT_WARN("%s is in %s state", SD_task_get_name(task), + state_names[SD_task_get_state(task)]); + } } } @@ -434,16 +395,11 @@ void SD_exit(void) xbt_free(sd_global->link_list); xbt_free(sd_global->recyclable_route); - XBT_DEBUG("Destroying the swags..."); - xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->schedulable_task_set); - xbt_swag_free(sd_global->scheduled_task_set); - xbt_swag_free(sd_global->runnable_task_set); - xbt_swag_free(sd_global->in_fifo_task_set); - xbt_swag_free(sd_global->running_task_set); - xbt_swag_free(sd_global->done_task_set); - xbt_swag_free(sd_global->failed_task_set); - xbt_swag_free(sd_global->return_set); + XBT_DEBUG("Destroying the dynars ..."); + xbt_dynar_free_container(&(sd_global->initial_task_set)); + xbt_dynar_free_container(&(sd_global->executable_task_set)); + xbt_dynar_free_container(&(sd_global->completed_task_set)); + xbt_dynar_free_container(&(sd_global->return_set)); TRACE_end();