From 275928fc142e604d7d091feb5eff54c72f241964 Mon Sep 17 00:00:00 2001 From: John Birrell Date: Sat, 26 Apr 2008 00:54:52 +0000 Subject: Vendor import of the full userland contrib part of DTrace support from OpenSolaris. This commit resets files to match the versions in the OpenSolaris tree as of 2008/04/10. The changes in this import from the previous import are the ones that will subsequently re-applied to take files off the vendor branch. This is unfortunately necessary because the Solaris developers won't allow FreeBSD support #ifdefs in their source code because that creates 'dead code' (stuff that they never compile). --- tools/ctf/cvt/barrier.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'tools/ctf/cvt/barrier.c') diff --git a/tools/ctf/cvt/barrier.c b/tools/ctf/cvt/barrier.c index bc278b063de1a..d91fbf44db070 100644 --- a/tools/ctf/cvt/barrier.c +++ b/tools/ctf/cvt/barrier.c @@ -38,9 +38,7 @@ */ #include -#if defined(sun) #include -#endif #include #include "barrier.h" @@ -49,11 +47,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,11 +60,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); @@ -80,11 +70,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); -- cgit v1.2.3