diff options
| author | kib <kib@FreeBSD.org> | 2015-02-17 01:03:06 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-02-17 01:03:06 +0000 |
| commit | 0cb0cb1b24a8ada17d71f3f1cad36e89d0c0ccfc (patch) | |
| tree | 6c211c0db8606bd913bc7ca6b008edcddc8f1cd3 /lib/libthr | |
| parent | c30b890b0bb2a5cdb5c6bf8b1b31ac21d986f650 (diff) | |
| download | FreeBSD-src-0cb0cb1b24a8ada17d71f3f1cad36e89d0c0ccfc.zip FreeBSD-src-0cb0cb1b24a8ada17d71f3f1cad36e89d0c0ccfc.tar.gz | |
MFC r278751:
Properly interpose libc spinlocks, was missed in r276630.
Diffstat (limited to 'lib/libthr')
| -rw-r--r-- | lib/libthr/thread/thr_private.h | 4 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_spinlock.c | 10 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_syscalls.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index d62de98..3597485 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -928,6 +928,10 @@ int __thr_sigwait(const sigset_t *set, int *sig); int __thr_sigwaitinfo(const sigset_t *set, siginfo_t *info); int __thr_swapcontext(ucontext_t *oucp, const ucontext_t *ucp); +struct _spinlock; +void __thr_spinunlock(struct _spinlock *lck); +void __thr_spinlock(struct _spinlock *lck); + __END_DECLS #endif /* !_THR_PRIVATE_H */ diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c index ecc8067..380d10d 100644 --- a/lib/libthr/thread/thr_spinlock.c +++ b/lib/libthr/thread/thr_spinlock.c @@ -61,7 +61,7 @@ static void init_spinlock(spinlock_t *lck); */ void -_spinunlock(spinlock_t *lck) +__thr_spinunlock(spinlock_t *lck) { struct spinlock_extra *_extra; @@ -70,7 +70,7 @@ _spinunlock(spinlock_t *lck) } void -_spinlock(spinlock_t *lck) +__thr_spinlock(spinlock_t *lck) { struct spinlock_extra *_extra; @@ -84,12 +84,6 @@ _spinlock(spinlock_t *lck) THR_UMUTEX_LOCK(_get_curthread(), &_extra->lock); } -void -_spinlock_debug(spinlock_t *lck, char *fname __unused, int lineno __unused) -{ - _spinlock(lck); -} - static void init_spinlock(spinlock_t *lck) { diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c index 06b63c8..10fbad4 100644 --- a/lib/libthr/thread/thr_syscalls.c +++ b/lib/libthr/thread/thr_syscalls.c @@ -597,6 +597,8 @@ __thr_interpose_libc(void) SLOT(wait4); SLOT(write); SLOT(writev); + SLOT(spinlock); + SLOT(spinunlock); #undef SLOT *(__libc_interposing_slot( INTERPOS__pthread_mutex_init_calloc_cb)) = |
