lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Code Activity

Simplify recursive pthread mutex

Browse Source 
Use a PTHREAD_MUTEX_RECURSIVE mutex instead of the hand-rolled approach.
This commit is contained in:
Nick Wellnhofer
2022-03-06 15:06:59 +01:00
parent 3241c47c1f
commit 4adb767763
1 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
threads.c
View File

@@ -55,14 +55,10 @@ static int libxml_is_threaded = -1;
#pragma weak pthread_mutex_destroy #pragma weak pthread_mutex_destroy
#pragma weak pthread_mutex_lock #pragma weak pthread_mutex_lock
#pragma weak pthread_mutex_unlock #pragma weak pthread_mutex_unlock
#pragma weak pthread_cond_init
#pragma weak pthread_cond_destroy
#pragma weak pthread_cond_wait
#pragma weak pthread_equal #pragma weak pthread_equal
#pragma weak pthread_self #pragma weak pthread_self
#pragma weak pthread_key_create #pragma weak pthread_key_create
#pragma weak pthread_key_delete #pragma weak pthread_key_delete
#pragma weak pthread_cond_signal
#else /* __GNUC__, __GLIBC__, __linux__ */ #else /* __GNUC__, __GLIBC__, __linux__ */
@@ -100,10 +96,6 @@ struct _xmlMutex {
struct _xmlRMutex { struct _xmlRMutex {
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
pthread_mutex_t lock; pthread_mutex_t lock;
unsigned int held;
unsigned int waiters;
pthread_t tid;
pthread_cond_t cv;
#elif defined HAVE_WIN32_THREADS #elif defined HAVE_WIN32_THREADS
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
unsigned int count; unsigned int count;
@@ -282,10 +274,11 @@ xmlNewRMutex(void)
return (NULL); return (NULL);
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
if (libxml_is_threaded != 0) { if (libxml_is_threaded != 0) {
pthread_mutex_init(&tok->lock, NULL); pthread_mutexattr_t attr;
tok->held = 0; pthread_mutexattr_init(&attr);
tok->waiters = 0; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_cond_init(&tok->cv, NULL); pthread_mutex_init(&tok->lock, &attr);
pthread_mutexattr_destroy(&attr);
} }
#elif defined HAVE_WIN32_THREADS #elif defined HAVE_WIN32_THREADS
InitializeCriticalSection(&tok->cs); InitializeCriticalSection(&tok->cs);
@@ -315,7 +308,6 @@ xmlFreeRMutex(xmlRMutexPtr tok ATTRIBUTE_UNUSED)
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
if (libxml_is_threaded != 0) { if (libxml_is_threaded != 0) {
pthread_mutex_destroy(&tok->lock); pthread_mutex_destroy(&tok->lock);
pthread_cond_destroy(&tok->cv);
} }
#elif defined HAVE_WIN32_THREADS #elif defined HAVE_WIN32_THREADS
DeleteCriticalSection(&tok->cs); DeleteCriticalSection(&tok->cs);
@@ -337,25 +329,8 @@ xmlRMutexLock(xmlRMutexPtr tok)
if (tok == NULL) if (tok == NULL)
return; return;
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
if (libxml_is_threaded == 0) if (libxml_is_threaded != 0)
return; pthread_mutex_lock(&tok->lock);
pthread_mutex_lock(&tok->lock);
if (tok->held) {
if (pthread_equal(tok->tid, pthread_self())) {
tok->held++;
pthread_mutex_unlock(&tok->lock);
return;
} else {
tok->waiters++;
while (tok->held)
pthread_cond_wait(&tok->cv, &tok->lock);
tok->waiters--;
}
}
tok->tid = pthread_self();
tok->held = 1;
pthread_mutex_unlock(&tok->lock);
#elif defined HAVE_WIN32_THREADS #elif defined HAVE_WIN32_THREADS
EnterCriticalSection(&tok->cs); EnterCriticalSection(&tok->cs);
tok->count++; tok->count++;
@@ -382,17 +357,8 @@ xmlRMutexUnlock(xmlRMutexPtr tok ATTRIBUTE_UNUSED)
if (tok == NULL) if (tok == NULL)
return; return;
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
if (libxml_is_threaded == 0) if (libxml_is_threaded != 0)
return; pthread_mutex_unlock(&tok->lock);
pthread_mutex_lock(&tok->lock);
tok->held--;
if (tok->held == 0) {
if (tok->waiters)
pthread_cond_signal(&tok->cv);
memset(&tok->tid, 0, sizeof(tok->tid));
}
pthread_mutex_unlock(&tok->lock);
#elif defined HAVE_WIN32_THREADS #elif defined HAVE_WIN32_THREADS
if (tok->count > 0) { if (tok->count > 0) {
tok->count--; tok->count--;
@@ -864,12 +830,8 @@ xmlInitThreads(void)
(pthread_mutex_destroy != NULL) && (pthread_mutex_destroy != NULL) &&
(pthread_mutex_lock != NULL) && (pthread_mutex_lock != NULL) &&
(pthread_mutex_unlock != NULL) && (pthread_mutex_unlock != NULL) &&
(pthread_cond_init != NULL) &&
(pthread_cond_destroy != NULL) &&
(pthread_cond_wait != NULL) &&
(pthread_equal != NULL) && (pthread_equal != NULL) &&
(pthread_self != NULL) && (pthread_self != NULL)) {
(pthread_cond_signal != NULL)) {
libxml_is_threaded = 1; libxml_is_threaded = 1;
/* fprintf(stderr, "Running multithreaded\n"); */ /* fprintf(stderr, "Running multithreaded\n"); */