Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
continue to mess up with simdag
[simgrid.git] / src / simdag / sd_global.cpp
index bc5f199..04a0f1d 100644 (file)
@@ -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. */
 #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 <array>
+
 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;
-
-namespace simgrid{
-namespace sd{
-Global::Global(){
-  watch_point_reached = false;
-  initial_tasks = new std::set<SD_task_t>();
-  runnable_tasks = new std::set<SD_task_t>();
-  completed_tasks = new std::set<SD_task_t>();
-  return_set = new std::set<SD_task_t>();
-}
+std::unique_ptr<simgrid::sd::Global> sd_global = nullptr;
 
-Global::~Global(){
-  delete initial_tasks;
-  delete runnable_tasks;
-  delete completed_tasks;
-  delete return_set;
-}
+namespace simgrid {
+namespace sd {
 
-std::set<SD_task_t>* simulate(double how_long){
+std::set<Task*>* simulate(double how_long)
+{
   XBT_VERB("Run simulation for %f seconds", how_long);
 
+  auto engine = sd_global->engine_->get_impl();
   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_global->runnable_tasks.begin()))->run();
 
   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);
-    XBT_DEBUG("surf_solve() returns %f", elapsed_time);
+    elapsed_time = engine->solve(how_long > 0 ? simgrid_get_clock() + how_long - total_time : -1.0);
+    XBT_DEBUG("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 : engine->get_all_models()) {
+      const kernel::resource::Action* action = model->extract_done_action();
       while (action != nullptr && action->get_data() != nullptr) {
-        SD_task_t task = static_cast<SD_task_t>(action->get_data());
-        XBT_VERB("Task '%s' done", SD_task_get_name(task));
-        SD_task_set_state(task, SD_DONE);
+        auto* task = static_cast<Task*>(action->get_data());
+        XBT_VERB("Task '%s' done", task->get_cname());
+        task->set_state(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());
-
-          if (SD_task_get_state(succ) == SD_NOT_SCHEDULED && succ->predecessors->empty())
-            SD_task_set_state(succ, SD_SCHEDULABLE);
-
-          if (SD_task_get_state(succ) == SD_SCHEDULED && succ->predecessors->empty() && succ->inputs->empty())
-            SD_task_set_state(succ, SD_RUNNABLE);
-
-          if (SD_task_get_state(succ) == SD_RUNNABLE && not sd_global->watch_point_reached)
-            SD_task_run(succ);
-        }
-        task->successors->clear();
-
-        for (auto const& output : *task->outputs) {
-          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);
-          else
-             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());
-            SD_task_set_state(comm_dst, SD_SCHEDULABLE);
-          }
-          if (SD_task_get_state(output) == SD_RUNNABLE && not sd_global->watch_point_reached)
-            SD_task_run(output);
-        }
-        task->outputs->clear();
+        for (auto const& succ : task->get_successors())
+          succ->released_by(task);
+
+        for (auto const& output : task->get_outputs())
+          output->produced_by(task);
+        task->clear_successors();
         action = model->extract_done_action();
       }
 
       /* let's see which tasks have just failed */
       action = model->extract_failed_action();
       while (action != nullptr) {
-        SD_task_t task = static_cast<SD_task_t>(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);
+        auto* task = static_cast<Task*>(action->get_data());
+        XBT_VERB("Task '%s' failed", task->get_cname());
+        task->set_state(SD_FAILED);
+        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)
-      XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t)));
+  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", t->get_cname(), __get_state_name(t->get_state()));
   }
 
-  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());
+  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", simgrid_get_clock());
 
-  return sd_global->return_set;
-}
-}
+  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<int>(log2(static_cast<double>(state)))].data();
+const char* __get_state_name(e_SD_task_state_t state)
+{
+  static constexpr std::array<const char*, 7> state_names{
+      {"not scheduled", "schedulable", "scheduled", "runnable", "running", "done", "failed"}};
+  return state_names.at(static_cast<int>(log2(static_cast<double>(state))));
 }
 
 /**
@@ -153,20 +114,20 @@ 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");
 
-  sd_global = new simgrid::sd::Global();
-
-  surf_init(argc, argv);
+  sd_global = std::make_unique<simgrid::sd::Global>(argc, argv);
 
   simgrid::config::set_default<std::string>("host/model", "ptask_L07");
-  if (simgrid::config::get_value<bool>("clean-atexit"))
-    atexit(SD_exit);
-  if (_sg_cfg_exit_asap) {
-    exit(0);
-  }
+  if (simgrid::config::get_value<bool>("debug/clean-atexit"))
+    atexit([]() {
+#if SIMGRID_HAVE_JEDULE
+      jedule_sd_exit();
+#endif
+      sd_global->engine_->shutdown();
+    });
 }
 
 /** @brief set a configuration variable
@@ -176,8 +137,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);
 }
 
@@ -198,16 +160,16 @@ 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 charplatform_file)
 {
-  simgrid::s4u::Engine::get_instance()->load_platform(platform_file);
+  sd_global->engine_->load_platform(platform_file);
 
-  XBT_DEBUG("Host number: %zu, link number: %d", sg_host_count(), sg_link_count());
+  XBT_DEBUG("Host number: %zu, link number: %zu", sg_host_count(), sg_link_count());
 #if SIMGRID_HAVE_JEDULE
   jedule_sd_init();
 #endif
   XBT_VERB("Starting simulation...");
-  surf_presolve();            /* Takes traces into account */
+  sd_global->engine_->get_impl()->presolve(); /* Takes traces into account */
 }
 
 /**
@@ -231,25 +193,7 @@ void SD_simulate(double how_long)
 
 void SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar)
 {
-  std::set<SD_task_t> *changed_tasks = simgrid::sd::simulate(how_long);
+  const std::set<SD_task_t>* 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() {
-  return surf_get_clock();
-}
-
-/**
- * @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()
- */
-void SD_exit()
-{
-#if SIMGRID_HAVE_JEDULE
-  jedule_sd_exit();
-#endif
-  delete sd_global;
-}