Tweak mutex order for SD

[bacula/bacula] / bacula / src / lib / lockmgr.c

diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c
index 24f6aa2c58910650491ae2b712b1bcac8aa6d3b3..c2f7b875cb908df4d2b9987cd6db6555cafcc26a 100644 (file)
--- a/bacula/src/lib/lockmgr.c
+++ b/bacula/src/lib/lockmgr.c
@@ -37,7 +37,7 @@
     V(mutex);
 
  use:
-    bthread_mutex_t mutex = BTHREAD_MUTEX_PRIORITY_1;
+    bthread_mutex_t mutex = BTHREAD_MUTEX_PRIORITY(1);
     P(mutex);
     ...
     V(mutex);
@@ -47,7 +47,7 @@
  
  With dynamic creation, you can use:
     bthread_mutex_t mutex;
-    pthread_mutex_init(&mutex);     // you can also use bthread_mutex_init()
+    pthread_mutex_init(&mutex);
     bthread_mutex_set_priority(&mutex, 10);
     pthread_mutex_destroy(&mutex);
  
@@ -283,9 +283,10 @@ public:
       fprintf(fp, "threadid=%p max=%i current=%i\n", 
               (void *)thread_id, max, current);
       for(int i=0; i<=current; i++) {
-         fprintf(fp, "   lock=%p state=%s %s:%i\n", 
+         fprintf(fp, "   lock=%p state=%s priority=%i %s:%i\n", 
                  lock_list[i].lock, 
                  (lock_list[i].state=='W')?"Wanted ":"Granted",
+                 lock_list[i].priority,
                  lock_list[i].file, lock_list[i].line);
       } 
    }
@@ -302,10 +303,11 @@ public:
     * Call before a lock operation (mark mutex as WANTED)
     */
    virtual void pre_P(void *m, int priority, 
-                      const char *f="*unknown*", int l=0) {
+                      const char *f="*unknown*", int l=0) 
+   {
+      int max_prio = max_priority;
       ASSERT_p(current < LMGR_MAX_LOCK, f, l);
       ASSERT_p(current >= -1, f, l);
-      ASSERT_p(!priority || priority >= max_priority, f, l);
       lmgr_p(&mutex);
       {
          current++;
@@ -319,6 +321,7 @@ public:
          max_priority = MAX(priority, max_priority);
       }
       lmgr_v(&mutex);
+      ASSERT_p(!priority || priority >= max_prio, f, l);
    }
 
    /*
@@ -688,7 +691,7 @@ void bthread_mutex_set_priority(bthread_mutex_t *m, int prio)
 /*
  * Replacement for pthread_mutex_init()
  */
-int bthread_mutex_init(bthread_mutex_t *m, const pthread_mutexattr_t *attr)
+int pthread_mutex_init(bthread_mutex_t *m, const pthread_mutexattr_t *attr)
 {
    m->priority = 0;
    return pthread_mutex_init(&m->mutex, attr);
@@ -697,28 +700,11 @@ int bthread_mutex_init(bthread_mutex_t *m, const pthread_mutexattr_t *attr)
 /*
  * Replacement for pthread_mutex_destroy()
  */
-int bthread_mutex_destroy(bthread_mutex_t *m)
+int pthread_mutex_destroy(bthread_mutex_t *m)
 {
    return pthread_mutex_destroy(&m->mutex);
 }
 
-/*
- * Replacement for pthread_mutex_init() for pthread_mutex_t
- */
-int bthread_mutex_init(pthread_mutex_t *m, const pthread_mutexattr_t *attr)
-{
-   return pthread_mutex_init(m, attr);
-}
-
-/*
- * Replacement for pthread_mutex_destroy() for pthread_mutex_t
- */
-int bthread_mutex_destroy(pthread_mutex_t *m)
-{
-   return pthread_mutex_destroy(m);
-}
-
-
 /*
  * Replacement for pthread_mutex_lock()
  * Returns always ok 
@@ -927,10 +913,7 @@ void dbg_print_lock(FILE *fp)
 
 #include "lockmgr.h"
 #define BTHREAD_MUTEX_NO_PRIORITY      {PTHREAD_MUTEX_INITIALIZER, 0}
-#define BTHREAD_MUTEX_PRIORITY_1       {PTHREAD_MUTEX_INITIALIZER, 1}
-#define BTHREAD_MUTEX_PRIORITY_2       {PTHREAD_MUTEX_INITIALIZER, 2}
-#define BTHREAD_MUTEX_PRIORITY_3       {PTHREAD_MUTEX_INITIALIZER, 3}
-#define BTHREAD_MUTEX_PRIORITY_4       {PTHREAD_MUTEX_INITIALIZER, 4}
+#define BTHREAD_MUTEX_PRIORITY(p)      {PTHREAD_MUTEX_INITIALIZER, p}
 #undef P
 #undef V
 #define P(x) bthread_mutex_lock_p(&(x), __FILE__, __LINE__)
@@ -943,9 +926,9 @@ bthread_mutex_t mutex3 = BTHREAD_MUTEX_NO_PRIORITY;
 bthread_mutex_t mutex4 = BTHREAD_MUTEX_NO_PRIORITY;
 bthread_mutex_t mutex5 = BTHREAD_MUTEX_NO_PRIORITY;
 bthread_mutex_t mutex6 = BTHREAD_MUTEX_NO_PRIORITY;
-bthread_mutex_t mutex_p1 = BTHREAD_MUTEX_PRIORITY_1;
-bthread_mutex_t mutex_p2 = BTHREAD_MUTEX_PRIORITY_2;
-bthread_mutex_t mutex_p3 = BTHREAD_MUTEX_PRIORITY_3;
+bthread_mutex_t mutex_p1 = BTHREAD_MUTEX_PRIORITY(1);
+bthread_mutex_t mutex_p2 = BTHREAD_MUTEX_PRIORITY(2);
+bthread_mutex_t mutex_p3 = BTHREAD_MUTEX_PRIORITY(3);
 static const char *my_prog;
 
 void *self_lock(void *temp)
@@ -1106,10 +1089,13 @@ int main(int argc, char **argv)
    void *ret=NULL;
    lmgr_thread_t *self;
    pthread_t id1, id2, id3, tab[200];
+   bthread_mutex_t bmutex1;
+   pthread_mutex_t pmutex2;
    my_prog = argv[0];
 
    use_undertaker = false;
    lmgr_init_thread();
+   self = lmgr_get_thread_info();
 
    if (argc == 2) {             /* do priority check */
       P(mutex_p2);                /* not permited */
@@ -1119,6 +1105,18 @@ int main(int argc, char **argv)
       return 0;
    }
 
+   pthread_mutex_init(&bmutex1, NULL);
+   bthread_mutex_set_priority(&bmutex1, 10);
+
+   pthread_mutex_init(&pmutex2, NULL);
+   P(bmutex1);
+   ok(self->max_priority == 10, "Check self max_priority");
+   P(pmutex2);
+   ok(bmutex1.priority == 10, "Check bmutex_set_priority()");
+   V(pmutex2);
+   V(bmutex1);
+   ok(self->max_priority == 0, "Check self max_priority");
+
    pthread_create(&id1, NULL, self_lock, NULL);
    sleep(2);
    ok(lmgr_detect_deadlock(), "Check self deadlock");
@@ -1203,7 +1201,6 @@ int main(int argc, char **argv)
    pthread_join(id3, &ret);
    ok(ret != 0, "Check for priority segfault");
 
-   self = lmgr_get_thread_info();
    P(mutex_p1);
    ok(self->max_priority == 1, "Check max_priority 1/4");
    P(mutex_p2);