Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git] / src / simdag / sd_global.cpp
index 7579f31..f6fb1dc 100644 (file)
@@ -34,7 +34,7 @@ void SD_init(int *argc, char **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->watch_point_reached = false;
 
   sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f, SD_task_free_f, SD_task_recycle_f);
 
@@ -114,29 +114,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 */
-  SD_task_t task;
-  SD_task_t dst;
-  surf_action_t action;
-  unsigned int iter;
-
   XBT_VERB("Run simulation for %f seconds", how_long);
-  sd_global->watch_point_reached = false;
 
+  sd_global->watch_point_reached = false;
   xbt_dynar_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
-  while(!sd_global->runnable_tasks->empty()){
-    task = *(sd_global->runnable_tasks->begin());
-    XBT_VERB("Executing task '%s'", SD_task_get_name(task));
-    SD_task_run(task);
-  }
+  while(!sd_global->runnable_tasks->empty())
+    SD_task_run(*(sd_global->runnable_tasks->begin()));
 
-  /* main loop */
   double elapsed_time = 0.0;
   double total_time = 0.0;
-  while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
-         !sd_global->watch_point_reached) {
+  /* 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);
@@ -147,66 +137,65 @@ 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());
+      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);
 
         /* 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 succ = task->successors->begin(); succ != task->successors->end(); ++succ){
-          (*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());
+        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((*succ)) == SD_NOT_SCHEDULED && (*succ)->predecessors->empty())
-            SD_task_set_state((*succ), SD_SCHEDULABLE);
+          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_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) {
-            XBT_VERB("Executing task '%s'", SD_task_get_name((*succ)));
-            SD_task_run((*succ));
-          }
+          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_set_state(output, SD_SCHEDULABLE);
 
-          SD_task_t comm_dst = *(dst->successors->begin());
+          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);
-          }
+          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());
+      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);
         xbt_dynar_push(sd_global->return_set, &task);
+        action = surf_model_extract_failed_action_set(model);
       }
     }
   }
@@ -215,14 +204,12 @@ xbt_dynar_t SD_simulate(double how_long) {
     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 t = sd_global->initial_tasks->begin(); t != sd_global->initial_tasks->end();
-         ++t){
-      XBT_WARN("%s is in %s state", SD_task_get_name(*t), state_names[SD_task_get_state(*t)]);
-    }
+    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;
@@ -235,9 +222,7 @@ 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()