X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/61c63b5df9b55aec7c072edb5b392569b215cb83..5ea4e2d40842a43c9a5c2c4d360f928e5dbd3532:/main.cpp

diff --git a/main.cpp b/main.cpp
index fc42d75..0aa4327 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,8 +38,8 @@ namespace {
     xbt_cond_t proc_cond;
     unsigned proc_counter;
 
-    struct statistics comps;
-    struct statistics loads;
+    statistics comps;
+    statistics loads;
 
 }
 
@@ -87,31 +87,31 @@ static void check_for_lost_load()
     double lost = total_init - total_exit;
     double lost_ratio = 100.0 * lost / total_init;
     if (lost_ratio < -opt::load_ratio_threshold)
-        CRITICAL2("Gained load at exit! %g (%g%%) <============",
+        XBT_ERROR("Gained load at exit! %g (%g%%) <============",
                   -lost, -lost_ratio);
     else if (lost_ratio > opt::load_ratio_threshold)
-        CRITICAL2("Lost load at exit! %g (%g%%) <============",
+        XBT_ERROR("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
     else
-        VERB2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
+        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)
-        CRITICAL2("Negative running load at exit! %g (%g%%) <============",
+        XBT_ERROR("Negative running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else if (running_ratio > opt::load_ratio_threshold)
-        CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
+        XBT_ERROR("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else
-        VERB2("Running load at exit looks good: %g (%g%%)",
-               total_running, running_ratio);
+        XBT_VERB("Running load at exit looks good: %g (%g%%)",
+                 total_running, running_ratio);
 }
 
 #define PR_STATS(descr, st)                                             \
-    INFO5("| %.*s: %g / %g / %g", 39,                                   \
-          descr " total/avg./stddev. at exit.........................", \
-          st.get_sum(), st.get_mean(), st.get_stddev())
+    XBT_INFO("| %.*s: %g / %g / %g", 39,                                \
+             descr " total/avg./stddev. at exit.........................", \
+             st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])
 {
@@ -154,7 +154,7 @@ int main(int argc, char* argv[])
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
-    INFO3("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
+    XBT_INFO("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
           version::date.c_str());
     opt::print();
 
@@ -172,8 +172,8 @@ int main(int argc, char* argv[])
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
             if (opt::auto_depl::nhosts > hostdata::size()) {
-                WARN2("%u hosts is too much: limiting to %u",
-                      opt::auto_depl::nhosts, (unsigned )hostdata::size());
+                XBT_WARN("%u hosts is too much: limiting to %zu",
+                         opt::auto_depl::nhosts, hostdata::size());
                 opt::auto_depl::nhosts = hostdata::size();
             }
             if (!opt::auto_depl::load)
@@ -195,10 +195,10 @@ int main(int argc, char* argv[])
         proc_counter = 0;
 
         // Launch the MSG simulation.
-        INFO1("Starting simulation at %f...", MSG_get_clock());
+        XBT_INFO("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
-        INFO1("Simulation ended at %f.", simulated_time);
+        XBT_INFO("Simulation ended at %f.", simulated_time);
 
         xbt_cond_destroy(proc_cond);
         xbt_mutex_destroy(proc_mutex);
@@ -212,8 +212,8 @@ int main(int argc, char* argv[])
         int len = strlen(ex.msg);
         if (len > 0 && ex.msg[len - 1] == '\n')
             ex.msg[len - 1] = '\0'; // strip the ending '\n'
-        ERROR1("%s", ex.msg);
-        DEBUG3("Error from %s() in %s:%d", ex.func, ex.file, ex.line);
+        XBT_ERROR("%s", ex.msg);
+        XBT_DEBUG("Error from %s() in %s:%d", ex.func, ex.file, ex.line);
         xbt_ex_free(ex);
     }
 
@@ -221,7 +221,7 @@ int main(int argc, char* argv[])
     hostdata::destroy();
     res = MSG_clean();
     if (res != MSG_OK) {
-        ERROR1("MSG_clean() failed with status %#x", res);
+        XBT_ERROR("MSG_clean() failed with status %#x", res);
         exit_status |= EXIT_FAILURE_CLEAN;
     }
 
@@ -229,18 +229,19 @@ int main(int argc, char* argv[])
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         check_for_lost_load();
-        INFO0(",----[ Results ]");
+        XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
-        INFO1("| Total simulated time...................: %g", simulated_time);
-        INFO1("| Total simulation time..................: %g",
-              simulation_time.duration());
-        INFO0("`----");
+        XBT_INFO("| Total simulated time...................: %g",
+                 simulated_time);
+        XBT_INFO("| Total simulation time..................: %g",
+                 simulation_time.duration());
+        XBT_INFO("`----");
     }
     if (exit_status)
-        ERROR1("Simulation failed (%#x).", exit_status);
+        XBT_ERROR("Simulation failed (%#x).", exit_status);
     else
-        INFO0("Simulation succeeded.");
+        XBT_INFO("Simulation succeeded.");
 
     return exit_status;
 }