A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove more references to gras.
[simgrid.git]
/
teshsuite
/
xbt
/
parallel_log_crashtest.c
diff --git
a/teshsuite/xbt/parallel_log_crashtest.c
b/teshsuite/xbt/parallel_log_crashtest.c
index
3d55f8c
..
6578c3b
100644
(file)
--- a/
teshsuite/xbt/parallel_log_crashtest.c
+++ b/
teshsuite/xbt/parallel_log_crashtest.c
@@
-1,13
+1,12
@@
-/* $Id$ */
-
/* synchro_crashtest -- tries to crash the logging mecanism by doing // logs*/
/* 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. */
/* 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");
#include "xbt/synchro.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
@@
-19,15
+18,6
@@
int *id; /* to pass a pointer to the threads without race
int more_info = 0; /* SET IT TO TRUE TO GET MORE INFO */
int more_info = 0; /* SET IT TO TRUE TO GET MORE INFO */
-/*
- * 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;
-
/* Code ran by each thread */
static void crasher_thread(void *arg)
{
/* Code ran by each thread */
static void crasher_thread(void *arg)
{
@@
-36,16
+26,11
@@
static void crasher_thread(void *arg)
for (i = 0; i < test_amount; i++) {
if (more_info)
for (i = 0; i < test_amount; i++) {
if (more_info)
-
INFO10
("%03d (%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d)",
+
XBT_INFO
("%03d (%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d|%02d)",
test_amount - i, id, id, id, id, id, id, id, id, id);
else
test_amount - i, id, id, id, id, id, id, id, id, id);
else
-
INFO0
("XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)");
+
XBT_INFO
("XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX)");
}
}
-
- xbt_mutex_acquire(mut_end);
- running_threads--;
- xbt_cond_signal(cond_end);
- xbt_mutex_release(mut_end);
}
int crasher(int argc, char *argv[]);
}
int crasher(int argc, char *argv[]);
@@
-54,7
+39,7
@@
int crasher(int argc, char *argv[])
int i;
xbt_thread_t *crashers;
int i;
xbt_thread_t *crashers;
-
gras
_init(&argc, argv);
+
xbt
_init(&argc, argv);
/* initializations of the philosopher mecanisms */
id = xbt_new0(int, crasher_amount);
/* initializations of the philosopher mecanisms */
id = xbt_new0(int, crasher_amount);
@@
-63,25
+48,21
@@
int crasher(int argc, char *argv[])
for (i = 0; i < crasher_amount; i++)
id[i] = i;
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();
-
/* spawn threads */
for (i = 0; i < crasher_amount; i++) {
char *name = bprintf("thread %d", 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]);
+ crashers[i] =
+ xbt_thread_create(name, &crasher_thread, &id[i], 1 /* joinable */ );
free(name);
}
/* wait for them */
free(name);
}
/* wait for them */
- xbt_mutex_acquire(mut_end);
- while (running_threads)
- xbt_cond_wait(cond_end, mut_end);
- xbt_mutex_release(mut_end);
+ for (i = 0; i < crasher_amount; i++)
+ xbt_thread_join(crashers[i]);
+
+ xbt_free(crashers);
+ xbt_free(id);
- gras_exit();
return 0;
}
return 0;
}