diff options
| author | nathanw <nathanw@NetBSD.org> | 2003-03-20 01:03:52 +0000 |
|---|---|---|
| committer | nathanw <nathanw@NetBSD.org> | 2003-03-20 01:03:52 +0000 |
| commit | a0628261fe48db61835e01fd3c963388ecd72ec9 (patch) | |
| tree | 4719dfbc2d04fbf09ce823dfa139de99573f9bda /lib/libpthread | |
| parent | edd9f0f1709730c36ee2042c153abb415a86963b (diff) | |
Use pthread__assert() instead of plain assert(), as the latter has
locking issues.
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/pthread_sig.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/libpthread/pthread_sig.c b/lib/libpthread/pthread_sig.c index 07cfa0bc3b5..33e7a8e051f 100644 --- a/lib/libpthread/pthread_sig.c +++ b/lib/libpthread/pthread_sig.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_sig.c,v 1.12 2003/03/14 22:27:34 nathanw Exp $ */ +/* $NetBSD: pthread_sig.c,v 1.13 2003/03/20 01:03:52 nathanw Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,14 +37,13 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_sig.c,v 1.12 2003/03/14 22:27:34 nathanw Exp $"); +__RCSID("$NetBSD: pthread_sig.c,v 1.13 2003/03/20 01:03:52 nathanw Exp $"); /* We're interposing a specific version of the signal interface. */ #define __LIBC12_SOURCE__ #define __PTHREAD_SIGNAL_PRIVATE -#include <assert.h> #include <errno.h> #include <lwp.h> #include <stdint.h> @@ -383,7 +382,7 @@ sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info, const goto block; /* not signal nor alarm, must have been upgraded to master */ - assert(pt_sigwmaster == self); + pthread__assert(pt_sigwmaster == self); /* update timeout before upgrading to master */ if (timeout) { @@ -449,7 +448,7 @@ sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info, const */ PTQ_FOREACH(target, &pt_sigwaiting, pt_sleep) { if (__sigismember14(target->pt_sigwait, info->si_signo)) { - assert(target->pt_state==PT_STATE_BLOCKED_QUEUE); + pthread__assert(target->pt_state == PT_STATE_BLOCKED_QUEUE); /* copy to waiter siginfo */ memcpy(target->pt_wsig, info, sizeof(*info)); @@ -755,7 +754,7 @@ pthread__kill(pthread_t self, pthread_t target, int sig, int code) * XXX As long as this is uniprocessor, encountering a running * target process is a bug. */ - assert(target->pt_state != PT_STATE_RUNNING); + pthread__assert(target->pt_state != PT_STATE_RUNNING); /* * Holding the state lock blocks out cancellation and any other @@ -894,7 +893,7 @@ pthread__signal_tramp(int sig, int code, */ _setcontext_u(uc); /*NOTREACHED*//*CONSTCOND*/ - assert(0); + pthread__assert(0); } /* |
