From 5d56aa9cb2bdbe0a18bafbdbb6eb8cf6a46beb79 Mon Sep 17 00:00:00 2001 From: deischen Date: Fri, 18 Apr 2003 05:04:16 +0000 Subject: Revamp libpthread so that it has a chance of working in an SMP environment. This includes support for multiple KSEs and KSEGs. The ability to create more than 1 KSE via pthread_setconcurrency() is in the works as well as support for PTHREAD_SCOPE_SYSTEM threads. Those should come shortly. There are still some known issues which davidxu and I are working on, but it'll make it easier for us by committing what we have. This library now passes all of the ACE tests that libc_r passes with the exception of one. It also seems to work OK with KDE including konqueror, kwrite, etc. I haven't been able to get mozilla to run due to lack of java plugin, so I'd be interested to see how it works with that. Reviewed by: davidxu --- lib/libpthread/thread/thr_once.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/libpthread/thread/thr_once.c') diff --git a/lib/libpthread/thread/thr_once.c b/lib/libpthread/thread/thr_once.c index cef478d..152fdec 100644 --- a/lib/libpthread/thread/thr_once.c +++ b/lib/libpthread/thread/thr_once.c @@ -31,23 +31,25 @@ * * $FreeBSD$ */ +#include "namespace.h" #include +#include "un-namespace.h" #include "thr_private.h" __weak_reference(_pthread_once, pthread_once); int -_pthread_once(pthread_once_t * once_control, void (*init_routine) (void)) +_pthread_once(pthread_once_t *once_control, void (*init_routine) (void)) { if (once_control->state == PTHREAD_NEEDS_INIT) { - if (_thread_initial == NULL) - _thread_init(); - pthread_mutex_lock(&(once_control->mutex)); + if (_thr_initial == NULL) + _libpthread_init(NULL); + _pthread_mutex_lock(&(once_control->mutex)); if (once_control->state == PTHREAD_NEEDS_INIT) { init_routine(); once_control->state = PTHREAD_DONE_INIT; } - pthread_mutex_unlock(&(once_control->mutex)); + _pthread_mutex_unlock(&(once_control->mutex)); } return (0); } -- cgit v1.1