X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1213bfe4fb4368952de0f8945fe2b2dc778d346..0a6c8726c3e15e934bf74df09171710e346db558:/teshsuite/xbt/parallel_log_crashtest.c

diff --git a/teshsuite/xbt/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest.c
index 449002732d..4a87e0f55a 100644
--- a/teshsuite/xbt/parallel_log_crashtest.c
+++ b/teshsuite/xbt/parallel_log_crashtest.c
@@ -1,8 +1,7 @@
-/* $Id: philosopher.c,v 1.7 2007/09/10 15:18:39 mquinson Exp $ */
-
 /* synchro_crashtest -- tries to crash the logging mecanism by doing // logs*/
 
-/* Copyright (c) 2007 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
@@ -10,78 +9,69 @@
 #include "gras.h"
 #include "xbt/synchro.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest,"Logs of this example");
-
+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 mecanism) */
-int crasher_amount = 99; /* Up to 99  to not break the logs (and thus the testing mecanism) */
-int *id; /* to pass a pointer to the threads without race condition */
 
+int test_amount = 99;           /* Up to 999 to not break the logs (and thus the testing mecanism) */
+int crasher_amount = 99;        /* Up to 99  to not break the logs (and thus the testing mecanism) */
+int *id;                        /* to pass a pointer to the threads without race condition */
 
-/*
- * Some additionnal code to let the father wait the childs
- */
-xbt_mutex_t mut_end;
-xbt_cond_t cond_end;
-int running_threads;
-
-xbt_mutex_t dead_end;
+int more_info = 0;              /* SET IT TO TRUE TO GET MORE INFO */
 
 /* Code ran by each thread */
-static void crasher_thread(void *arg) {
-   int id = *(int*)arg;
-   int i;
-   
-   for (i=0; i<test_amount; i++) {
-      INFO10("%03d (%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d)",test_amount-i,id,id,id,id,id,id,id,id,id);
-   }
-   
-   xbt_mutex_lock(mut_end);
-   running_threads--;
-   xbt_cond_signal(cond_end);
-   xbt_mutex_unlock(mut_end);
+static void crasher_thread(void *arg)
+{
+  int id = *(int *) arg;
+  int i;
+
+  for (i = 0; i < test_amount; i++) {
+    if (more_info)
+      INFO10("%03d (%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d)",
+             test_amount - i, id, id, id, id, id, id, id, id, id);
+    else
+      INFO0("XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)");
+  }
 }
 
-int crasher (int argc,char *argv[]);
-int crasher (int argc,char *argv[]) {
+int crasher(int argc, char *argv[]);
+int crasher(int argc, char *argv[])
+{
   int i;
   xbt_thread_t *crashers;
-   
-  gras_init(&argc,argv);
+
+  gras_init(&argc, argv);
 
   /* initializations of the philosopher mecanisms */
-  id = xbt_new0(int,crasher_amount); 
-  crashers = xbt_new(xbt_thread_t,crasher_amount);
-     
-  for (i=0; i<crasher_amount; i++)
-     id[i] = i;
-   
-  /* setup the ending mecanism */
-  running_threads = crasher_amount; 
-  cond_end = xbt_cond_init();
-  mut_end = xbt_mutex_init();
-  
+  id = xbt_new0(int, crasher_amount);
+  crashers = xbt_new(xbt_thread_t, crasher_amount);
+
+  for (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_thread_create(name,&crasher_thread,&id[i]);
-     free(name);
+  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 */ );
+    free(name);
   }
-  
+
   /* wait for them */
-  xbt_mutex_lock(mut_end);
-  while (running_threads) 
-     xbt_cond_wait(cond_end,mut_end);
-  xbt_mutex_unlock(mut_end);
-       
+  for (i = 0; i < crasher_amount; i++)
+    xbt_thread_join(crashers[i]);
+
+  xbt_free(crashers);
+  xbt_free(id);
+
   gras_exit();
   return 0;
 }
 
-int main(int argc, char *argv[]){
+int main(int argc, char *argv[])
+{
   int errcode;
 
-  errcode=crasher(argc,argv);
- 
+  errcode = crasher(argc, argv);
+
   return errcode;
 }