X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28c048989504fa2c1f890d9a91784065e32de37d..da994ba1ded3e6d6fc8381444c0bab18a511a18d:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index c974b63849..9c0780032b 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -18,7 +18,7 @@
 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 = NULL;
+SD_global_t sd_global = nullptr;
 
 /**
  * \brief Initializes SD internal data
@@ -33,17 +33,17 @@ void SD_init(int *argc, char **argv)
 {
   TRACE_global_init(argc, argv);
 
-  xbt_assert(sd_global == NULL, "SD_init() already called");
+  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->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
-  sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
-  sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
-  sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+  sd_global->initial_tasks = new std::set<SD_task_t>();
+  sd_global->executable_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);
 
   surf_init(argc, argv);
 
@@ -129,7 +129,9 @@ xbt_dynar_t SD_simulate(double how_long) {
   xbt_dynar_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
-  xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
+  for (std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
+       it!=sd_global->executable_tasks->end(); ++it){
+    task = *it;
     XBT_VERB("Executing task '%s'", SD_task_get_name(task));
     SD_task_run(task);
     xbt_dynar_push(sd_global->return_set, &task);
@@ -140,7 +142,7 @@ xbt_dynar_t SD_simulate(double how_long) {
   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) {
-    surf_model_t model = NULL;
+    surf_model_t model = nullptr;
 
     XBT_DEBUG("Total time: %f", total_time);
 
@@ -159,7 +161,7 @@ xbt_dynar_t SD_simulate(double how_long) {
         XBT_VERB("Task '%s' done", SD_task_get_name(task));
         SD_task_set_state(task, SD_DONE);
         task->surf_action->unref();
-        task->surf_action = NULL;
+        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) {
@@ -221,20 +223,21 @@ xbt_dynar_t SD_simulate(double how_long) {
         XBT_VERB("Task '%s' failed", SD_task_get_name(task));
         SD_task_set_state(task, SD_FAILED);
         action->unref();
-        task->surf_action = NULL;
+        task->surf_action = nullptr;
 
         xbt_dynar_push(sd_global->return_set, &task);
       }
     }
   }
 
-  if (!sd_global->watch_point_reached && how_long<0 &&
-      xbt_dynar_is_empty(sd_global->initial_task_set) == 0) {
-    XBT_WARN("Simulation is finished but %lu tasks are still not done",
-             xbt_dynar_length(sd_global->initial_task_set));
+  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" };
-    xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
+    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)]);
     }
   }
@@ -268,10 +271,10 @@ void SD_exit()
 #endif
 
   xbt_mallocator_free(sd_global->task_mallocator);
-  xbt_dynar_free_container(&(sd_global->initial_task_set));
-  xbt_dynar_free_container(&(sd_global->executable_task_set));
-  xbt_dynar_free_container(&(sd_global->completed_task_set));
+  delete sd_global->initial_tasks;
+  delete sd_global->executable_tasks;
+  delete sd_global->completed_tasks;
   xbt_dynar_free_container(&(sd_global->return_set));
   xbt_free(sd_global);
-  sd_global = NULL;
+  sd_global = nullptr;
 }