X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/acae87a17fa72c16ce794b55ace1459f24fe17b2..37464d566c1c679e3b8c0309260810766880d329:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index bd067f6d65..7b8af28a03 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -17,27 +17,20 @@ #include "xbt/str.h" #include "xbt/config.h" #include "surf/surfxml_parse.h" -#ifdef HAVE_LUA -#include -#include -#include -#endif #ifdef HAVE_JEDULE -#include "instr/jedule/jedule_sd_binding.h" +#include "simgrid/jedule/jedule_sd_binding.h" #endif XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, - "Logging specific to SimDag (kernel)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)"); SD_global_t sd_global = NULL; /** * \brief Initializes SD internal data * - * This function must be called before any other SD function. Then you - * should call SD_create_environment(). + * This function must be called before any other SD function. Then you should call SD_create_environment(). * * \param argc argument number * \param argv argument list @@ -50,22 +43,15 @@ void SD_init(int *argc, char **argv) xbt_assert(sd_global == NULL, "SD_init() already called"); sd_global = xbt_new(s_SD_global_t, 1); - sd_global->workstation_list = NULL; - sd_global->link_list = NULL; - 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->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); xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", @@ -75,9 +61,6 @@ void SD_init(int *argc, char **argv) jedule_sd_init(); #endif - XBT_DEBUG("ADD SD LEVELS"); - SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy); - if (_sg_cfg_exit_asap) { SD_exit(); exit(0); @@ -97,7 +80,6 @@ void SD_config(const char *key, const char *value){ xbt_cfg_set_as_string(_sg_cfg_set, key, value); } - /** * \brief Reinits the application part of the simulation (experimental feature) * @@ -113,33 +95,9 @@ void SD_config(const char *key, const char *value){ */ void SD_application_reinit(void) { - -// s_SD_task_t 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_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; - - #ifdef HAVE_JEDULE - jedule_sd_dump(); jedule_sd_cleanup(); jedule_sd_init(); #endif @@ -148,12 +106,11 @@ void SD_application_reinit(void) /** * \brief Creates the environment * - * The environment (i.e. the \ref SD_workstation_management "workstations" - * and the \ref SD_link_management "links") is created with the data stored - * in the given XML platform file. + * The environment (i.e. the \ref sg_host_management "hosts" and the \ref SD_link_management "links") is created with + * the data stored in the given XML platform file. * * \param platform_file name of an XML file describing the environment to create - * \see SD_workstation_management, SD_link_management + * \see sg_host_management, SD_link_management * * The XML file follows this DTD: * @@ -165,47 +122,27 @@ void SD_application_reinit(void) */ void SD_create_environment(const char *platform_file) { - xbt_lib_cursor_t cursor = NULL; - char *name = NULL; - void **surf_storage = NULL; - parse_platform_file(platform_file); - /* now let's create the SD wrappers for workstations, storages and links */ - { - xbt_dict_cursor_t cursor = NULL; - simgrid_Host* host = NULL; - xbt_dict_foreach(host_list, cursor, name, host){ - __SD_workstation_create((const char*)name); - } - } - - xbt_lib_foreach(storage_lib, cursor, name, surf_storage) { - if(surf_storage[SURF_STORAGE_LEVEL]) - __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL); - } - - - XBT_DEBUG("Workstation number: %d, link number: %d", - SD_workstation_get_number(), SD_link_get_number()); + XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count()); #ifdef HAVE_JEDULE jedule_setup_platform(); #endif + XBT_VERB("Starting simulation..."); + surf_presolve(); /* Takes traces into account */ } /** * \brief Launches the simulation. * * The function will execute the \ref SD_RUNNABLE runnable tasks. - * If \a how_long is positive, then the simulation will be stopped either - * when time reaches \a how_long or when a watch point is reached. - * A non-positive value for \a how_long means no time limit, in which case - * the simulation will be stopped either when a watch point is reached or - * when no more task can be executed. + * If \a how_long is positive, then the simulation will be stopped either when time reaches \a how_long or when a watch + * point is reached. + * A non-positive value for \a how_long means no time limit, in which case the simulation will be stopped either when a + * watch point is reached or 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() */ @@ -218,14 +155,6 @@ xbt_dynar_t SD_simulate(double how_long) { SD_dependency_t dependency; surf_action_t action; unsigned int iter, depcnt; - static int first_time = 1; - - if (first_time) { - XBT_VERB("Starting simulation..."); - - surf_presolve(); /* Takes traces into account */ - first_time = 0; - } XBT_VERB("Run simulation for %f seconds", how_long); sd_global->watch_point_reached = 0; @@ -235,20 +164,16 @@ xbt_dynar_t SD_simulate(double how_long) { /* explore the runnable tasks */ 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_dynar_push(sd_global->return_set, &task); - iter--; - } + SD_task_run(task); + xbt_dynar_push(sd_global->return_set, &task); + iter--; } /* main loop */ elapsed_time = 0.0; - while (elapsed_time >= 0.0 && - (how_long < 0.0 || 0.00001 < (how_long -total_time)) && + while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) && !sd_global->watch_point_reached) { surf_model_t model = NULL; - /* dumb variables */ - XBT_DEBUG("Total time: %f", total_time); @@ -265,13 +190,12 @@ xbt_dynar_t SD_simulate(double how_long) { task->finish_time = surf_get_clock(); XBT_VERB("Task '%s' done", SD_task_get_name(task)); - XBT_DEBUG("Calling __SD_task_just_done"); - __SD_task_just_done(task); - XBT_DEBUG("__SD_task_just_done called on task '%s'", - SD_task_get_name(task)); + SD_task_set_state(task, SD_DONE); + task->surf_action->unref(); + task->surf_action = NULL; /* 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) { + if (!xbt_dynar_member(sd_global->return_set, &task)) { xbt_dynar_push(sd_global->return_set, &task); } @@ -284,8 +208,7 @@ xbt_dynar_t SD_simulate(double how_long) { dst->is_not_ready--; XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0", - SD_task_get_name(dst), dst->unsatisfied_dependencies, - dst->is_not_ready); + SD_task_get_name(dst), dst->unsatisfied_dependencies, dst->is_not_ready); if (!(dst->unsatisfied_dependencies)) { if (SD_task_get_state(dst) == SD_SCHEDULED) @@ -294,8 +217,7 @@ xbt_dynar_t SD_simulate(double how_long) { SD_task_set_state(dst, SD_SCHEDULABLE); } - if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && - !(dst->is_not_ready)) { + if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && !(dst->is_not_ready)) { SD_task_set_state(dst, SD_SCHEDULABLE); } @@ -304,13 +226,11 @@ xbt_dynar_t SD_simulate(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_get_state(comm_dst) == SD_NOT_SCHEDULED && - comm_dst->is_not_ready > 0) { + if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->is_not_ready > 0) { comm_dst->is_not_ready--; XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0", - SD_task_get_name(dst), SD_task_get_name(comm_dst), - comm_dst->is_not_ready); + SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->is_not_ready); if (!(comm_dst->is_not_ready)) { SD_task_set_state(comm_dst, SD_SCHEDULABLE); @@ -319,11 +239,10 @@ xbt_dynar_t SD_simulate(double how_long) { } /* is dst runnable now? */ - if (SD_task_get_state(dst) == SD_RUNNABLE - && !sd_global->watch_point_reached) { + 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_dynar_push(sd_global->return_set, &dst); + SD_task_run(dst); + xbt_dynar_push(sd_global->return_set, &dst); } } } @@ -344,18 +263,13 @@ xbt_dynar_t SD_simulate(double how_long) { } if (!sd_global->watch_point_reached && how_long<0){ - 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 - - (int) xbt_dynar_length(sd_global->completed_task_set))); + if (!xbt_dynar_is_empty(sd_global->initial_task_set)) { + XBT_WARN("Simulation is finished but %lu tasks are still not done", + xbt_dynar_length(sd_global->initial_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" }; + { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "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)]); + XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]); } } } @@ -390,11 +304,6 @@ void SD_exit(void) xbt_mallocator_free(sd_global->task_mallocator); - XBT_DEBUG("Destroying workstation and link arrays..."); - xbt_free(sd_global->workstation_list); - xbt_free(sd_global->link_list); - xbt_free(sd_global->recyclable_route); - XBT_DEBUG("Destroying the dynars ..."); xbt_dynar_free_container(&(sd_global->initial_task_set)); xbt_dynar_free_container(&(sd_global->executable_task_set)); @@ -407,7 +316,6 @@ void SD_exit(void) sd_global = NULL; #ifdef HAVE_JEDULE - jedule_sd_dump(); jedule_sd_cleanup(); jedule_sd_exit(); #endif