From dc5114efb5a7accba1140bb50db1def228a37531 Mon Sep 17 00:00:00 2001 From: deischen Date: Sat, 24 May 2003 02:29:25 +0000 Subject: Change low-level locking a bit so that we can tell if a lock is being waitied on. Fix a races in join and cancellation. When trying to wait on a CV and the library is not yet threaded, make it threaded so that waiting actually works. When trying to nanosleep() and we're not threaded, just call the system call nanosleep instead of adding the thread to the wait queue. Clean up adding/removing new threads to the "all threads queue", assigning them unique ids, and tracking how many active threads there are. Do it all when the thread is added to the scheduling queue instead of making pthread_create() know how to do it. Fix a race where a thread could be marked for signal delivery but it could be exited before we actually add the signal to it. Other minor cleanups and bug fixes. Submitted by: davidxu Approved by: re@ (blanket for libpthread) --- lib/libpthread/thread/thr_find_thread.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lib/libpthread/thread/thr_find_thread.c') diff --git a/lib/libpthread/thread/thr_find_thread.c b/lib/libpthread/thread/thr_find_thread.c index 0c813db..ef469d9 100644 --- a/lib/libpthread/thread/thr_find_thread.c +++ b/lib/libpthread/thread/thr_find_thread.c @@ -47,13 +47,15 @@ _thr_ref_add(struct pthread *curthread, struct pthread *thread, { kse_critical_t crit; struct pthread *pthread; + struct kse *curkse; if (thread == NULL) /* Invalid thread: */ return (EINVAL); crit = _kse_critical_enter(); - KSE_LOCK_ACQUIRE(curthread->kse, &_thread_list_lock); + curkse = _get_curkse(); + KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); TAILQ_FOREACH(pthread, &_thread_list, tle) { if (pthread == thread) { if ((include_dead == 0) && @@ -63,12 +65,13 @@ _thr_ref_add(struct pthread *curthread, struct pthread *thread, pthread = NULL; else { thread->refcount++; - curthread->critical_count++; + if (curthread != NULL) + curthread->critical_count++; } break; } } - KSE_LOCK_RELEASE(curthread->kse, &_thread_list_lock); + KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); /* Return zero if the thread exists: */ @@ -79,16 +82,19 @@ void _thr_ref_delete(struct pthread *curthread, struct pthread *thread) { kse_critical_t crit; + struct kse *curkse; if (thread != NULL) { crit = _kse_critical_enter(); - KSE_LOCK_ACQUIRE(curthread->kse, &_thread_list_lock); + curkse = _get_curkse(); + KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); thread->refcount--; - curthread->critical_count--; + if (curthread != NULL) + curthread->critical_count--; if ((thread->refcount == 0) && (thread->flags & THR_FLAGS_GC_SAFE) != 0) THR_GCLIST_ADD(thread); - KSE_LOCK_RELEASE(curthread->kse, &_thread_list_lock); + KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); } } -- cgit v1.1