X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/e02d85948b5f10d8b37e39ec94d915c48f46a15a..36f2b9a493e14c00fec410c84dfaff6a654ce929:/main.cpp

diff --git a/main.cpp b/main.cpp
index 5d43190..fe584f7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,13 +3,6 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "deployment.h"
-#include "hostdata.h"
-#include "misc.h"
-#include "options.h"
-#include "process.h"
-#include "timer.h"
-#include "version.h"
 
 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
@@ -21,6 +14,14 @@ XBT_LOG_NEW_SUBCATEGORY(loba, simu, "Messages from load-balancer");
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
+#include "deployment.h"
+#include "hostdata.h"
+#include "misc.h"
+#include "options.h"
+#include "process.h"
+#include "timer.h"
+#include "version.h"
+
 // Failure exit status
 enum {
     EXIT_NO_FAILURE    = 0x00,  // no error
@@ -76,9 +77,15 @@ int main(int argc, char* argv[])
     simulation_time.start();
 
     // Set default logging parameters
-    // xbt_log_control_set("simu.thres:verbose");
-    xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");
-    xbt_log_control_set("main.fmt:'[%c/%p] %m%n'");
+    bool do_log_control_set = true;
+    for (int i = 1 ; do_log_control_set && i < argc ; i++)
+        do_log_control_set = !(argv[i][0] == '-' && argv[i][1] != '-' &&
+                               strchr(argv[i] + 1, 'v'));
+    if (do_log_control_set) {
+        // xbt_log_control_set("simu.thres:verbose");
+        xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");
+        xbt_log_control_set("main.fmt:'[%c/%p] %m%n'");
+    }
 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems
@@ -99,7 +106,8 @@ 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(), version::date.c_str());
+    INFO3("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
+          version::date.c_str());
     opt::print();
 
     TRY {