diff options
| author | davidxu <davidxu@FreeBSD.org> | 2006-11-24 09:57:38 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2006-11-24 09:57:38 +0000 |
| commit | add205129cf16571a7deae9362723e40c389c06e (patch) | |
| tree | 70b7566b0ef945730acd1e8a42ffeaebfdaa96af /lib/libthr/thread/thr_sem.c | |
| parent | 361abdf198cb3ffbc110373a06f93d4229802ae9 (diff) | |
| download | FreeBSD-src-add205129cf16571a7deae9362723e40c389c06e.zip FreeBSD-src-add205129cf16571a7deae9362723e40c389c06e.tar.gz | |
Eliminate atomic operations in thread cancellation functions, it should
reduce overheads of cancellation points.
Diffstat (limited to 'lib/libthr/thread/thr_sem.c')
| -rw-r--r-- | lib/libthr/thread/thr_sem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c index ad10aaf..6dbf7f4 100644 --- a/lib/libthr/thread/thr_sem.c +++ b/lib/libthr/thread/thr_sem.c @@ -176,16 +176,16 @@ int _sem_wait(sem_t *sem) { struct pthread *curthread; - int val, oldcancel, retval; + int val, retval; if (sem_check_validity(sem) != 0) return (-1); curthread = _get_curthread(); if ((*sem)->syssem != 0) { - oldcancel = _thr_cancel_enter(curthread); + _thr_cancel_enter(curthread); retval = ksem_wait((*sem)->semid); - _thr_cancel_leave(curthread, oldcancel); + _thr_cancel_leave(curthread); return (retval); } @@ -195,9 +195,9 @@ _sem_wait(sem_t *sem) if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) return (0); } - oldcancel = _thr_cancel_enter(curthread); + _thr_cancel_enter(curthread); retval = _thr_umtx_wait((umtx_t *)&(*sem)->count, 0, NULL); - _thr_cancel_leave(curthread, oldcancel); + _thr_cancel_leave(curthread); } while (retval == 0); errno = retval; return (-1); @@ -209,16 +209,16 @@ _sem_timedwait(sem_t * __restrict sem, { struct timespec ts, ts2; struct pthread *curthread; - int val, oldcancel, retval; + int val, retval; if (sem_check_validity(sem) != 0) return (-1); curthread = _get_curthread(); if ((*sem)->syssem != 0) { - oldcancel = _thr_cancel_enter(curthread); + _thr_cancel_enter(curthread); retval = ksem_timedwait((*sem)->semid, abstime); - _thr_cancel_leave(curthread, oldcancel); + _thr_cancel_leave(curthread); return (retval); } @@ -238,9 +238,9 @@ _sem_timedwait(sem_t * __restrict sem, } clock_gettime(CLOCK_REALTIME, &ts); TIMESPEC_SUB(&ts2, abstime, &ts); - oldcancel = _thr_cancel_enter(curthread); + _thr_cancel_enter(curthread); retval = _thr_umtx_wait((umtx_t *)&(*sem)->count, 0, &ts2); - _thr_cancel_leave(curthread, oldcancel); + _thr_cancel_leave(curthread); } while (retval == 0); errno = retval; return (-1); |
