-/*
- * Spooling code
- *
- * Kern Sibbald, March 2004
- *
- * Version $Id$
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2004-2007 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.
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ * Spooling code
+ *
+ * Kern Sibbald, March 2004
+ *
+ * Version $Id$
+ */
#include "bacula.h"
#include "stored.h"
void list_spool_stats(void sendit(const char *msg, int len, void *sarg), void *arg)
{
- char *msg, ed1[30], ed2[30];
+ char ed1[30], ed2[30];
+ POOL_MEM msg(PM_MESSAGE);
int len;
- msg = (char *)get_pool_memory(PM_MESSAGE);
-
if (spool_stats.data_jobs || spool_stats.max_data_size) {
len = Mmsg(msg, _("Data spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes/job.\n"),
spool_stats.data_jobs, edit_uint64_with_commas(spool_stats.data_size, ed1),
spool_stats.total_data_jobs,
edit_uint64_with_commas(spool_stats.max_data_size, ed2));
- sendit(msg, len, arg);
+ sendit(msg.c_str(), len, arg);
}
if (spool_stats.attr_jobs || spool_stats.max_attr_size) {
len = Mmsg(msg, _("Attr spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes.\n"),
spool_stats.total_attr_jobs,
edit_uint64_with_commas(spool_stats.max_attr_size, ed2));
- sendit(msg, len, arg);
+ sendit(msg.c_str(), len, arg);
}
-
- free_pool_memory(msg);
}
bool begin_data_spool(DCR *dcr)
} else {
dir = working_directory;
}
- Mmsg(name, "%s/%s.data.%s.%s.spool", dir, my_name, dcr->jcr->Job,
- dcr->device->hdr.name);
+ Mmsg(name, "%s/%s.data.%u.%s.%s.spool", dir, my_name, dcr->jcr->JobId,
+ dcr->jcr->Job, dcr->device->hdr.name);
}
static const char *spool_name = "*spool*";
+/*
+ * NB! This routine locks the device, but if committing will
+ * not unlock it. If not committing, it will be unlocked.
+ */
static bool despool_data(DCR *dcr, bool commit)
{
DEVICE *rdev;
char ec1[50];
Dmsg0(100, "Despooling data\n");
- /* Commit means that the job is done, so we commit, otherwise, we
+ /*
+ * Commit means that the job is done, so we commit, otherwise, we
* are despooling because of user spool size max or some error
* (e.g. filesystem full).
*/
}
dcr->despool_wait = true;
dcr->spooling = false;
- lock_device(dcr->dev);
+ dcr->dev->r_dlock();
dcr->despool_wait = false;
dcr->despooling = true;
dcr->dev_locked = true;
rdev->max_block_size = dcr->dev->max_block_size;
rdev->min_block_size = dcr->dev->min_block_size;
rdev->device = dcr->dev->device;
- rdcr = new_dcr(NULL, rdev);
+ rdcr = new_dcr(jcr, rdev);
rdcr->spool_fd = dcr->spool_fd;
rdcr->jcr = jcr; /* set a valid jcr */
block = dcr->block; /* save block */
/* If doing a commit, leave the device locked -- unlocked in release_device() */
if (!commit) {
dcr->dev_locked = false;
- unlock_device(dcr->dev);
+ dcr->dev->dunlock();
}
return ok;
}
V(mutex);
Jmsg(jcr, M_INFO, 0, _("Sending spooled attrs to the Director. Despooling %s bytes ...\n"),
edit_uint64_with_commas(size, ec1));
- bnet_despool_to_bsock(jcr->dir_bsock, update_attr_spool_size, size);
+ jcr->dir_bsock->despool(update_attr_spool_size, size);
return close_attr_spool_file(jcr, jcr->dir_bsock);
}
return true;