From 224cb4a03406ed72e02d026efeab47fdf7f6b33b Mon Sep 17 00:00:00 2001 From: David Young Date: Wed, 5 Feb 2020 19:31:59 -0600 Subject: Use a naked pthread_self() call in the HDF5 thread wrappers. --- src/H5TS.c | 4 ++-- src/H5private.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/H5TS.c b/src/H5TS.c index 7a801e2..cc55810 100644 --- a/src/H5TS.c +++ b/src/H5TS.c @@ -262,7 +262,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) if (ret_value) return ret_value; - if(mutex->lock_count && pthread_equal(HDpthread_self(), mutex->owner_thread)) { + if(mutex->lock_count && pthread_equal(pthread_self(), mutex->owner_thread)) { /* already owned by self - increment count */ mutex->lock_count++; } else { @@ -271,7 +271,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock); /* After we've received the signal, take ownership of the mutex */ - mutex->owner_thread = HDpthread_self(); + mutex->owner_thread = pthread_self(); mutex->lock_count = 1; } diff --git a/src/H5private.h b/src/H5private.h index f0f3687..f090203 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1545,10 +1545,6 @@ extern char *strdup(const char *s); #define HDstrdup(S) strdup(S) #endif /* HDstrdup */ -#ifndef HDpthread_self - #define HDpthread_self() pthread_self() -#endif /* HDpthread_self */ - /* Macro for "stringizing" an integer in the C preprocessor (use H5_TOSTRING) */ /* (use H5_TOSTRING, H5_STRINGIZE is just part of the implementation) */ #define H5_STRINGIZE(x) #x -- cgit v0.12