It is useless to mention "tr1", now that compilation is done with -std=c++0x.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 102122dc7eab8012aa056eab515f351ad496707a..bce9749dd203324b21ac2985f39a97427d7d4068 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
 #include <cerrno>
 #include <cerrno>

+#include <csignal>

 #include <cstring>              // strchr
 #include <iostream>
 #include <cstring>              // strchr
 #include <iostream>

-#include <signal.h>

 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>


@@ -38,7 +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_INIT  = 0x02,  // failed to initialize simulator
         EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup

-        EXIT_FAILURE_OTHER = 0x10,  // other error
+        EXIT_FAILURE_INTR  = 0x10,  // interrupted by user
+        EXIT_FAILURE_OTHER = 0x20,  // other error

     };
 
     // Cannot be globally initialized...
     };
 
     // Cannot be globally initialized...


@@ -140,7 +141,12 @@ static void signal_handler(int /*sig*/)
         XBT_CRITICAL(">>>>>>>>>>"
                      " caught CTRL-C: global exit requested "
                      "<<<<<<<<<<");
         XBT_CRITICAL(">>>>>>>>>>"
                      " caught CTRL-C: global exit requested "
                      "<<<<<<<<<<");

-        opt::exit_request = true;
+        opt::exit_request = 1;
+    } else {
+        XBT_CRITICAL(">>>>>>>>>>"
+                     " caught CTRL-C for the 2nd time: exit immediately "
+                     "<<<<<<<<<<");
+        exit(EXIT_FAILURE_INTR);

     }
 }
 
     }
 }
 


@@ -150,7 +156,7 @@ static void install_signal_handler()
     action.sa_handler = signal_handler;
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_RESTART;
     action.sa_handler = signal_handler;
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_RESTART;

-    if (sigaction (SIGINT, &action, NULL) == -1) {
+    if (sigaction(SIGINT, &action, NULL) == -1) {

         std::cerr << "sigaction: " << strerror(errno) << "\n";
         exit(EXIT_FAILURE_OTHER);
     }
         std::cerr << "sigaction: " << strerror(errno) << "\n";
         exit(EXIT_FAILURE_OTHER);
     }


@@ -166,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;
     // 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


@@ -279,6 +287,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);


@@ -297,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,
                  "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)