X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fe56becb7b12edd78788a83dbc1d3e1d85d9dbc..3d489fd0ea1a24796b898737fdd6a67a8b7bedab:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 166f54aadd..8aeb02a1af 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -4,17 +4,12 @@
 /* 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 "instr/instr_interface.h"
 #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"
 
-#if HAVE_JEDULE
-#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)");
 
@@ -31,17 +26,13 @@ SD_global_t sd_global = nullptr;
  */
 void SD_init(int *argc, char **argv)
 {
-  TRACE_global_init(argc, argv);
-
   xbt_assert(sd_global == nullptr, "SD_init() already called");
 
   sd_global = xbt_new(s_SD_global_t, 1);
-  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->watch_point_reached = false;
 
   sd_global->initial_tasks = new std::set<SD_task_t>();
-  sd_global->executable_tasks = new std::set<SD_task_t>();
+  sd_global->runnable_tasks = new std::set<SD_task_t>();
   sd_global->completed_tasks = new std::set<SD_task_t>();
   sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
 
@@ -116,31 +107,19 @@ void SD_create_environment(const char *platform_file)
  */
 
 xbt_dynar_t SD_simulate(double how_long) {
-  /* we stop the simulation when total_time >= how_long */
-  double total_time = 0.0;
-  SD_task_t task, dst;
-  surf_action_t action;
-  unsigned int iter;
-
   XBT_VERB("Run simulation for %f seconds", how_long);
-  sd_global->watch_point_reached = 0;
 
+  sd_global->watch_point_reached = false;
   xbt_dynar_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
-  std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
-  while(it != sd_global->executable_tasks->end()){
-    task = *it;
-    it++;
-    XBT_VERB("Executing task '%s'", SD_task_get_name(task));
-    SD_task_run(task);
-    xbt_dynar_push(sd_global->return_set, &task);
-  }
+  while(!sd_global->runnable_tasks->empty())
+    SD_task_run(*(sd_global->runnable_tasks->begin()));
 
-  /* main loop */
   double elapsed_time = 0.0;
-  while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
-         !sd_global->watch_point_reached) {
+  double total_time = 0.0;
+  /* main loop */
+  while (elapsed_time >= 0 && (how_long < 0 || 0.00001 < (how_long -total_time)) && !sd_global->watch_point_reached) {
     surf_model_t model = nullptr;
 
     XBT_DEBUG("Total time: %f", total_time);
@@ -151,98 +130,79 @@ xbt_dynar_t SD_simulate(double how_long) {
       total_time += elapsed_time;
 
     /* let's see which tasks are done */
+    unsigned int iter;
     xbt_dynar_foreach(all_existing_models, iter, model) {
-      while ((action = surf_model_extract_done_action_set(model))) {
-        task = static_cast<SD_task_t>(action->getData());
-        task->start_time = task->surf_action->getStartTime();
-
-        task->finish_time = surf_get_clock();
+      surf_action_t action = surf_model_extract_done_action_set(model);
+      while (action != nullptr) {
+        SD_task_t task = static_cast<SD_task_t>(action->getData());
         XBT_VERB("Task '%s' done", SD_task_get_name(task));
         SD_task_set_state(task, SD_DONE);
-        task->surf_action->unref();
-        task->surf_action = nullptr;
 
         /* the state has changed. Add it only if it's the first change */
-        if (xbt_dynar_member(sd_global->return_set, &task) == 0) {
+        if (xbt_dynar_member(sd_global->return_set, &task) == 0)
           xbt_dynar_push(sd_global->return_set, &task);
-        }
 
         /* remove the dependencies after this task */
-        for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it){
-          dst=*it;
-          dst->predecessors->erase(task);
-          dst->inputs->erase(task);
-          XBT_DEBUG("Released a dependency on %s: %zu remain(s). Became schedulable if %zu=0",
-             SD_task_get_name(dst), dst->predecessors->size()+dst->inputs->size(), dst->predecessors->size());
-          if (dst->predecessors->empty() && dst->inputs->empty()) {
-            if (SD_task_get_state(dst) == SD_SCHEDULED)
-              SD_task_set_state(dst, SD_RUNNABLE);
-            else
-              SD_task_set_state(dst, SD_SCHEDULABLE);
-          }
+        for (auto 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(dst) == SD_NOT_SCHEDULED && dst->predecessors->empty()){
-            SD_task_set_state(dst, SD_SCHEDULABLE);
-          }
-          if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
-            XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
-            SD_task_run(dst);
-            xbt_dynar_push(sd_global->return_set, &dst);
-          }
+          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 && !sd_global->watch_point_reached)
+            SD_task_run(succ);
         }
         task->successors->clear();
 
-        for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
-          dst=*it;
-          dst->start_time = task->finish_time;
-          dst->predecessors->erase(task);
-          if (SD_task_get_state(dst) == SD_SCHEDULED)
-             SD_task_set_state(dst, SD_RUNNABLE);
+        for (auto 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(dst, SD_SCHEDULABLE);
-          SD_task_t comm_dst = *(dst->successors->begin());
+             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(dst), SD_task_get_name(comm_dst), comm_dst->predecessors->size());
+                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(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
-            XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
-            SD_task_run(dst);
-            xbt_dynar_push(sd_global->return_set, &dst);
-          }
+          if (SD_task_get_state(output) == SD_RUNNABLE && !sd_global->watch_point_reached)
+            SD_task_run(output);
         }
         task->outputs->clear();
+        action = surf_model_extract_done_action_set(model);
       }
 
       /* let's see which tasks have just failed */
-      while ((action = surf_model_extract_failed_action_set(model))) {
-        task = static_cast<SD_task_t>(action->getData());
-        task->start_time = task->surf_action->getStartTime();
-        task->finish_time = surf_get_clock();
+      action = surf_model_extract_failed_action_set(model);
+      while (action != nullptr) {
+        SD_task_t task = static_cast<SD_task_t>(action->getData());
         XBT_VERB("Task '%s' failed", SD_task_get_name(task));
         SD_task_set_state(task, SD_FAILED);
-        action->unref();
-        task->surf_action = nullptr;
-
         xbt_dynar_push(sd_global->return_set, &task);
+        action = surf_model_extract_failed_action_set(model);
       }
     }
   }
 
-  if (!sd_global->watch_point_reached && how_long<0 && !sd_global->initial_tasks->empty()) {
+  if (!sd_global->watch_point_reached && how_long < 0 && !sd_global->initial_tasks->empty()) {
     XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size());
     static const char* state_names[] =
       { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
-    for (std::set<SD_task_t>::iterator it=sd_global->initial_tasks->begin();
-         it!=sd_global->initial_tasks->end(); ++it){
-      task = *it;
-      XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]);
-    }
+    for (auto t : *sd_global->initial_tasks)
+      XBT_WARN("%s is in %s state", SD_task_get_name(t), state_names[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);
+             elapsed_time, total_time, sd_global->watch_point_reached);
   XBT_DEBUG("current time = %f", surf_get_clock());
 
   return sd_global->return_set;
@@ -255,23 +215,18 @@ double SD_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()
 {
-  TRACE_surf_resource_utilization_release();
-
 #if HAVE_JEDULE
   jedule_sd_cleanup();
   jedule_sd_exit();
 #endif
 
-  xbt_mallocator_free(sd_global->task_mallocator);
   delete sd_global->initial_tasks;
-  delete sd_global->executable_tasks;
+  delete sd_global->runnable_tasks;
   delete sd_global->completed_tasks;
   xbt_dynar_free_container(&(sd_global->return_set));
   xbt_free(sd_global);