[trace] cosmetics, remove TRACE_is_active, use TRACE_is_enabled instead

[simgrid.git] / src / surf / cpu_im.c

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 229c84d..19f1743 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -234,15 +234,17 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now)
                                           (action).variable) * (now -
                                                                 cpu->last_update));
 #ifdef HAVE_TRACING
-      TRACE_surf_host_set_utilization(cpu->generic_resource.name,
-                                      action->
-                                      generic_lmm_action.generic_action.
-                                      data, (surf_action_t) action,
-                                      lmm_variable_getvalue
-                                      (GENERIC_LMM_ACTION
-                                       (action).variable),
-                                      cpu->last_update,
-                                      now - cpu->last_update);
+      if (TRACE_is_enabled()) {
+        TRACE_surf_host_set_utilization(cpu->generic_resource.name,
+                                        action->
+                                        generic_lmm_action.generic_action.
+                                        data, (surf_action_t) action,
+                                        lmm_variable_getvalue
+                                        (GENERIC_LMM_ACTION
+                                         (action).variable),
+                                        cpu->last_update,
+                                        now - cpu->last_update);
+      }
 #endif
       XBT_DEBUG("Update action(%p) remains %lf", action,
              GENERIC_ACTION(action).remains);
@@ -325,7 +327,7 @@ static void cpu_im_update_actions_state(double now, double delta)
     GENERIC_ACTION(action).finish = surf_get_clock();
     /* set the remains to 0 due to precision problems when updating the remaining amount */
 #ifdef HAVE_TRACING
-    {
+    if (TRACE_is_enabled()) {
       cpu_Cas01_im_t cpu = ((cpu_Cas01_im_t)(action->cpu));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
           action->generic_lmm_action.generic_action.data,
@@ -340,26 +342,26 @@ static void cpu_im_update_actions_state(double now, double delta)
     cpu_im_update_remains(action->cpu, surf_get_clock());
   }
 #ifdef HAVE_TRACING
-  {
+  if (TRACE_is_enabled()) {
     //defining the last timestamp that we can safely dump to trace file
     //without losing the event ascending order (considering all CPU's)
-       void **data;
+    void **data;
     cpu_Cas01_im_t cpu;
     xbt_lib_cursor_t cursor;
     char *key;
     double smaller = -1;
     xbt_lib_foreach(host_lib, cursor, key, data){
-       if(data[SURF_CPU_LEVEL]){
-         cpu = data[SURF_CPU_LEVEL];
-                 if (smaller < 0){
-                       smaller = cpu->last_update;
-                       continue;
-                 }
-                 if (cpu->last_update < smaller){
-                       smaller = cpu->last_update;
-                 }
-       }
-   }
+      if(data[SURF_CPU_LEVEL]){
+        cpu = data[SURF_CPU_LEVEL];
+        if (smaller < 0){
+          smaller = cpu->last_update;
+          continue;
+        }
+        if (cpu->last_update < smaller){
+          smaller = cpu->last_update;
+        }
+      }
+    }
     if (smaller > 0) {
       TRACE_last_timestamp_to_dump = smaller;
     }