Module Name: src
Committed By: christos
Date: Sat Feb 13 21:37:12 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: barrier.c
Log Message:
reduce ifdefs
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c:1.2 src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c:1.3
--- src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c:1.2 Sat Feb 20 19:49:55 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c Sat Feb 13 16:37:12 2016
@@ -40,6 +40,11 @@
#include <pthread.h>
#if defined(sun)
#include <synch.h>
+#else
+#define USYNC_THREAD 1
+#define sema_init(a, b, c, d) sem_init((a), (c) != USYNC_THREAD, (b))
+#define sema_wait(a) sem_wait(a)
+#define sema_post(a) sem_post(a)
#endif
#include <stdio.h>
@@ -49,12 +54,7 @@ void
barrier_init(barrier_t *bar, int nthreads)
{
pthread_mutex_init(&bar->bar_lock, NULL);
-#if defined(sun)
sema_init(&bar->bar_sem, 0, USYNC_THREAD, NULL);
-#else
- sem_init(&bar->bar_sem, 0, 0);
-#endif
-
bar->bar_numin = 0;
bar->bar_nthr = nthreads;
}
@@ -66,12 +66,7 @@ barrier_wait(barrier_t *bar)
if (++bar->bar_numin < bar->bar_nthr) {
pthread_mutex_unlock(&bar->bar_lock);
-#if defined(sun)
sema_wait(&bar->bar_sem);
-#else
- sem_wait(&bar->bar_sem);
-#endif
-
return (0);
} else {
@@ -80,11 +75,7 @@ barrier_wait(barrier_t *bar)
/* reset for next use */
bar->bar_numin = 0;
for (i = 1; i < bar->bar_nthr; i++)
-#if defined(sun)
sema_post(&bar->bar_sem);
-#else
- sem_post(&bar->bar_sem);
-#endif
pthread_mutex_unlock(&bar->bar_lock);
return (1);
