Mutex used for our internal "once" function
*********************************************************/
-void *once_mutex = NULL;
+static void *once_mutex = NULL;
/*********************************************************
int ret;
/* Lock our "once" mutex in order to test and initialize ponce */
- if (SMB_THREAD_LOCK(once_mutex, SMB_THREAD_LOCK) != 0) {
+ if (SMB_THREAD_LOCK(once_mutex) != 0) {
smb_panic("error locking 'once'");
}
}
/* Unlock the mutex */
- if (SMB_THREAD_LOCK(once_mutex, SMB_THREAD_UNLOCK) != 0) {
+ if (SMB_THREAD_UNLOCK(once_mutex) != 0) {
smb_panic("error unlocking 'once'");
}
typedef bool smb_thread_once_t;
#define SMB_THREAD_ONCE_INIT false
-#define SMB_THREAD_ONCE_IS_INITIALIZED(val) ((val) == true)
-#define SMB_THREAD_ONCE_INITIALIZE(val) ((val) = true)
enum smb_thread_lock_type {
SMB_THREAD_LOCK = 1,
}; \
} while (0)
-#define SMB_THREAD_LOCK(plock, type) \
- (global_tfp ? global_tfp->lock_mutex((plock), (type), __location__) : 0)
+#define SMB_THREAD_LOCK_INTERNAL(plock, type, location) \
+ (global_tfp ? global_tfp->lock_mutex((plock), (type), location) : 0)
+
+#define SMB_THREAD_LOCK(plock) \
+ SMB_THREAD_LOCK_INTERNAL(plock, SMB_THREAD_LOCK, __location__)
+
+#define SMB_THREAD_UNLOCK(plock) \
+ SMB_THREAD_LOCK_INTERNAL(plock, SMB_THREAD_UNLOCK, __location__)
#define SMB_THREAD_ONCE(ponce, init_fn, pdata) \
(global_tfp \
? (! *(ponce) \
? smb_thread_once((ponce), (init_fn), (pdata)) \
: 0) \
- : ((init_fn(pdata)), 0))
+ : ((init_fn(pdata)), *(ponce) = true, 1))
#define SMB_THREAD_CREATE_TLS(keyname, key) \
(global_tfp ? global_tfp->create_tls((keyname), &(key), __location__) : 0)