X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c8cdcc7c2a4629350cbc3d61f36d63c5bbd4341..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 193b5f444b..a862ecceaa 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -17,30 +17,16 @@ simgrid::sd::Global *sd_global = nullptr; 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(); -} - -Global::~Global(){ - delete initial_tasks; - delete runnable_tasks; - delete completed_tasks; - delete return_set; -} std::set* simulate(double how_long){ XBT_VERB("Run simulation for %f seconds", how_long); sd_global->watch_point_reached = false; - sd_global->return_set->clear(); + sd_global->return_set.clear(); /* explore the runnable tasks */ - while (not sd_global->runnable_tasks->empty()) - SD_task_run(*(sd_global->runnable_tasks->begin())); + while (not sd_global->runnable_tasks.empty()) + SD_task_run(*(sd_global->runnable_tasks.begin())); double elapsed_time = 0.0; double total_time = 0.0; @@ -56,7 +42,7 @@ std::set* simulate(double how_long){ total_time += elapsed_time; /* let's see which tasks are done */ - for (auto const& model : *all_existing_models) { + for (auto const& model : all_existing_models) { simgrid::kernel::resource::Action* action = model->extract_done_action(); while (action != nullptr && action->get_data() != nullptr) { SD_task_t task = static_cast(action->get_data()); @@ -64,8 +50,8 @@ std::set* 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 (sd_global->return_set->find(task) == sd_global->return_set->end()) - sd_global->return_set->insert(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 const& succ : *task->successors) { @@ -112,15 +98,15 @@ std::set* simulate(double how_long){ SD_task_t task = static_cast(action->get_data()); XBT_VERB("Task '%s' failed", SD_task_get_name(task)); SD_task_set_state(task, SD_FAILED); - sd_global->return_set->insert(task); + sd_global->return_set.insert(task); action = model->extract_failed_action(); } } } - if (not sd_global->watch_point_reached && how_long < 0 && not sd_global->initial_tasks->empty()) { - XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size()); - for (auto const& t : *sd_global->initial_tasks) + if (not sd_global->watch_point_reached && how_long < 0 && not sd_global->initial_tasks.empty()) { + XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks.size()); + for (auto const& t : sd_global->initial_tasks) XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t))); } @@ -128,15 +114,15 @@ std::set* simulate(double how_long){ elapsed_time, total_time, sd_global->watch_point_reached); XBT_DEBUG("current time = %f", surf_get_clock()); - return sd_global->return_set; + 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 + * @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){ static std::string state_names[7] = @@ -145,31 +131,28 @@ const char *__get_state_name(e_SD_task_state_t state){ } /** - * \brief Initializes SD internal 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() + * @param argc argument number + * @param argv argument list + * @see SD_create_environment(), SD_exit() */ void SD_init_nocheck(int *argc, char **argv) { xbt_assert(sd_global == nullptr, "SD_init() already called"); - sd_global = new simgrid::sd::Global(); - surf_init(argc, argv); + sd_global = new simgrid::sd::Global(); + simgrid::config::set_default("host/model", "ptask_L07"); - if (simgrid::config::get_value("clean-atexit")) + if (simgrid::config::get_value("debug/clean-atexit")) atexit(SD_exit); - if (_sg_cfg_exit_asap) { - exit(0); - } } -/** \brief set a configuration variable +/** @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. @@ -182,21 +165,21 @@ void SD_config(const char *key, const char *value){ } /** - * \brief Creates the environment + * @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 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 + * @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 + * @include simgrid.dtd * * Here is a small example of such a platform: * - * \include small_platform.xml + * @include small_platform.xml */ void SD_create_environment(const char *platform_file) { @@ -211,18 +194,18 @@ void SD_create_environment(const char *platform_file) } /** - * \brief Launches the simulation. + * @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 + * 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 + * 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() + * @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() */ void SD_simulate(double how_long) { @@ -242,9 +225,9 @@ double SD_get_clock() { } /** - * \brief Destroys all SD internal data + * @brief Destroys all SD internal data * This function should be called when the simulation is over. Don't forget to destroy too. - * \see SD_init(), SD_task_destroy() + * @see SD_init(), SD_task_destroy() */ void SD_exit() {