More changes to ensure that during thread switches the jcr

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

diff --git a/bacula/src/lib/rwlock.c b/bacula/src/lib/rwlock.c
index 692f02d2c6b4e40155e8a52a50c64ff2c044aa20..c4d5262e36f8d3ba5a973476152095b4eb163ead 100644 (file)
--- a/bacula/src/lib/rwlock.c
+++ b/bacula/src/lib/rwlock.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -294,11 +294,13 @@ int rwl_writeunlock(brwlock_t *rwl)
       return stat;
    }
    if (rwl->w_active <= 0) {
-      Emsg0(M_ABORT, 0, _("rwl_writeunlock called too many times.\n"));
+      pthread_mutex_unlock(&rwl->mutex);
+      Jmsg0(NULL, M_ABORT, 0, _("rwl_writeunlock called too many times.\n"));
    }
    rwl->w_active--;
    if (!pthread_equal(pthread_self(), rwl->writer_id)) {
-      Emsg0(M_ABORT, 0, _("rwl_writeunlock by non-owner.\n"));
+      pthread_mutex_unlock(&rwl->mutex);
+      Jmsg0(NULL, M_ABORT, 0, _("rwl_writeunlock by non-owner.\n"));
    }
    if (rwl->w_active > 0) {
       stat = 0;                       /* writers still active */
@@ -316,9 +318,9 @@ int rwl_writeunlock(brwlock_t *rwl)
 
 #ifdef TEST_RWLOCK
 
-#define THREADS     5
+#define THREADS     300
 #define DATASIZE   15
-#define ITERATIONS 10000
+#define ITERATIONS 1000000
 
 /*
  * Keep statics for each thread.
@@ -340,8 +342,8 @@ typedef struct data_tag {
    int writes;
 } data_t;
 
-thread_t threads[THREADS];
-data_t data[DATASIZE];
+static thread_t threads[THREADS];
+static data_t data[DATASIZE];
 
 /*
  * Thread start routine that uses read/write locks.
@@ -360,20 +362,39 @@ void *thread_routine(void *arg)
        * update operation (write lock instead of read
        * lock).
        */
-      if ((iteration % self->interval) == 0) {
+//      if ((iteration % self->interval) == 0) {
          status = rwl_writelock(&data[element].lock);
          if (status != 0) {
             berrno be;
-            Emsg1(M_ABORT, 0, _("Write lock failed. ERR=%s\n"), be.bstrerror(status));
+            printf("Write lock failed. ERR=%s\n", be.bstrerror(status));
+            exit(1);
          }
          data[element].data = self->thread_num;
          data[element].writes++;
          self->writes++;
+         status = rwl_writelock(&data[element].lock);
+         if (status != 0) {
+            berrno be;
+            printf("Write lock failed. ERR=%s\n", be.bstrerror(status));
+            exit(1);
+         }
+         data[element].data = self->thread_num;
+         data[element].writes++;
+         self->writes++;
+         status = rwl_writeunlock(&data[element].lock);
+         if (status != 0) {
+            berrno be;
+            printf("Write unlock failed. ERR=%s\n", be.bstrerror(status));
+            exit(1);
+         }
          status = rwl_writeunlock(&data[element].lock);
          if (status != 0) {
             berrno be;
-            Emsg1(M_ABORT, 0, _("Write unlock failed. ERR=%s\n"), be.bstrerror(status));
+            printf("Write unlock failed. ERR=%s\n", be.bstrerror(status));
+            exit(1);
          }
+
+#ifdef xxx
       } else {
          /*
           * Look at the current data element to see whether
@@ -383,7 +404,8 @@ void *thread_routine(void *arg)
           status = rwl_readlock(&data[element].lock);
           if (status != 0) {
              berrno be;
-             Emsg1(M_ABORT, 0, _("Read lock failed. ERR=%s\n"), be.bstrerror(status));
+             printf("Read lock failed. ERR=%s\n", be.bstrerror(status));
+             exit(1);
           }
           self->reads++;
           if (data[element].data == self->thread_num)
@@ -391,9 +413,11 @@ void *thread_routine(void *arg)
           status = rwl_readunlock(&data[element].lock);
           if (status != 0) {
              berrno be;
-             Emsg1(M_ABORT, 0, _("Read unlock failed. ERR=%s\n"), be.bstrerror(status));
+             printf("Read unlock failed. ERR=%s\n", be.bstrerror(status));
+             exit(1);
           }
       }
+#endif
       element++;
       if (element >= DATASIZE) {
          element = 0;
@@ -433,7 +457,8 @@ int main (int argc, char *argv[])
         status = rwl_init (&data[data_count].lock);
         if (status != 0) {
            berrno be;
-           Emsg1(M_ABORT, 0, _("Init rwlock failed. ERR=%s\n"), be.bstrerror(status));
+           printf("Init rwlock failed. ERR=%s\n", be.bstrerror(status));
+           exit(1);
         }
     }
 
@@ -444,12 +469,16 @@ int main (int argc, char *argv[])
         threads[count].thread_num = count + 1;
         threads[count].writes = 0;
         threads[count].reads = 0;
-        threads[count].interval = rand_r (&seed) % 71;
+        threads[count].interval = rand_r(&seed) % 71;
+        if (threads[count].interval <= 0) {
+           threads[count].interval = 1;
+        }
         status = pthread_create (&threads[count].thread_id,
             NULL, thread_routine, (void*)&threads[count]);
-        if (status != 0) {
+        if (status != 0 || (int)threads[count].thread_id == 0) {
            berrno be;
-           Emsg1(M_ABORT, 0, _("Create thread failed. ERR=%s\n"), be.bstrerror(status));
+           printf("Create thread failed. ERR=%s\n", be.bstrerror(status));
+           exit(1);
         }
     }
 
@@ -461,7 +490,8 @@ int main (int argc, char *argv[])
         status = pthread_join (threads[count].thread_id, NULL);
         if (status != 0) {
            berrno be;
-           Emsg1(M_ABORT, 0, _("Join thread failed. ERR=%s\n"), be.bstrerror(status));
+           printf("Join thread failed. ERR=%s\n", be.bstrerror(status));
+           exit(1);
         }
         thread_writes += threads[count].writes;
         printf (_("%02d: interval %d, writes %d, reads %d\n"),