Conclusions for performance loss.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 89e9becf3bd4c33f6d0081729c95ec368240cbab..af47c6498a9be603b0e8e292c2cc4cfcf5520321 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <unistd.h>
 #include <iostream>
 #include <stdexcept>
 #include <unistd.h>

-#include <msg/msg.h>
+#include <simgrid/msg.h>

 #include <xbt/log.h>
 
 // Creates log categories
 #include <xbt/log.h>
 
 // Creates log categories


@@ -24,6 +24,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
 #include "misc.h"
 #include "options.h"
 #include "process.h"

+#include "simgrid_features.h"

 #include "statistics.h"
 #include "synchro.h"
 #include "timer.h"
 #include "statistics.h"
 #include "synchro.h"
 #include "timer.h"


@@ -188,12 +189,12 @@ static void install_signal_handler()
 
 #define PR_VALUE(descr, format, ...)                                    \
     XBT_INFO("| %.*s: " format, DATA_DESCR_WIDTH,                       \
 
 #define PR_VALUE(descr, format, ...)                                    \
     XBT_INFO("| %.*s: " format, DATA_DESCR_WIDTH,                       \

-             descr ".................................................", \
+             descr " ................................................", \

              __VA_ARGS__)
 
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
              __VA_ARGS__)
 
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \

-             descr " (sum/avg/dev)...................................", \
+             descr " (sum/avg/dev) ..................................", \

              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])
              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])


@@ -202,7 +203,7 @@ int main(int argc, char* argv[])
     double simulated_time = -1.0;
     timestamp elapsed_time(timestamp::wallclock_time);
     timestamp simulation_time(timestamp::cpu_time);
     double simulated_time = -1.0;
     timestamp elapsed_time(timestamp::wallclock_time);
     timestamp simulation_time(timestamp::cpu_time);

-    MSG_error_t res;
+    msg_error_t res;

 
     elapsed_time.start();
     simulation_time.start();
 
     elapsed_time.start();
     simulation_time.start();


@@ -219,7 +220,7 @@ int main(int argc, char* argv[])
     }
 
     // Initialize some MSG internal data.
     }
 
     // Initialize some MSG internal data.

-    MSG_global_init(&argc, argv);
+    MSG_init(&argc, argv);

     install_signal_handler();
 
     // Parse global parameters
     install_signal_handler();
 
     // Parse global parameters


@@ -233,7 +234,6 @@ int main(int argc, char* argv[])
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)
             opt::usage();
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)
             opt::usage();

-        MSG_clean();

         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
     XBT_INFO("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
     XBT_INFO("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),


@@ -307,11 +307,6 @@ int main(int argc, char* argv[])
 
     // Clean the MSG simulation.
     hostdata::destroy();
 
     // Clean the MSG simulation.
     hostdata::destroy();

-    res = MSG_clean();
-    if (res != MSG_OK) {
-        XBT_ERROR("MSG_clean() failed with status %#x", res);
-        exit_status |= EXIT_FAILURE_CLEAN;
-    }

 
     // Report final simulation status.
     if (simulated_time >= 0.0) {
 
     // Report final simulation status.
     if (simulated_time >= 0.0) {