Account for elapsed (wall clock) time too.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index c2b1d185c28f1fe6d665bf18f079caf0715dd9eb..a88378daa584a7321a48f71e4c7f0ad8b812dfe1 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -6,12 +6,6 @@
 #include <msg/msg.h>
 #include <xbt/log.h>
 
 #include <msg/msg.h>
 #include <xbt/log.h>
 

-// Don't look at this dirty hack...
-// Delete it when THROWF comes in SG/svn.
-#ifndef THROWF
-#define THROWF(...) THROW1(__VA_ARGS__)
-#endif
-

 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
 XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");
 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
 XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");


@@ -172,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;
     // 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;
 
     xbt_ex_t ex;
     MSG_error_t res;
 

+    elapsed_time.start();

     simulation_time.start();
 
     // Set default logging parameters
     simulation_time.start();
 
     // Set default logging parameters


@@ -242,9 +238,9 @@ int main(int argc, char* argv[])
         }
 
         // Register tracing categories
         }
 
         // 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; // =====
 
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 


@@ -285,6 +281,7 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
     // 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);
         check_for_lost_load();
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);


@@ -303,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,
                  "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)
         XBT_INFO("`----");
     }
     if (exit_status)