* 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
*/
int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
{
- uint32_t stat = 0;
+ uint32_t stat;
char PrevVolName[MAX_NAME_LENGTH];
DEV_BLOCK *label_blk;
char b1[30], b2[30];
char dt[MAX_TIME_LENGTH];
wait_time = time(NULL);
- status_dev(dev, &stat);
+ stat = status_dev(dev);
if (!(stat & BMT_EOD)) {
return 0; /* this really shouldn't happen */
}
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 */
if (mjcr->JobId == 0) {
continue; /* ignore console */
}
- mjcr->NewVol = true;
+ mjcr->dcr->NewVol = true;
if (jcr != mjcr) {
pm_strcpy(&mjcr->VolumeName, jcr->VolumeName); /* get a copy of the new volume */
+ bstrncpy(mjcr->dcr->VolumeName, jcr->VolumeName, sizeof(mjcr->dcr->VolumeName));
}
}
/* Clear NewVol now because dir_get_volume_info() already done */
- jcr->NewVol = false;
+ jcr->dcr->NewVol = false;
set_new_volume_parameters(jcr, dev);
jcr->run_time += time(NULL) - wait_time; /* correct run time for mount wait */
*/
void set_new_volume_parameters(JCR *jcr, DEVICE *dev)
{
- if (jcr->NewVol && !dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) {
+ DCR *dcr = jcr->dcr;
+ if (dcr->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) {
- jcr->StartBlock = dev->block_num;
- jcr->StartFile = dev->file;
+ if (dev_state(dev, ST_TAPE)) {
+ dcr->StartBlock = dev->block_num;
+ dcr->StartFile = dev->file;
} else {
- jcr->StartBlock = (uint32_t)dev->file_addr;
- jcr->StartFile = (uint32_t)(dev->file_addr >> 32);
+ dcr->StartBlock = (uint32_t)dev->file_addr;
+ dcr->StartFile = (uint32_t)(dev->file_addr >> 32);
}
/* Reset indicies */
- jcr->VolFirstIndex = 0;
- jcr->VolLastIndex = 0;
+ dcr->VolFirstIndex = 0;
+ dcr->VolLastIndex = 0;
jcr->NumVolumes++;
- jcr->NewVol = false;
- jcr->WroteVol = false;
+ dcr->NewVol = false;
+ dcr->WroteVol = false;
}
/*
- * We are now in a new file, so reset the Volume parameters
+ * 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)
{
+ DCR *dcr = jcr->dcr;
+
/* Set new start/end positions */
- if (dev->state & ST_TAPE) {
- jcr->StartBlock = dev->block_num;
- jcr->StartFile = dev->file;
+ if (dev_state(dev, ST_TAPE)) {
+ dcr->StartBlock = dev->block_num;
+ dcr->StartFile = dev->file;
} else {
- jcr->StartBlock = (uint32_t)dev->file_addr;
- jcr->StartFile = (uint32_t)(dev->file_addr >> 32);
+ dcr->StartBlock = (uint32_t)dev->file_addr;
+ dcr->StartFile = (uint32_t)(dev->file_addr >> 32);
}
/* Reset indicies */
- jcr->VolFirstIndex = 0;
- jcr->VolLastIndex = 0;
- jcr->NewFile = false;
- jcr->WroteVol = false;
+ dcr->VolFirstIndex = 0;
+ dcr->VolLastIndex = 0;
+ dcr->NewFile = false;
+ dcr->WroteVol = false;
}
/*
- * Open the device. Expect dev to already be initialized.
+ * First Open of the device. Expect dev to already be initialized.
*
* This routine is used only when the Storage daemon starts
* and always_open is set, and in the stand-alone utility
* Retuns: 0 on failure
* 1 on success
*/
-int open_device(DEVICE *dev)
+int first_open_device(DEVICE *dev)
{
Dmsg0(120, "start open_output_device()\n");
if (!dev) {
}
if (!(dev->state & ST_OPENED)) {
+ int mode;
+ if (dev_cap(dev, CAP_STREAM)) {
+ mode = OPEN_WRITE_ONLY;
+ } else {
+ mode = OPEN_READ_WRITE;
+ }
Dmsg0(129, "Opening device.\n");
- if (open_dev(dev, NULL, READ_WRITE) < 0) {
+ if (open_dev(dev, NULL, mode) < 0) {
Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg);
unlock_device(dev);
return 0;
return 1;
}
+/*
+ * Make sure device is open, if not do so
+ */
+int open_device(JCR *jcr, DEVICE *dev)
+{
+ /* Open device */
+ if (!(dev_state(dev, ST_OPENED))) {
+ int mode;
+ if (dev_cap(dev, CAP_STREAM)) {
+ mode = OPEN_WRITE_ONLY;
+ } else {
+ mode = OPEN_READ_WRITE;
+ }
+ if (open_dev(dev, jcr->VolCatInfo.VolCatName, mode) < 0) {
+ Jmsg2(jcr, M_FATAL, 0, _("Unable to open device %s. ERR=%s\n"),
+ dev_name(dev), strerror_dev(dev));
+ return 0;
+ }
+ }
+ return 1;
+}
+
/*
* When dev_blocked is set, all threads EXCEPT thread with id no_wait_id
* must wait. The no_wait_id thread is out obtaining a new volume
}
}
+/*
+ * 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);
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();
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;
}
projects / bacula / bacula / blobdiff