Add additional search directories for PostgreSQL

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

diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c
index c927ee692151f44f4bc817e2e39b77ae90e93a37..115a9d5ae270d53e70341b31435b611677ed79d1 100644 (file)
--- a/bacula/src/stored/device.c
+++ b/bacula/src/stored/device.c
@@ -29,7 +29,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 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
@@ -106,13 +106,12 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
        return 0;
    }
 
-   strcpy(dev->VolCatInfo.VolCatStatus, "Full");
-   Dmsg2(200, "Call update_vol_info Stat=%s Vol=%s\n", 
+   bstrncpy(dev->VolCatInfo.VolCatStatus, "Full", sizeof(dev->VolCatInfo.VolCatStatus));
+   Dmsg2(100, "Call update_vol_info Stat=%s Vol=%s\n", 
       dev->VolCatInfo.VolCatStatus, dev->VolCatInfo.VolCatName);
    dev->VolCatInfo.VolCatFiles = dev->file;   /* set number of files */
-   /* *****FIXME**** this needs to be done elsewhere */
    dev->VolCatInfo.VolCatJobs++;             /* increment number of jobs */
-   if (!dir_update_volume_info(jcr, &dev->VolCatInfo, 0)) {    /* send Volume info to Director */
+   if (!dir_update_volume_info(jcr, dev, 0)) {   /* send Volume info to Director */
       P(dev->mutex);
       unblock_device(dev);
       return 0;                   /* device locked */
@@ -190,13 +189,18 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    return 1;                               /* device locked */
 }
 
+/*
+ * We have a new Volume mounted, so reset the Volume parameters
+ *  concerning this job.  The global changes were made earlier
+ *  in the dev structure.
+ */
 void set_new_volume_parameters(JCR *jcr, DEVICE *dev) 
 {
    if (jcr->NewVol && !dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) {
       Jmsg1(jcr, M_ERROR, 0, "%s", jcr->errmsg);
    }
    /* Set new start/end positions */
-   if (dev->state & ST_TAPE) {
+   if (dev_state(dev, ST_TAPE)) {
       jcr->StartBlock = dev->block_num;
       jcr->StartFile = dev->file;
    } else {
@@ -211,6 +215,29 @@ void set_new_volume_parameters(JCR *jcr, DEVICE *dev)
    jcr->WroteVol = false;
 }
 
+/*
+ * We are now in a new Volume file, so reset the Volume parameters
+ *  concerning this job.  The global changes were made earlier
+ *  in the dev structure.
+ */
+void set_new_file_parameters(JCR *jcr, DEVICE *dev) 
+{
+   /* Set new start/end positions */
+   if (dev_state(dev, ST_TAPE)) {
+      jcr->StartBlock = dev->block_num;
+      jcr->StartFile = dev->file;
+   } else {
+      jcr->StartBlock = (uint32_t)dev->file_addr;
+      jcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
+   }
+   /* Reset indicies */
+   jcr->VolFirstIndex = 0;
+   jcr->VolLastIndex = 0;
+   jcr->NewFile = false;
+   jcr->WroteVol = false;
+}
+
+
 
 /*
  *   Open the device. Expect dev to already be initialized.  
@@ -279,6 +306,19 @@ void _lock_device(char *file, int line, DEVICE *dev)
    }
 }
 
+/*
+ * Check if the device is blocked or not
+ */
+int device_is_unmounted(DEVICE *dev)
+{
+   int stat;
+   P(dev->mutex);
+   stat = (dev->dev_blocked == BST_UNMOUNTED) ||
+         (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP);
+   V(dev->mutex);
+   return stat;
+}
+
 void _unlock_device(char *file, int line, DEVICE *dev) 
 {
    Dmsg2(100, "unlock from %s:%d\n", file, line);
@@ -326,6 +366,7 @@ void _steal_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold,
    Dmsg4(100, "steal lock. old=%d new=%d from %s:%d\n", dev->dev_blocked, state,
       file, line);
    hold->dev_blocked = dev->dev_blocked;
+   hold->dev_prev_blocked = dev->dev_prev_blocked;
    hold->no_wait_id = dev->no_wait_id;
    dev->dev_blocked = state;
    dev->no_wait_id = pthread_self();
@@ -342,5 +383,6 @@ void _give_back_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *ho
       dev->dev_blocked, hold->dev_blocked, file, line);
    P(dev->mutex);
    dev->dev_blocked = hold->dev_blocked;
+   dev->dev_prev_blocked = hold->dev_prev_blocked;
    dev->no_wait_id = hold->no_wait_id;
 }