summaryrefslogtreecommitdiffstats
path: root/src/H5TS.c
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-01-29 12:55:18 (GMT)
committerGitHub <noreply@github.com>2021-01-29 12:55:18 (GMT)
commit6db183590fd04767e6d01c1e871a18e80101c192 (patch)
tree02c983224b59c2d5c2fd01805e162a48cf02a996 /src/H5TS.c
parent5a812bf5197e3394b92f5df8ee103a5eb80da18d (diff)
downloadhdf5-6db183590fd04767e6d01c1e871a18e80101c192.zip
hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.gz
hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.bz2
develop revert source to clang-format version 11 (#293)
* OESS-98 convert plugin option to FetchContent, add tests * Fixes for pkcfg files because of plugin option * OESS-98 fix tools test for plugins * Keep doxygen comments under 100 chars long - format hint * Whitespace * HDFFV-11144 - Reclassify CMake messages * HDFFV-11099/11100 added help text * Reworked switch statement to compare string instead * Fix typo * Update CDash mode * Correct name of threadsafe * Correct option name * Undo accidental commit * Note LLVM 10 to 11 format default changes * Update format plugin * Undo clang-format version 11 changes * One more correction
Diffstat (limited to 'src/H5TS.c')
-rw-r--r--src/H5TS.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5TS.c b/src/H5TS.c
index 732f41c..6c4bb63 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -70,7 +70,7 @@ static herr_t H5TS__mutex_unlock(H5TS_mutex_t *mutex, unsigned int *lock_count);
/* Global variable definitions */
#ifdef H5_HAVE_WIN_THREADS
H5TS_once_t H5TS_first_init_g;
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
#endif /* H5_HAVE_WIN_THREADS */
@@ -78,8 +78,8 @@ H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
H5TS_key_t H5TS_errstk_key_g; /* Error stack */
#ifdef H5_HAVE_CODESTACK
H5TS_key_t H5TS_funcstk_key_g; /* Function stack */
-#endif /* H5_HAVE_CODESTACK */
-H5TS_key_t H5TS_apictx_key_g; /* API context */
+#endif /* H5_HAVE_CODESTACK */
+H5TS_key_t H5TS_apictx_key_g; /* API context */
/*******************/
/* Local Variables */
@@ -356,7 +356,7 @@ H5TS__mutex_acquire(H5TS_mutex_t *mutex, unsigned int lock_count, hbool_t *acqui
#ifdef H5_HAVE_WIN_THREADS
EnterCriticalSection(&mutex->CriticalSection);
*acquired = TRUE;
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Attempt to acquire the mutex lock */
if (0 == HDpthread_mutex_lock(&mutex->atomic_lock)) {
pthread_t my_thread_id = HDpthread_self();
@@ -441,7 +441,7 @@ herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex)
#ifdef H5_HAVE_WIN_THREADS
EnterCriticalSection(&mutex->CriticalSection);
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the "attempt" lock, increment the attempt lock count, release the lock */
ret_value = HDpthread_mutex_lock(&mutex->atomic_lock2);
if (ret_value)
@@ -507,7 +507,7 @@ H5TS__mutex_unlock(H5TS_mutex_t *mutex, unsigned int *lock_count)
#ifdef H5_HAVE_WIN_THREADS
/* Releases ownership of the specified critical section object. */
LeaveCriticalSection(&mutex->CriticalSection);
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Reset the lock count for this thread */
ret_value = HDpthread_mutex_lock(&mutex->atomic_lock);
@@ -563,7 +563,7 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
#ifdef H5_HAVE_WIN_THREADS
/* Releases ownership of the specified critical section object. */
LeaveCriticalSection(&mutex->CriticalSection);
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Decrement the lock count for this thread */
ret_value = HDpthread_mutex_lock(&mutex->atomic_lock);
@@ -610,7 +610,7 @@ H5TSmutex_get_attempt_count(unsigned int *count)
#ifdef H5_HAVE_WIN_THREADS
/* Add Win32 equivalent here when async is supported */
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
ret_value = HDpthread_mutex_lock(&H5_g.init_lock.atomic_lock2);
if (ret_value)
HGOTO_DONE(ret_value);
@@ -689,7 +689,7 @@ H5TS_cancel_count_inc(void)
#ifdef H5_HAVE_WIN_THREADS
/* unsupported */
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the thread's cancellation counter */
cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);
@@ -763,7 +763,7 @@ H5TS_cancel_count_dec(void)
#ifdef H5_HAVE_WIN_THREADS
/* unsupported */
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the thread's cancellation counter */
cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);