X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Frwlock.h;h=c07e5c68755b357c1de3f267d38e1b82f41d5b5c;hb=4132c9f33642f579d89700f36caced609d374d51;hp=79bd96fb9e35e70d000cee3dbef42668bbf156a4;hpb=f7fb2261ab648bfc02a32773b7a5a2201783e189;p=bacula%2Fbacula

diff --git a/bacula/src/lib/rwlock.h b/bacula/src/lib/rwlock.h
index 79bd96fb9e..c07e5c6875 100644
--- a/bacula/src/lib/rwlock.h
+++ b/bacula/src/lib/rwlock.h
@@ -1,6 +1,33 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2001-2010 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.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   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.
+*/
 /*
  * Bacula Thread Read/Write locking code. It permits
- *  multiple readers but only one writer.                 
+ *  multiple readers but only one writer.
  *
  *  Kern Sibbald, January MMI
  *
@@ -10,40 +37,28 @@
  *   Version $Id$
  *
  */
-/*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
- */
-
-#ifndef __RWLOCK_H 
+#ifndef __RWLOCK_H
 #define __RWLOCK_H 1
 
-typedef struct rwlock_tag {
+typedef struct s_rwlock_tag {
    pthread_mutex_t   mutex;
    pthread_cond_t    read;            /* wait for read */
    pthread_cond_t    write;           /* wait for write */
    pthread_t         writer_id;       /* writer's thread id */
+   int               priority;        /* used in deadlock detection */
    int               valid;           /* set when valid */
    int               r_active;        /* readers active */
    int               w_active;        /* writers active */
    int               r_wait;          /* readers waiting */
    int               w_wait;          /* writers waiting */
-} rwlock_t;
+} brwlock_t;
+
+typedef struct s_rwsteal_tag {
+   pthread_t         writer_id;       /* writer's thread id */
+   int               state;
+} brwsteal_t;
+
 
 #define RWLOCK_VALID  0xfacade
 
@@ -51,16 +66,19 @@ typedef struct rwlock_tag {
    {PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, \
     PTHREAD_COND_INITIALIZER, RWLOCK_VALID, 0, 0, 0, 0}
 
-/* 
+#define rwl_writelock(x)     rwl_writelock_p((x), __FILE__, __LINE__)
+
+/*
  * read/write lock prototypes
  */
-extern int rwl_init(rwlock_t *wrlock);
-extern int rwl_destroy(rwlock_t *rwlock);
-extern int rwl_readlock(rwlock_t *rwlock);
-extern int rwl_readtrylock(rwlock_t *rwlock);
-extern int rwl_readunlock(rwlock_t *rwlock);
-extern int rwl_writelock(rwlock_t *rwlock);
-extern int rwl_writetrylock(rwlock_t *rwlock);
-extern int rwl_writeunlock(rwlock_t *rwlock);
+extern int rwl_init(brwlock_t *wrlock, int priority=0);
+extern int rwl_destroy(brwlock_t *rwlock);
+extern int rwl_readlock(brwlock_t *rwlock);
+extern int rwl_readtrylock(brwlock_t *rwlock);
+extern int rwl_readunlock(brwlock_t *rwlock);
+extern int rwl_writelock_p(brwlock_t *rwlock,
+                           const char *file="*unknown*", int line=0);
+extern int rwl_writetrylock(brwlock_t *rwlock);
+extern int rwl_writeunlock(brwlock_t *rwlock);
 
 #endif /* __RWLOCK_H */