X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..78da1c00f59351748ceb0f957c7293b6bd71a31d:/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp

diff --git a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
index b827a05d42..6a0af88302 100644
--- a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
+++ b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
@@ -5,15 +5,16 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "simgrid/msg.h"
+#include "simgrid/s4u/Engine.hpp"
+#include <array>
 #include <thread>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
 
-const int test_amount    = 99; /* Up to 99 to not break the logs (and thus the testing mechanism) */
-const int crasher_amount = 99; /* Up to 99 to not break the logs (and thus the testing mechanism) */
+constexpr int test_amount    = 99; /* Up to 99 to not break the logs (and thus the testing mechanism) */
+constexpr int crasher_amount = 99; /* Up to 99 to not break the logs (and thus the testing mechanism) */
 
-int more_info = 0; /* SET IT TO TRUE TO GET MORE INFO */
+constexpr bool more_info = false; /* SET IT TO TRUE TO GET MORE INFO */
 
 /* Code ran by each thread */
 static void crasher_thread(int id)
@@ -29,18 +30,18 @@ static void crasher_thread(int id)
 
 int main(int argc, char* argv[])
 {
-  MSG_init(&argc, argv);
+  simgrid::s4u::Engine e(&argc, argv);
 
-  std::thread crashers[crasher_amount];
+  std::array<std::thread, crasher_amount> crashers;
 
   /* spawn threads */
-  for (int i = 0; i < crasher_amount; i++) {
-    crashers[i] = std::thread(crasher_thread, i);
-  }
+  int id = 0;
+  for (std::thread& thr : crashers)
+    thr = std::thread(crasher_thread, id++);
 
   /* wait for them */
-  for (int i = 0; i < crasher_amount; i++)
-    crashers[i].join();
+  for (std::thread& thr : crashers)
+    thr.join();
 
   return 0;
 }