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
return false;
}
sd = jcr->store_bsock;
- pm_strcpy(device_name, dev->hdr.name);
+ pm_strcpy(device_name, dev->name());
bash_spaces(device_name);
bnet_fsend(sd, query_device, device_name.c_str());
Dmsg1(100, ">stored: %s\n", sd->msg);
/*
* Now send JobId and permissions, and get back the authorization key.
*/
- pm_strcpy(job_name, jcr->job->hdr.name);
+ pm_strcpy(job_name, jcr->job->name());
bash_spaces(job_name);
- pm_strcpy(client_name, jcr->client->hdr.name);
+ pm_strcpy(client_name, jcr->client->name());
bash_spaces(client_name);
- pm_strcpy(fileset_name, jcr->fileset->hdr.name);
+ pm_strcpy(fileset_name, jcr->fileset->name());
bash_spaces(fileset_name);
if (jcr->fileset->MD5[0] == 0) {
bstrncpy(jcr->fileset->MD5, "**Dummy**", sizeof(jcr->fileset->MD5));
DEVICE *dev;
/* Loop over alternative storage Devices until one is OK */
foreach_alist(dev, storage->device) {
- pm_strcpy(device_name, dev->hdr.name);
+ pm_strcpy(device_name, dev->name());
bash_spaces(device_name);
bnet_fsend(sd, use_device, device_name.c_str());
Dmsg1(100, ">stored: %s", sd->msg);
DEVICE *dev;
/* Loop over alternative storage Devices until one is OK */
foreach_alist(dev, storage->device) {
- pm_strcpy(device_name, dev->hdr.name);
+ pm_strcpy(device_name, dev->name());
bash_spaces(device_name);
bnet_fsend(sd, use_device, device_name.c_str());
Dmsg1(100, ">stored: %s", sd->msg);
pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
Dmsg1(100, "=== End msg_thread. use=%d\n", jcr->use_count());
free_jcr(jcr); /* release jcr */
+ db_thread_cleanup(); /* remove thread specific data */
}
/*
V(mutex);
if (job_canceled(jcr)) {
if (jcr->SD_msg_chan) {
- jcr->store_bsock->timed_out = 1;
- jcr->store_bsock->terminated = 1;
+ jcr->store_bsock->set_timed_out();
+ jcr->store_bsock->set_terminated();
Dmsg2(400, "kill jobid=%d use=%d\n", (int)jcr->JobId, jcr->use_count());
pthread_kill(jcr->SD_msg_chan, TIMEOUT_SIGNAL);
}
LockRes();
foreach_res(dev, R_DEVICE) {
if (!update_device_res(jcr, dev)) {
- Dmsg1(900, "Error updating device=%s\n", dev->hdr.name);
+ Dmsg1(900, "Error updating device=%s\n", dev->name());
} else {
- Dmsg1(900, "Updated Device=%s\n", dev->hdr.name);
+ Dmsg1(900, "Updated Device=%s\n", dev->name());
}
}
UnlockRes();