Account for elapsed (wall clock) time too.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 9a6b5b27b9139b8ca51cc9596f51d080f68d77d3..a88378daa584a7321a48f71e4c7f0ad8b812dfe1 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -166,10 +166,12 @@ int main(int argc, char* argv[])
     // Note: variables used after THROW must be declared as volatile.
     volatile int exit_status = 0;   // global exit status
     volatile double simulated_time = -1.0;
-    timestamp simulation_time;
+    timestamp elapsed_time(timestamp::wallclock_time);
+    timestamp simulation_time(timestamp::cpu_time);
     xbt_ex_t ex;
     MSG_error_t res;
 
+    elapsed_time.start();
     simulation_time.start();
 
     // Set default logging parameters
@@ -236,9 +238,9 @@ int main(int argc, char* argv[])
         }
 
         // Register tracing categories
-        TRACE_category(TRACE_CAT_COMP);
-        TRACE_category(TRACE_CAT_CTRL);
-        TRACE_category(TRACE_CAT_DATA);
+        TRACE_category_with_color(TRACE_CAT_COMP, TRACE_COLOR_COMP);
+        TRACE_category_with_color(TRACE_CAT_CTRL, TRACE_COLOR_CTRL);
+        TRACE_category_with_color(TRACE_CAT_DATA, TRACE_COLOR_DATA);
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
@@ -279,6 +281,7 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
+        elapsed_time.stop();
         check_for_lost_load();
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
@@ -297,6 +300,9 @@ int main(int argc, char* argv[])
         XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
                  "Total simulation time.................................",
                  simulation_time.duration());
+        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+                 "Elapsed (wall clock) time.............................",
+                 elapsed_time.duration());
         XBT_INFO("`----");
     }
     if (exit_status)