X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..57ab4df0b815042e14039f93e2e2cffc8bc27772:/teshsuite/xbt/parallel_log_crashtest.c

diff --git a/teshsuite/xbt/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest.c
index 4f773c362d..7fd9780e31 100644
--- a/teshsuite/xbt/parallel_log_crashtest.c
+++ b/teshsuite/xbt/parallel_log_crashtest.c
@@ -6,7 +6,7 @@
 /* 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 "gras.h"
+#include "xbt.h"
 #include "xbt/synchro.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
@@ -19,7 +19,7 @@ int *id;                        /* to pass a pointer to the threads without race
 int more_info = 0;              /* SET IT TO TRUE TO GET MORE INFO */
 
 /* Code ran by each thread */
-static void crasher_thread(void *arg)
+static void* crasher_thread(void *arg)
 {
   int id = *(int *) arg;
   int i;
@@ -31,19 +31,20 @@ static void crasher_thread(void *arg)
     else
       XBT_INFO("XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)");
   }
+  return NULL;
 }
 
 int crasher(int argc, char *argv[]);
 int crasher(int argc, char *argv[])
 {
   int i;
-  xbt_thread_t *crashers;
+  xbt_os_thread_t *crashers;
 
-  gras_init(&argc, argv);
+  xbt_init(&argc, argv);
 
   /* initializations of the philosopher mecanisms */
   id = xbt_new0(int, crasher_amount);
-  crashers = xbt_new(xbt_thread_t, crasher_amount);
+  crashers = xbt_new(xbt_os_thread_t, crasher_amount);
 
   for (i = 0; i < crasher_amount; i++)
     id[i] = i;
@@ -52,26 +53,21 @@ int crasher(int argc, char *argv[])
   for (i = 0; i < crasher_amount; i++) {
     char *name = bprintf("thread %d", i);
     crashers[i] =
-        xbt_thread_create(name, &crasher_thread, &id[i], 1 /* joinable */ );
+        xbt_os_thread_create(name, &crasher_thread, &id[i], NULL );
     free(name);
   }
 
   /* wait for them */
   for (i = 0; i < crasher_amount; i++)
-    xbt_thread_join(crashers[i]);
+    xbt_os_thread_join(crashers[i],NULL);
 
   xbt_free(crashers);
   xbt_free(id);
 
-  gras_exit();
   return 0;
 }
 
 int main(int argc, char *argv[])
 {
-  int errcode;
-
-  errcode = crasher(argc, argv);
-
-  return errcode;
+  return crasher(argc, argv);
 }