X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/365058a6f1cd1ae07157d60b7ecabe2800043ef5..844de0597296879c91593ae0604d5718498b81e3:/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c

diff --git a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
index 3ff519b550..5d32c4e0f3 100644
--- a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
+++ b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
@@ -1,17 +1,19 @@
-/* synchro_crashtest -- tries to crash the logging mechanism by doing // logs*/
+/* synchro_crashtest -- tries to crash the logging mechanism by doing parallel logs*/
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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 "xbt.h"
 
+#include <stdio.h> /* snprintf */
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
 
-int test_amount = 99;           /* Up to 999 to not break the logs (and thus the testing mechanism) */
-int crasher_amount = 99;        /* Up to 99  to not break the logs (and thus the testing mechanism) */
+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) */
 int *id;                        /* to pass a pointer to the threads without race condition */
 
 int more_info = 0;              /* SET IT TO TRUE TO GET MORE INFO */
@@ -31,29 +33,24 @@ static void* crasher_thread(void *arg)
   return NULL;
 }
 
-static int crasher(int argc, char *argv[])
+static int crasher()
 {
-  int i;
-  xbt_os_thread_t *crashers;
-
-  xbt_init(&argc, argv);
-
   /* initializations of the philosopher mechanisms */
   id = xbt_new0(int, crasher_amount);
-  crashers = xbt_new(xbt_os_thread_t, crasher_amount);
+  xbt_os_thread_t* crashers = xbt_new(xbt_os_thread_t, crasher_amount);
 
-  for (i = 0; i < crasher_amount; i++)
+  for (int i = 0; i < crasher_amount; i++)
     id[i] = i;
 
   /* spawn threads */
-  for (i = 0; i < crasher_amount; i++) {
-    char *name = bprintf("thread %d", i);
-    crashers[i] = xbt_os_thread_create(name, &crasher_thread, &id[i], NULL );
-    free(name);
+  for (int i = 0; i < crasher_amount; i++) {
+    char name[16];
+    snprintf(name, sizeof name, "thread %d", i);
+    crashers[i] = xbt_os_thread_create(name, &crasher_thread, &id[i]);
   }
 
   /* wait for them */
-  for (i = 0; i < crasher_amount; i++)
+  for (int i = 0; i < crasher_amount; i++)
     xbt_os_thread_join(crashers[i],NULL);
 
   xbt_free(crashers);
@@ -64,5 +61,6 @@ static int crasher(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  return crasher(argc, argv);
+  MSG_init(&argc, argv);
+  return crasher();
 }