From 61c9007c8c8f41c47e89b513835fa56fb59ed740 Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Wed, 5 Apr 2017 20:04:42 -0400
Subject: [PATCH] Clear thread-lock lock structure on unlock.
And mark thread local variables static to limit scope.
---
src/slurmctld/locks.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/slurmctld/locks.c b/src/slurmctld/locks.c
index 610923fec09..70a4012097e 100644
--- a/src/slurmctld/locks.c
+++ b/src/slurmctld/locks.c
@@ -67,14 +67,14 @@ static void _wr_wrunlock(lock_datatype_t datatype);
* systems. Only used within development builds to mitigate possible problems
* with production builds.
*/
-__thread bool slurmctld_locked = false;
+static __thread bool slurmctld_locked = false;
/*
* Used to detect any location where the acquired locks differ from the
* release locks.
*/
-__thread slurmctld_lock_t thread_locks;
+static __thread slurmctld_lock_t thread_locks;
static bool _store_locks(slurmctld_lock_t lock_levels)
{
@@ -94,8 +94,13 @@ static bool _clear_locks(slurmctld_lock_t lock_levels)
return false;
slurmctld_locked = false;
- return !memcmp((void *) &thread_locks, (void *) &lock_levels,
- sizeof(slurmctld_lock_t));
+ if (memcmp((void *) &thread_locks, (void *) &lock_levels,
+ sizeof(slurmctld_lock_t)))
+ return false;
+
+ memset((void *) &thread_locks, 0, sizeof(slurmctld_lock_t));
+
+ return true;
}
#endif
--
GitLab