Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simdag / sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 4c22ce6..fa37ca6 100644 (file)
--- 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_task_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
+  sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
+  sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
+  sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
 
   surf_init(argc, argv);
 
@@ -64,8 +64,7 @@ void SD_init(int *argc, char **argv)
  * Do --help on any simgrid binary to see the list of currently existing configuration variables, and
  * see Section @ref options.
  *
- * Example:
- * SD_config("host/model","default");
+ * 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()");
@@ -141,7 +140,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);
 
@@ -153,17 +152,17 @@ xbt_dynar_t SD_simulate(double how_long) {
     /* let's see which tasks are done */
     xbt_dynar_foreach(all_existing_models, iter, model) {
       while ((action = surf_model_extract_done_action_set(model))) {
-        task = (SD_task_t) action->getData();
+        task = static_cast<SD_task_t>(action->getData());
         task->start_time = task->surf_action->getStartTime();
 
         task->finish_time = surf_get_clock();
         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)) {
+        if (xbt_dynar_member(sd_global->return_set, &task) == 0) {
           xbt_dynar_push(sd_global->return_set, &task);
         }
 
@@ -177,14 +176,14 @@ xbt_dynar_t SD_simulate(double how_long) {
           XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
              SD_task_get_name(dst), dst->unsatisfied_dependencies, dst->is_not_ready);
 
-          if (!(dst->unsatisfied_dependencies)) {
+          if (dst->unsatisfied_dependencies == 0) {
             if (SD_task_get_state(dst) == SD_SCHEDULED)
               SD_task_set_state(dst, SD_RUNNABLE);
             else
               SD_task_set_state(dst, SD_SCHEDULABLE);
           }
 
-          if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && !(dst->is_not_ready)) {
+          if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && dst->is_not_ready == 0) {
             SD_task_set_state(dst, SD_SCHEDULABLE);
           }
 
@@ -199,7 +198,7 @@ xbt_dynar_t SD_simulate(double how_long) {
             XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
                SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->is_not_ready);
 
-              if (!(comm_dst->is_not_ready)) {
+              if (comm_dst->is_not_ready == 0) {
                 SD_task_set_state(comm_dst, SD_SCHEDULABLE);
               }
             }
@@ -216,28 +215,27 @@ xbt_dynar_t SD_simulate(double how_long) {
 
       /* let's see which tasks have just failed */
       while ((action = surf_model_extract_failed_action_set(model))) {
-        task = (SD_task_t) action->getData();
+        task = static_cast<SD_task_t>(action->getData());
         task->start_time = task->surf_action->getStartTime();
         task->finish_time = surf_get_clock();
         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){
-    if (!xbt_dynar_is_empty(sd_global->initial_task_set)) {
-        XBT_WARN("Simulation is finished but %lu tasks are still not done",
-            xbt_dynar_length(sd_global->initial_task_set));
-        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){
-          XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(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));
+    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){
+      XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]);
     }
   }
 
@@ -249,7 +247,7 @@ xbt_dynar_t SD_simulate(double how_long) {
 }
 
 /** @brief Returns the current clock, in seconds */
-double SD_get_clock(void) {
+double SD_get_clock() {
   return surf_get_clock();
 }
 
@@ -260,7 +258,7 @@ double SD_get_clock(void) {
  *
  * \see SD_init(), SD_task_destroy()
  */
-void SD_exit(void)
+void SD_exit()
 {
   TRACE_surf_resource_utilization_release();
 
@@ -275,5 +273,5 @@ void SD_exit(void)
   xbt_dynar_free_container(&(sd_global->completed_task_set));
   xbt_dynar_free_container(&(sd_global->return_set));
   xbt_free(sd_global);
-  sd_global = NULL;
+  sd_global = nullptr;
 }