Add copyright, and license files.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 89e9becf3bd4c33f6d0081729c95ec368240cbab..9b0f8bf31fc1d57093b6946e6df2bda69cba1fdf 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -24,6 +24,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
+#include "simgrid_features.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,                       \
-             descr ".................................................", \
+             descr " ................................................", \
              __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[])
@@ -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);
-    MSG_error_t res;
+    msg_error_t res;
 
     elapsed_time.start();
     simulation_time.start();
@@ -219,7 +220,7 @@ int main(int argc, char* argv[])
     }
 
     // Initialize some MSG internal data.
-    MSG_global_init(&argc, argv);
+    MSG_init(&argc, argv);
     install_signal_handler();
 
     // Parse global parameters