#include <cerrno>
+#include <csignal>
#include <cstring> // strchr
#include <iostream>
-#include <signal.h>
#include <stdexcept>
#include <msg/msg.h>
#include <xbt/log.h>
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...
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);
}
}
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);
}
// 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
// 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);
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)