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
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ 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
int retry = 0;
Dmsg1(50, "jcr->dcr=%p\n", jcr->dcr);
- dev->block(BST_DOING_ACQUIRE);
+ dev->dblock(BST_DOING_ACQUIRE);
if (dev->num_writers > 0) {
Jmsg2(jcr, M_FATAL, 0, _("Acquire read: num_writers=%d not zero. Job %d canceled.\n"),
rctx.store = store;
/*
- * Note, if search_for_device() succeeds, we get a new_dcr,
+ * Note, if search_for_device() succeeds, we get a new dcr,
* which we do not use except for the dev info.
*/
stat = search_res_for_device(rctx);
- release_msgs(jcr); /* release queued messages */
+ release_reserve_messages(jcr); /* release queued messages */
unlock_reservations();
if (stat == 1) {
- DCR *new_dcr = jcr->read_dcr;
- dev->unblock(dev_unlocked);
+ DCR *ndcr = jcr->read_dcr;
+ dev->dunblock(DEV_UNLOCKED);
detach_dcr_from_dev(dcr); /* release old device */
/* Copy important info from the new dcr */
- dev = dcr->dev = new_dcr->dev;
+ dev = dcr->dev = ndcr->dev;
jcr->read_dcr = dcr;
- dcr->device = new_dcr->device;
+ dcr->device = ndcr->device;
dcr->max_job_spool_size = dcr->device->max_job_spool_size;
attach_dcr_to_dev(dcr);
- new_dcr->VolumeName[0] = 0;
- free_dcr(new_dcr);
- dev->block(BST_DOING_ACQUIRE);
+ ndcr->VolumeName[0] = 0;
+ free_dcr(ndcr);
+ dev->dblock(BST_DOING_ACQUIRE);
Jmsg(jcr, M_INFO, 0, _("Media Type change. New device %s chosen.\n"),
dev->print_name());
bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName));
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->unblock(dev_locked);
+ dev->dunblock(DEV_LOCKED);
Dmsg1(50, "jcr->dcr=%p\n", jcr->dcr);
return ok;
}
init_device_wait_timers(dcr);
- dev->block(BST_DOING_ACQUIRE);
+ dev->dblock(BST_DOING_ACQUIRE);
Dmsg1(190, "acquire_append device is %s\n", dev->is_tape()?"tape":
(dev->is_dvd()?"DVD":"disk"));
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->unblock(dev_locked);
+ dev->dunblock(DEV_LOCKED);
return dcr;
/*
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->unblock(dev_locked);
+ dev->dunblock(DEV_LOCKED);
return NULL;
}
bool ok = true;
/* lock only if not already locked by this thread */
- if (!dcr->dev_locked) {
+ if (!dcr->is_dev_locked()) {
dev->r_dlock();
}
Dmsg2(100, "release_device device %s is %s\n", dev->print_name(), dev->is_tape()?"tape":"disk");
pthread_cond_broadcast(&dev->wait_next_vol);
Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId);
pthread_cond_broadcast(&wait_device_release);
- dcr->dev_locked = false; /* set no longer locked */
dev->dunlock();
if (jcr->read_dcr == dcr) {
jcr->read_dcr = NULL;
/*
* Create a new Device Control Record and attach
* it to the device (if this is a real job).
+ * Note, this has been updated so that it can be called first
+ * without a DEVICE, then a second or third time with a DEVICE,
+ * and each time, it should cleanup and point to the new device.
+ * This should facilitate switching devices.
+ * Note, each dcr must point to the controlling job (jcr). However,
+ * a job can have multiple dcrs, so we must not store in the jcr's
+ * structure as previously. The higher level routine must store
+ * this dcr in the right place
+ *
*/
-DCR *new_dcr(JCR *jcr, DEVICE *dev)
+DCR *new_dcr(JCR *jcr, DCR *dcr, DEVICE *dev)
{
- if (jcr) Dmsg2(100, "enter new_dcr JobId=%u dev=%p\n", (uint32_t)jcr->JobId, dev);
- DCR *dcr = (DCR *)malloc(sizeof(DCR));
- memset(dcr, 0, sizeof(DCR));
- dcr->jcr = jcr;
- if (dev) {
+ if (!dcr) {
+ dcr = (DCR *)malloc(sizeof(DCR));
+ memset(dcr, 0, sizeof(DCR));
dcr->tid = pthread_self();
- dcr->dev = dev;
- dcr->device = dev->device;
+ dcr->spool_fd = -1;
+ }
+ dcr->jcr = jcr; /* point back to jcr */
+ /* Set device information, possibly change device */
+ if (dev) {
+ if (dcr->block) {
+ free_block(dcr->block);
+ }
dcr->block = new_block(dev);
+ if (dcr->rec) {
+ free_record(dcr->rec);
+ }
dcr->rec = new_record();
+ if (dcr->attached_to_dev) {
+ detach_dcr_from_dev(dcr);
+ }
dcr->max_job_spool_size = dev->device->max_job_spool_size;
+ dcr->device = dev->device;
+ dcr->dev = dev;
attach_dcr_to_dev(dcr);
}
- dcr->spool_fd = -1;
return dcr;
}
void detach_dcr_from_dev(DCR *dcr)
{
Dmsg1(500, "JobId=%u enter detach_dcr_from_dev\n", (uint32_t)dcr->jcr->JobId);
- unreserve_device(dcr);
/* Detach this dcr only if attached */
- if (dcr->attached_to_dev) {
+ if (dcr->attached_to_dev && dcr->dev) {
+ unreserve_device(dcr);
dcr->dev->attached_dcrs->remove(dcr); /* detach dcr from device */
dcr->attached_to_dev = false;
// remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */
{
JCR *jcr = dcr->jcr;
- if (dcr->dev) {
- detach_dcr_from_dev(dcr);
- }
+ detach_dcr_from_dev(dcr);
if (dcr->block) {
free_block(dcr->block);
projects / bacula / bacula / blobdiff