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
prevent using garbage in data field
[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
4a87e0f
..
f181bdf
100644
(file)
--- a/
teshsuite/xbt/parallel_log_crashtest.c
+++ b/
teshsuite/xbt/parallel_log_crashtest.c
@@
-6,8
+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. */
/* 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/synchro.h"
+#include "xbt.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
@@
-19,31
+18,32
@@
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 */
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;
for (i = 0; i < test_amount; i++) {
if (more_info)
{
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)",
+
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)");
}
}
+ return NULL;
}
int crasher(int argc, char *argv[]);
int crasher(int argc, char *argv[])
{
int i;
}
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);
/* 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;
for (i = 0; i < crasher_amount; i++)
id[i] = i;
@@
-52,26
+52,21
@@
int crasher(int argc, char *argv[])
for (i = 0; i < crasher_amount; i++) {
char *name = bprintf("thread %d", i);
crashers[i] =
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++)
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);
xbt_free(crashers);
xbt_free(id);
- gras_exit();
return 0;
}
int main(int argc, char *argv[])
{
return 0;
}
int main(int argc, char *argv[])
{
- int errcode;
-
- errcode = crasher(argc, argv);
-
- return errcode;
+ return crasher(argc, argv);
}
}