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
Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield
[simgrid.git]
/
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 c4aab99347b408bb9428584269782839836d5329..dc863824b7b911dfcfd76fc75ed3dbe7505516de 100644
(file)
--- a/
teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
+++ b/
teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
@@
-1,17
+1,18
@@
-/* synchro_crashtest -- tries to crash the logging mec
anism by doing //
logs*/
+/* synchro_crashtest -- tries to crash the logging mec
hanism by doing parallel
logs*/
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
7
. 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. */
* 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"
XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
#include "xbt.h"
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 mec
anism) */
-
int crasher_amount = 99; /* Up to 99 to not break the logs (and thus the testing mec
anism) */
+
const int test_amount = 99; /* Up to 99 to not break the logs (and thus the testing mech
anism) */
+
const int crasher_amount = 99; /* Up to 99 to not break the logs (and thus the testing mech
anism) */
int *id; /* to pass a pointer to the threads without race condition */
int more_info = 0; /* SET IT TO TRUE TO GET MORE INFO */
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
+32,24
@@
static void* crasher_thread(void *arg)
return NULL;
}
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 mecanisms */
+ /* initializations of the philosopher mechanisms */
id = xbt_new0(int, crasher_amount);
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 (i
nt i
= 0; i < crasher_amount; i++)
id[i] = i;
/* spawn threads */
id[i] = i;
/* spawn threads */
- for (i = 0; i < crasher_amount; i++) {
- char *name = bprintf("thread %d", i);
+ 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], NULL );
crashers[i] = xbt_os_thread_create(name, &crasher_thread, &id[i], NULL );
- free(name);
}
/* wait for them */
}
/* wait for them */
- for (i = 0; i < crasher_amount; i++)
+ for (i
nt i
= 0; i < crasher_amount; i++)
xbt_os_thread_join(crashers[i],NULL);
xbt_free(crashers);
xbt_os_thread_join(crashers[i],NULL);
xbt_free(crashers);
@@
-64,5
+60,6
@@
static int crasher(int argc, char *argv[])
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- return crasher(argc, argv);
+ MSG_init(&argc, argv);
+ return crasher();
}
}