Make various lock guard deinit explicitly callable so that locks can …

…be released manually.
apache · Jun 7, 2024 · a014956 · a014956
1 parent bf0011a
commit a014956
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/libs/utils/include/celix_threads.h b/libs/utils/include/celix_threads.h
@@ -22,6 +22,7 @@
 
 #include <pthread.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 #include "celix_cleanup.h"
 #include "celix_errno.h"
@@ -141,8 +142,8 @@ static CELIX_UNUSED inline celix_mutex_lock_guard_t celixMutexLockGuard_init(cel
 static CELIX_UNUSED inline void celixMutexLockGuard_deinit(celix_mutex_lock_guard_t* guard) {
     if (guard->mutex) {
         celixThreadMutex_unlock(guard->mutex);
+        guard->mutex = NULL;
     }
-    guard->mutex = NULL;
 }
 
 CELIX_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(celix_mutex_lock_guard_t, celixMutexLockGuard_deinit)
@@ -216,6 +217,7 @@ static CELIX_UNUSED inline celix_rwlock_wlock_guard_t celixRwlockWlockGuard_init
 static CELIX_UNUSED inline void celixRwlockWlockGuard_deinit(celix_rwlock_wlock_guard_t* guard) {
     if (guard->lock) {
         celixThreadRwlock_unlock(guard->lock);
+        guard->lock = NULL;
     }
 }
 
@@ -263,6 +265,7 @@ static CELIX_UNUSED inline celix_rwlock_rlock_guard_t celixRwlockRlockGuard_init
 static CELIX_UNUSED inline void celixRwlockRlockGuard_deinit(celix_rwlock_rlock_guard_t* guard) {
     if (guard->lock) {
         celixThreadRwlock_unlock(guard->lock);
+        guard->lock = NULL;
     }
 }