X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a44668d9c4fae9baed7798d707fdf843446f2fc..b9d349f4e630752232d93f23b5cb3c33e02e0d05:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index e466ff038d..0670d25f82 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -8,17 +8,21 @@ #include "simgrid/kernel/resource/Model.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/surf/surf_interface.hpp" +#include + XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)"); -simgrid::sd::Global *sd_global = nullptr; +simgrid::sd::Global* sd_global = nullptr; -namespace simgrid{ -namespace sd{ +namespace simgrid { +namespace sd { -std::set* 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; @@ -29,36 +33,34 @@ std::set* simulate(double how_long){ SD_task_run(*(sd_global->runnable_tasks.begin())); double elapsed_time = 0.0; - double total_time = 0.0; + double total_time = 0.0; /* main loop */ while (elapsed_time >= 0 && (how_long < 0 || 0.00001 < (how_long - total_time)) && not sd_global->watch_point_reached) { - XBT_DEBUG("Total time: %f", total_time); - elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long - total_time: -1.0); + elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long - total_time : -1.0); XBT_DEBUG("surf_solve() returns %f", elapsed_time); if (elapsed_time > 0.0) total_time += elapsed_time; /* let's see which tasks are done */ - for (auto const& model : all_existing_models) { - simgrid::kernel::resource::Action* action = model->extract_done_action(); + for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { + const 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()); + auto* task = static_cast(action->get_data()); XBT_VERB("Task '%s' done", SD_task_get_name(task)); 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); + sd_global->return_set.emplace(task); /* remove the dependencies after this task */ for (auto const& succ : *task->successors) { succ->predecessors->erase(task); succ->inputs->erase(task); XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name(succ), - succ->predecessors->size()+succ->inputs->size(), succ->predecessors->size()); + succ->predecessors->size() + succ->inputs->size(), succ->predecessors->size()); if (SD_task_get_state(succ) == SD_NOT_SCHEDULED && succ->predecessors->empty()) SD_task_set_state(succ, SD_SCHEDULABLE); @@ -75,14 +77,14 @@ std::set* simulate(double how_long){ output->start_time = task->finish_time; output->predecessors->erase(task); if (SD_task_get_state(output) == SD_SCHEDULED) - SD_task_set_state(output, SD_RUNNABLE); + SD_task_set_state(output, SD_RUNNABLE); else - SD_task_set_state(output, SD_SCHEDULABLE); + SD_task_set_state(output, SD_SCHEDULABLE); SD_task_t comm_dst = *(output->successors->begin()); - if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()){ - XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0", - SD_task_get_name(output), SD_task_get_name(comm_dst), comm_dst->predecessors->size()); + if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()) { + XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0", SD_task_get_name(output), + SD_task_get_name(comm_dst), comm_dst->predecessors->size()); SD_task_set_state(comm_dst, SD_SCHEDULABLE); } if (SD_task_get_state(output) == SD_RUNNABLE && not sd_global->watch_point_reached) @@ -95,7 +97,7 @@ std::set* simulate(double how_long){ /* let's see which tasks have just failed */ action = model->extract_failed_action(); while (action != nullptr) { - SD_task_t task = static_cast(action->get_data()); + auto* 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); @@ -110,24 +112,25 @@ std::set* simulate(double how_long){ XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t))); } - XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d", - elapsed_time, total_time, sd_global->watch_point_reached); + XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d", elapsed_time, total_time, + sd_global->watch_point_reached); XBT_DEBUG("current time = %f", surf_get_clock()); return &sd_global->return_set; } -} -} +} // namespace sd +} // namespace simgrid /** * @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] = - { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" }; - return state_names[static_cast(log2(static_cast(state)))].data(); +const char* __get_state_name(e_SD_task_state_t state) +{ + static constexpr std::array state_names{ + {"not scheduled", "schedulable", "scheduled", "runnable", "running", "done", "failed"}}; + return state_names.at(static_cast(log2(static_cast(state)))); } /** @@ -139,7 +142,7 @@ const char *__get_state_name(e_SD_task_state_t state){ * @param argv argument list * @see SD_create_environment(), SD_exit() */ -void SD_init_nocheck(int *argc, char **argv) +void SD_init_nocheck(int* argc, char** argv) { xbt_assert(sd_global == nullptr, "SD_init() already called"); @@ -148,7 +151,7 @@ void SD_init_nocheck(int *argc, char **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); } @@ -159,8 +162,9 @@ void SD_init_nocheck(int *argc, char **argv) * * 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()"); +void SD_config(const char* key, const char* value) +{ + xbt_assert(sd_global, "ERROR: Please call SD_init() before using SD_config()"); simgrid::config::set_as_string(key, value); } @@ -181,7 +185,7 @@ void SD_config(const char *key, const char *value){ * * @include small_platform.xml */ -void SD_create_environment(const char *platform_file) +void SD_create_environment(const char* platform_file) { simgrid::s4u::Engine::get_instance()->load_platform(platform_file); @@ -190,7 +194,7 @@ void SD_create_environment(const char *platform_file) jedule_sd_init(); #endif XBT_VERB("Starting simulation..."); - surf_presolve(); /* Takes traces into account */ + surf_presolve(); /* Takes traces into account */ } /** @@ -214,13 +218,14 @@ void SD_simulate(double how_long) void SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar) { - std::set *changed_tasks = simgrid::sd::simulate(how_long); + const std::set* changed_tasks = simgrid::sd::simulate(how_long); for (auto const& task : *changed_tasks) xbt_dynar_push(changed_tasks_dynar, &task); } /** @brief Returns the current clock, in seconds */ -double SD_get_clock() { +double SD_get_clock() +{ return surf_get_clock(); }