-#include <cstring>
+#include <cerrno>
+#include <csignal>
+#include <cstring> // strchr
#include <iostream>
#include <stdexcept>
#include <msg/msg.h>
#include "tracing.h"
#include "version.h"
+#define DATA_DESCR_WIDTH 37
+
namespace {
// Failure exit status
enum {
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_LOAD = 0x20, // lost load on exit
+ EXIT_FAILURE_OTHER = 0x40, // other error
};
// Cannot be globally initialized...
condition_t* proc_cond;
unsigned proc_counter = 0;
- statistics comps;
statistics loads;
+ statistics comps;
+ statistics data_send_amount;
+ statistics data_recv_amount;
+ statistics data_send_count;
+ statistics data_recv_count;
+ statistics ctrl_send_amount;
+ statistics ctrl_recv_amount;
+ statistics ctrl_send_count;
+ statistics ctrl_recv_count;
}
result = proc->run();
proc_mutex->acquire();
- comps.push(proc->get_comp());
loads.push(proc->get_real_load());
+ comps.push(proc->get_comp_amount());
+ data_send_amount.push(proc->get_data_send_amount());
+ data_recv_amount.push(proc->get_data_recv_amount());
+ data_send_count.push(proc->get_data_send_count());
+ data_recv_count.push(proc->get_data_recv_count());
+ ctrl_send_amount.push(proc->get_ctrl_send_amount());
+ ctrl_recv_amount.push(proc->get_ctrl_recv_amount());
+ ctrl_send_count.push(proc->get_ctrl_send_count());
+ ctrl_recv_count.push(proc->get_ctrl_recv_count());
// Synchronization barrier...
// The goal is to circumvent a limitation in SimGrid (at least
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;
}
-static void check_for_lost_load()
+static bool check_for_lost_load()
{
+ bool res = true;
double total_init = process::get_total_load_init();
double total_exit = process::get_total_load_exit();
double lost = total_init - total_exit;
double lost_ratio = 100.0 * lost / total_init;
- if (lost_ratio < -opt::load_ratio_threshold)
+ if (lost_ratio < -opt::load_ratio_threshold) {
XBT_ERROR("Gained load at exit! %g (%g%%) <============",
-lost, -lost_ratio);
- else if (lost_ratio > opt::load_ratio_threshold)
+ res = false;
+ } else if (lost_ratio > opt::load_ratio_threshold) {
XBT_ERROR("Lost load at exit! %g (%g%%) <============",
lost, lost_ratio);
- else
+ res = false;
+ } else
XBT_VERB("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
double total_running = process::get_total_load_running();
double running_ratio = 100.0 * total_running / total_init;
- if (running_ratio < -opt::load_ratio_threshold)
+ if (running_ratio < -opt::load_ratio_threshold) {
XBT_ERROR("Negative running load at exit! %g (%g%%) <============",
total_running, running_ratio);
- else if (running_ratio > opt::load_ratio_threshold)
+ res = false;
+ } else if (running_ratio > opt::load_ratio_threshold) {
XBT_ERROR("Remaining running load at exit! %g (%g%%) <============",
total_running, running_ratio);
- else
+ res = false;
+ } else
XBT_VERB("Running load at exit looks good: %g (%g%%)",
total_running, running_ratio);
+ return res;
+}
+
+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", 39, \
- descr " total/avg./stddev. at exit.........................", \
+ XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH, \
+ descr " (total/avg./stddev)................................", \
st.get_sum(), st.get_mean(), st.get_stddev())
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
// 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);
MSG_create_environment(opt::platform_file.c_str());
XBT_DEBUG("Creating hostdata...");
hostdata::create();
+ XBT_INFO("Loaded description of %zd hosts.", hostdata::size());
XBT_DEBUG("Deploying processes...");
if (opt::auto_depl::enabled) {
if (!opt::auto_depl::nhosts)
opt::auto_depl::nhosts, hostdata::size());
opt::auto_depl::nhosts = hostdata::size();
}
- if (!opt::auto_depl::load)
+ if (opt::auto_depl::load == 0.0) {
+ XBT_WARN("Initial load is zero! Falling back on old behaviour.");
opt::auto_depl::load = opt::auto_depl::nhosts;
+ } else if (opt::auto_depl::load < 0.0)
+ opt::auto_depl::load =
+ -opt::auto_depl::load * opt::auto_depl::nhosts;
MY_launch_application(); // it is already opt::* aware...
} else {
MSG_launch_application(opt::deployment_file.c_str());
}
// 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; // =====
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; // =====
}
// Report final simulation status.
if (simulated_time >= 0.0) {
simulation_time.stop();
- check_for_lost_load();
+ elapsed_time.stop();
+ if (!check_for_lost_load())
+ exit_status |= EXIT_FAILURE_LOAD;
XBT_INFO(",----[ Results ]");
PR_STATS("Load", loads);
PR_STATS("Computation", comps);
- XBT_INFO("| Total simulated time...................: %g",
+ PR_STATS("Data send amount", data_send_amount);
+ PR_STATS("Data recv amount", data_recv_amount);
+ PR_STATS("Data send count", data_send_count);
+ PR_STATS("Data recv count", data_recv_count);
+ PR_STATS("Ctrl send amount", ctrl_send_amount);
+ PR_STATS("Ctrl recv amount", ctrl_recv_amount);
+ PR_STATS("Ctrl send count", ctrl_send_count);
+ PR_STATS("Ctrl recv count", ctrl_recv_count);
+ XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+ "Total simulated time..................................",
simulated_time);
- XBT_INFO("| Total simulation time..................: %g",
+ 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)
