|
From: <sv...@va...> - 2011-07-30 09:33:03
|
Author: bart
Date: 2011-07-30 10:28:13 +0100 (Sat, 30 Jul 2011)
New Revision: 11949
Log:
drd/tests/pth_barrier_thr_cr: Add more error checking.
Modified:
trunk/drd/tests/pth_barrier_thr_cr.c
Modified: trunk/drd/tests/pth_barrier_thr_cr.c
===================================================================
--- trunk/drd/tests/pth_barrier_thr_cr.c 2011-07-29 14:24:07 UTC (rev 11948)
+++ trunk/drd/tests/pth_barrier_thr_cr.c 2011-07-30 09:28:13 UTC (rev 11949)
@@ -14,34 +14,43 @@
#include <stdlib.h>
#include <unistd.h>
-static pthread_barrier_t s_barrier;
+static pthread_barrier_t* s_barrier;
static void* thread(void* arg)
{
write(STDOUT_FILENO, ".", 1);
- pthread_barrier_wait(&s_barrier);
+ pthread_barrier_wait(s_barrier);
return NULL;
}
int main(int argc, char** argv)
{
pthread_t *tid;
- int barriers = argc > 2 ? atoi(argv[1]) : 20;
+ int barriers = argc > 1 ? atoi(argv[1]) : 20;
int barrier_participants = 2;
int thread_count = barriers * barrier_participants;
- int i;
+ int res, i;
- pthread_barrier_init(&s_barrier, NULL, barrier_participants);
+ s_barrier = malloc(sizeof(*s_barrier));
+ res = pthread_barrier_init(s_barrier, NULL, barrier_participants);
+ assert(res == 0);
tid = malloc(thread_count * sizeof(*tid));
assert(tid);
- for (i = 0; i < thread_count; i++)
- pthread_create(&tid[i], NULL, thread, NULL);
- for (i = 0; i < thread_count; i++)
- pthread_join(tid[i], NULL);
+ for (i = 0; i < thread_count; i++) {
+ res = pthread_create(&tid[i], NULL, thread, NULL);
+ assert(res == 0);
+ }
+ for (i = 0; i < thread_count; i++) {
+ res = pthread_join(tid[i], NULL);
+ assert(res == 0);
+ }
free(tid);
- pthread_barrier_destroy(&s_barrier);
+ res = pthread_barrier_destroy(s_barrier);
+ assert(res == 0);
+ free(s_barrier);
+ s_barrier = NULL;
write(STDOUT_FILENO, "\n", 1);
fprintf(stderr, "Done.\n");
|