diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
| commit | 696467e74a4bcf47c2bd3444dd7c1aeedbae50bf (patch) | |
| tree | 924de18265dc0be51357e1a33f5a92e945044299 /cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c | |
| parent | 07def894aa89bea6d85dd76d201343a4a2e73046 (diff) | |
| parent | ceb7b147e676803c22cf6d815f543f21fd9aa926 (diff) | |
| download | FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.zip FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c index bc278b0..c071962 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c @@ -38,7 +38,7 @@ */ #include <pthread.h> -#if defined(sun) +#ifdef illumos #include <synch.h> #endif #include <stdio.h> @@ -49,7 +49,7 @@ void barrier_init(barrier_t *bar, int nthreads) { pthread_mutex_init(&bar->bar_lock, NULL); -#if defined(sun) +#ifdef illumos sema_init(&bar->bar_sem, 0, USYNC_THREAD, NULL); #else sem_init(&bar->bar_sem, 0, 0); @@ -66,7 +66,7 @@ barrier_wait(barrier_t *bar) if (++bar->bar_numin < bar->bar_nthr) { pthread_mutex_unlock(&bar->bar_lock); -#if defined(sun) +#ifdef illumos sema_wait(&bar->bar_sem); #else sem_wait(&bar->bar_sem); @@ -80,7 +80,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) +#ifdef illumos sema_post(&bar->bar_sem); #else sem_post(&bar->bar_sem); |
