X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/26173071a8897d8cd839d6a354816bad7d671547..a561a2e124710e98e19bafea2b87f577779b68b5:/main.cpp

diff --git a/main.cpp b/main.cpp
index ff1fa1b..bce9749 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,6 @@
-#include <cstring>
+#include <cerrno>
+#include <csignal>
+#include <cstring>              // strchr
 #include <iostream>
 #include <stdexcept>
 #include <msg/msg.h>
@@ -36,6 +38,8 @@ namespace {
         EXIT_FAILURE_INIT  = 0x02,  // failed to initialize simulator
         EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
+        EXIT_FAILURE_INTR  = 0x10,  // interrupted by user
+        EXIT_FAILURE_OTHER = 0x20,  // other error
     };
 
     // Cannot be globally initialized...
@@ -95,10 +99,10 @@ static int simulation_main(int argc, char* argv[])
         delete proc;
     }
     catch (const std::invalid_argument& e) {
-        THROW1(arg_error, 0, "%s", e.what());
+        THROWF(arg_error, 0, "%s", e.what());
     }
     catch (const std::exception& e) {
-        THROW1(0, 0, "%s", e.what());
+        THROWF(0, 0, "%s", e.what());
     }
     return result;
 }
@@ -131,6 +135,33 @@ static void check_for_lost_load()
                  total_running, running_ratio);
 }
 
+static void signal_handler(int /*sig*/)
+{
+    if (!opt::exit_request) {
+        XBT_CRITICAL(">>>>>>>>>>"
+                     " caught CTRL-C: global exit requested "
+                     "<<<<<<<<<<");
+        opt::exit_request = 1;
+    } else {
+        XBT_CRITICAL(">>>>>>>>>>"
+                     " caught CTRL-C for the 2nd time: exit immediately "
+                     "<<<<<<<<<<");
+        exit(EXIT_FAILURE_INTR);
+    }
+}
+
+static void install_signal_handler()
+{
+    struct sigaction action;
+    action.sa_handler = signal_handler;
+    sigemptyset(&action.sa_mask);
+    action.sa_flags = SA_RESTART;
+    if (sigaction(SIGINT, &action, NULL) == -1) {
+        std::cerr << "sigaction: " << strerror(errno) << "\n";
+        exit(EXIT_FAILURE_OTHER);
+    }
+}
+
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
              descr " (total/avg./stddev)................................", \
@@ -141,10 +172,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
@@ -162,6 +195,7 @@ int main(int argc, char* argv[])
     // Note: MSG_global_init() may throw an exception, but it seems
     // impossible to catch it correctly :-(
     MSG_global_init(&argc, argv);
+    install_signal_handler();
 
     // Parse global parameters
     bool parse_res = opt::parse_args(&argc, argv);
@@ -210,9 +244,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; // =====
 
@@ -229,7 +263,7 @@ int main(int argc, char* argv[])
         delete proc_mutex;
 
         if (res != MSG_OK)
-            THROW1(0, 0, "MSG_main() failed with status %#x", res);
+            THROWF(0, 0, "MSG_main() failed with status %#x", res);
 
         exit_status = EXIT_NO_FAILURE; // =====
     }
@@ -253,6 +287,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);
@@ -271,6 +306,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)