X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6e38be67a91e39324842cbf3988edd6133b8e73..45bf16f90c9dc4f28344655ccec87b26f7f3f0ba:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 01ce55778d..5950c4e840 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -6,120 +6,37 @@ #include "simgrid/sg_config.h" #include "simgrid/host.h" -#include "src/simdag/simdag_private.h" #include "src/surf/surf_interface.hpp" #include "simgrid/s4u/engine.hpp" +#include "simdag_private.hpp" XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)"); -SD_global_t sd_global = nullptr; +simgrid::sd::Global *sd_global = nullptr; -/** - * \brief helper for pretty printing of task state - * \param state the state of a task - * \return the equivalent as a readable string - */ -const char *__get_state_name(e_SD_task_state_t state){ - std::string state_names[7] = { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" }; - return state_names[(int)log2(state)].data(); -} - -/** - * \brief Initializes SD internal data - * - * 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 - * \see SD_create_environment(), SD_exit() - */ -void SD_init(int *argc, char **argv) -{ - xbt_assert(sd_global == nullptr, "SD_init() already called"); - - sd_global = xbt_new(s_SD_global_t, 1); - sd_global->watch_point_reached = false; - sd_global->initial_tasks = new std::set(); - sd_global->runnable_tasks = new std::set(); - sd_global->completed_tasks = new std::set(); - sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr); - - surf_init(argc, argv); - - xbt_cfg_setdefault_string("host/model", "ptask_L07"); - -#if HAVE_JEDULE - jedule_sd_init(); -#endif - - if (_sg_cfg_exit_asap) { - SD_exit(); - exit(0); - } -} - -/** \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. - * - * Example: SD_config("host/model","default"); - */ -void SD_config(const char *key, const char *value){ - xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()"); - xbt_cfg_set_as_string(key, value); +namespace simgrid{ +namespace sd{ +Global::Global(){ + watch_point_reached = false; + initial_tasks = new std::set(); + runnable_tasks = new std::set(); + completed_tasks = new std::set(); + return_set = new std::set(); } -/** - * \brief Creates the environment - * - * The environment (i.e. the \ref SD_host_api "hosts" and the \ref SD_link_api "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_host_api, SD_link_api - * - * The XML file follows this DTD: - * - * \include simgrid.dtd - * - * Here is a small example of such a platform: - * - * \include small_platform.xml - */ -void SD_create_environment(const char *platform_file) -{ - simgrid::s4u::Engine::instance()->loadPlatform(platform_file); - - XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count()); -#if HAVE_JEDULE - jedule_setup_platform(); -#endif - XBT_VERB("Starting simulation..."); - surf_presolve(); /* Takes traces into account */ +Global::~Global(){ + delete initial_tasks; + delete runnable_tasks; + delete completed_tasks; + delete return_set; } -/** - * \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. - * Then you can call SD_simulate() again. - * - * \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) { +std::set* simulate(double how_long){ XBT_VERB("Run simulation for %f seconds", how_long); sd_global->watch_point_reached = false; - xbt_dynar_reset(sd_global->return_set); + sd_global->return_set->clear(); /* explore the runnable tasks */ while(!sd_global->runnable_tasks->empty()) @@ -148,8 +65,8 @@ xbt_dynar_t SD_simulate(double how_long) { SD_task_set_state(task, SD_DONE); /* the state has changed. Add it only if it's the first change */ - if (xbt_dynar_member(sd_global->return_set, &task) == 0) - xbt_dynar_push(sd_global->return_set, &task); + if (sd_global->return_set->find(task) == sd_global->return_set->end()) + sd_global->return_set->insert(task); /* remove the dependencies after this task */ for (auto succ : *task->successors) { @@ -196,7 +113,7 @@ xbt_dynar_t SD_simulate(double how_long) { SD_task_t task = static_cast(action->getData()); XBT_VERB("Task '%s' failed", SD_task_get_name(task)); SD_task_set_state(task, SD_FAILED); - xbt_dynar_push(sd_global->return_set, &task); + sd_global->return_set->insert(task); action = surf_model_extract_failed_action_set(model); } } @@ -214,6 +131,111 @@ xbt_dynar_t SD_simulate(double how_long) { return sd_global->return_set; } +} +} + +/** + * \brief helper for pretty printing of task state + * \param state the state of a task + * \return the equivalent as a readable string + */ +const char *__get_state_name(e_SD_task_state_t state){ + std::string state_names[7] = { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" }; + return state_names[static_cast(log2(static_cast(state)))].data(); +} + +/** + * \brief Initializes SD internal data + * + * 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 + * \see SD_create_environment(), SD_exit() + */ +void SD_init(int *argc, char **argv) +{ + xbt_assert(sd_global == nullptr, "SD_init() already called"); + + sd_global = new simgrid::sd::Global(); + + surf_init(argc, argv); + + xbt_cfg_setdefault_string("host/model", "ptask_L07"); + +#if HAVE_JEDULE + jedule_sd_init(); +#endif + + if (_sg_cfg_exit_asap) { + SD_exit(); + exit(0); + } +} + +/** \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. + * + * Example: SD_config("host/model","default"); + */ +void SD_config(const char *key, const char *value){ + xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()"); + xbt_cfg_set_as_string(key, value); +} + +/** + * \brief Creates the environment + * + * The environment (i.e. the \ref SD_host_api "hosts" and the \ref SD_link_api "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_host_api, SD_link_api + * + * The XML file follows this DTD: + * + * \include simgrid.dtd + * + * Here is a small example of such a platform: + * + * \include small_platform.xml + */ +void SD_create_environment(const char *platform_file) +{ + simgrid::s4u::Engine::instance()->loadPlatform(platform_file); + + XBT_DEBUG("Host number: %zu, link number: %d", sg_host_count(), sg_link_count()); +#if 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. + * Then you can call SD_simulate() again. + * + * \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) { + std::set *changed_tasks = simgrid::sd::simulate(how_long); + xbt_dynar_t changed_tasks_dynar = xbt_dynar_new(sizeof(SD_task_t), nullptr); + for (auto task: *changed_tasks) + xbt_dynar_push(changed_tasks_dynar, &task); + return changed_tasks_dynar; +} /** @brief Returns the current clock, in seconds */ double SD_get_clock() { @@ -231,10 +253,5 @@ void SD_exit() jedule_sd_cleanup(); jedule_sd_exit(); #endif - delete sd_global->initial_tasks; - delete sd_global->runnable_tasks; - delete sd_global->completed_tasks; - xbt_dynar_free_container(&(sd_global->return_set)); - xbt_free(sd_global); - sd_global = nullptr; + delete sd_global; }