diff options
| author | mtm <mtm@FreeBSD.org> | 2003-05-21 03:41:07 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2003-05-21 03:41:07 +0000 |
| commit | 75e88124d7988922181344082558658bd36d2dad (patch) | |
| tree | 80f755b7efe52046be91e342854331a75ce3c6f6 /lib | |
| parent | 98feca67b61085bd7f59e55486be074e6f3d0bf2 (diff) | |
| download | FreeBSD-src-75e88124d7988922181344082558658bd36d2dad.zip FreeBSD-src-75e88124d7988922181344082558658bd36d2dad.tar.gz | |
Insert a debugging aid:
When in either the mutex or cond queue we notice that the thread
is already on one of the queues, don't just simply abort(). Print
out the thread's identifiers and what queue it was on.
Approved by: markm/mentor, re/blanket libthr
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libthr/thread/thr_cond.c | 10 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_mutex.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index e48b121..5e26412 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -518,7 +518,15 @@ static void cond_queue_enq(pthread_cond_t cond, pthread_t pthread) { pthread_t tid = TAILQ_LAST(&cond->c_queue, cond_head); - + char *name; + + name = pthread->name ? pthread->name : "unknown"; + if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on condq\n", + pthread->name, pthread->uniqueid); + if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on mutexq\n", + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index de888e9..c6c80b4 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -1348,7 +1348,15 @@ static inline void mutex_queue_enq(pthread_mutex_t mutex, pthread_t pthread) { pthread_t tid = TAILQ_LAST(&mutex->m_queue, mutex_head); - + char *name; + + name = pthread->name ? pthread->name : "unknown"; + if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on condq\n", + pthread->name, pthread->uniqueid); + if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on mutexq\n", + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* * For the common case of all threads having equal priority, |
