STABLE14-pthread-glock-volatility-20050921

FIXES 21526

deal with situations where pthread glock assert happens by asserting volatility. ick.

(cherry picked from commit 9c7f6fa17209ce8cfbe73eefbcbb37aced31cc60)

diff --git a/src/util/pthread_glock.c b/src/util/pthread_glock.c
index eec4a06b492fcbe4fcb7dc47a39c6c936da125ac..e6e6f78ed31236e69e79f9408e350856871dbbca 100644 (file)
--- a/src/util/pthread_glock.c
+++ b/src/util/pthread_glock.c
@@ -26,7 +26,7 @@ RCSID
 
 pthread_recursive_mutex_t grmutex;
 
-static int glock_init;
+static int glock_init = 0;
 static pthread_once_t glock_init_once = PTHREAD_ONCE_INIT;
 
 static void

diff --git a/src/util/pthread_glock.h b/src/util/pthread_glock.h
index da6aefd041dfb1614861ecce01ff449d8025435c..1c9beeae6addca3f35278325b7a204e0bf0969d6 100644 (file)
--- a/src/util/pthread_glock.h
+++ b/src/util/pthread_glock.h
@@ -16,9 +16,9 @@
 
 typedef struct {
     pthread_mutex_t mut;
-    pthread_t owner;
-    unsigned int locked;
-    unsigned int times_inside;
+    volatile pthread_t owner;
+    volatile unsigned int locked;
+    volatile unsigned int times_inside;
 } pthread_recursive_mutex_t, *pthread_recursive_mutex_p;
 
 #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV)