Add %D option to edit_job_code, simplify callbacks on director side

[bacula/bacula] / bacula / src / stored / vol_mgr.c

diff --git a/bacula/src/stored/vol_mgr.c b/bacula/src/stored/vol_mgr.c
index 61b2c9fbb7cfb459256154e55f0405361954353b..e16e433471745be855e20854becdad54f35c3fac 100644 (file)
--- a/bacula/src/stored/vol_mgr.c
+++ b/bacula/src/stored/vol_mgr.c
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 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 two of the GNU General Public
+   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.
 
@@ -15,7 +15,7 @@
    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
+   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.
@@ -32,8 +32,6 @@
  *
  *   Split from reserve.c October 2008
  *
- *   Version $Id: reserve.c 7380 2008-07-14 10:42:59Z kerns $
- *
  */
 
 #include "bacula.h"
@@ -44,7 +42,7 @@ const int dbglvl =  150;
 static dlist *vol_list = NULL;
 static brwlock_t vol_list_lock;
 static dlist *read_vol_list = NULL;
-static pthread_mutex_t read_vol_lock = PTHREAD_MUTEX_INITIALIZER;
+static bthread_mutex_t read_vol_lock = BTHREAD_MUTEX_PRIORITY(PRIO_SD_READ_VOL_LIST);
 
 /* Forward referenced functions */
 static void free_vol_item(VOLRES *vol);
@@ -90,7 +88,7 @@ int vol_list_lock_count = 0;
 void init_vol_list_lock()
 {
    int errstat;
-   if ((errstat=rwl_init(&vol_list_lock)) != 0) {
+   if ((errstat=rwl_init(&vol_list_lock, PRIO_SD_VOL_LIST)) != 0) {
       berrno be;
       Emsg1(M_ABORT, 0, _("Unable to initialize volume list lock. ERR=%s\n"),
             be.bstrerror(errstat));
@@ -102,16 +100,14 @@ void term_vol_list_lock()
    rwl_destroy(&vol_list_lock);
 }
 
-
-
 /* 
  * This allows a given thread to recursively call to lock_volumes()
  */
-void _lock_volumes()
+void _lock_volumes(const char *file, int line)
 {
    int errstat;
    vol_list_lock_count++;
-   if ((errstat=rwl_writelock(&vol_list_lock)) != 0) {
+   if ((errstat=rwl_writelock_p(&vol_list_lock, file, line)) != 0) {
       berrno be;
       Emsg2(M_ABORT, 0, "rwl_writelock failure. stat=%d: ERR=%s\n",
            errstat, be.bstrerror(errstat));
@@ -129,14 +125,14 @@ void _unlock_volumes()
    }
 }
 
-void lock_read_volumes()
+void lock_read_volumes(const char *file="**Unknown", int line=0)
 {
-   P(read_vol_lock);
+   bthread_mutex_lock_p(&read_vol_lock, file, line);
 }
 
 void unlock_read_volumes()
 {
-   V(read_vol_lock);
+   bthread_mutex_unlock(&read_vol_lock);
 }
 
 /*
@@ -180,7 +176,6 @@ void remove_read_volume(JCR *jcr, const char *VolumeName)
    if (fvol) {
       Dmsg3(dbglvl, "remove_read_vol=%s JobId=%d found=%d\n", VolumeName, jcr->JobId, fvol!=NULL);
    }
-   debug_list_volumes("remove_read_volume");
    if (fvol) {
       read_vol_list->remove(fvol);
       free_vol_item(fvol);
@@ -614,12 +609,13 @@ bool free_volume(DEVICE *dev)
 {
    VOLRES *vol;
 
-   if (dev->vol == NULL) {
+   lock_volumes();
+   vol = dev->vol;
+   if (vol == NULL) {
       Dmsg1(dbglvl, "No vol on dev %s\n", dev->print_name());
+      unlock_volumes();
       return false;
    }
-   lock_volumes();
-   vol = dev->vol;
    /* Don't free a volume while it is being swapped */
    if (!vol->is_swapping()) {
       Dmsg1(dbglvl, "=== clear in_use vol=%s\n", vol->vol_name);