From 57ab4df0b815042e14039f93e2e2cffc8bc27772 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 23 Nov 2012 00:01:05 +0100 Subject: [PATCH 1/1] use OS threads and not simix ones to run the test in parallel --- teshsuite/xbt/parallel_log_crashtest.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/teshsuite/xbt/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest.c index 6578c3bee5..7fd9780e31 100644 --- a/teshsuite/xbt/parallel_log_crashtest.c +++ b/teshsuite/xbt/parallel_log_crashtest.c @@ -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; 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,13 +53,13 @@ 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); @@ -68,9 +69,5 @@ int crasher(int argc, char *argv[]) int main(int argc, char *argv[]) { - int errcode; - - errcode = crasher(argc, argv); - - return errcode; + return crasher(argc, argv); } -- 2.20.1