bool do_full = false;
bool do_diff = false;
time_t now;
- utime_t full_time, diff_time;
+ utime_t full_time;
+// utime_t diff_time;
since[0] = 0;
/* If job cloned and a since time already given, use it */
#include "bacula.h"
#include "filed.h"
+#include "lib/status.h"
extern void *start_heap;
/* Forward referenced functions */
-static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void list_status_header(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void bsock_sendit(const char *msg, int len, void *arg);
+static void list_terminated_jobs(STATUS_PKT *sp, bool api);
+static void list_running_jobs(STATUS_PKT *sp, bool api);
+static void list_status_header(STATUS_PKT *sp, bool api);
+static void sendit(const char *msg, int len, STATUS_PKT *sp);
static const char *level_to_str(int level);
/* Static variables */
/*
* General status generator
*/
-void output_status(void sendit(const char *msg, int len, void *sarg), void *arg)
+void output_status(STATUS_PKT *sp)
{
- list_status_header(sendit, arg, false /*no api*/);
- list_running_jobs(sendit, arg, false /*no api*/);
- list_terminated_jobs(sendit, arg, false /*no api*/);
+ list_status_header(sp, false /*no api*/);
+ list_running_jobs(sp, false /*no api*/);
+ list_terminated_jobs(sp, false /*no api*/);
}
-static void list_status_header(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void list_status_header(STATUS_PKT *sp, bool api)
{
POOL_MEM msg(PM_MESSAGE);
char b1[32], b2[32], b3[32], b4[32], b5[35];
len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"),
my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),
dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
#if defined(HAVE_WIN32)
if (debug_level > 0) {
if (!privs) {
privs = enable_backup_privileges(NULL, 1);
}
len = Mmsg(msg, "VSS %s, Priv 0x%x\n", g_pVSSClient?"enabled":"disabled", privs);
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
p_OpenProcessToken?"":"!",
p_AdjustTokenPrivileges?"":"!",
p_LookupPrivilegeValue?"":"!",
p_CreateFileA?"":"!",
p_CreateFileW?"":"!");
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, " %sWUL,%sWMKD,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
p_wunlink?"":"!",
p_wmkdir?"":"!",
p_BackupRead?"":"!",
p_BackupWrite?"":"!",
p_SetProcessShutdownParameters?"":"!");
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n",
p_WideCharToMultiByte?"":"!",
p_MultiByteToWideChar?"":"!",
p_FindNextFileW?"":"!",
p_SetCurrentDirectoryA?"":"!",
p_SetCurrentDirectoryW?"":"!");
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW\n",
p_GetCurrentDirectoryA?"":"!",
p_GetCurrentDirectoryW?"":"!",
p_GetVolumePathNameW?"":"!",
p_GetVolumeNameForVolumeMountPointW?"":"!");
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
#endif
len = Mmsg(msg, _(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
edit_uint64_with_commas(sm_max_bytes, b3),
edit_uint64_with_commas(sm_buffers, b4),
edit_uint64_with_commas(sm_max_buffers, b5));
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, _(" Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d\n"),
sizeof(boffset_t), sizeof(size_t), debug_level, get_trace());
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
-static void list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void list_running_jobs(STATUS_PKT *sp, bool api)
{
int sec, bps;
POOL_MEM msg(PM_MESSAGE);
Dmsg0(1000, "Begin status jcr loop.\n");
if (!api) {
len = Mmsg(msg, _("\nRunning Jobs:\n"));
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
const char *vss = "";
#ifdef WIN32_VSS
} else {
len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
njcr->JobId, njcr->Job);
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, _(" %s%s Job started: %s\n"),
vss, job_type_to_str(njcr->JobType), dt);
}
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
if (njcr->JobId == 0) {
continue;
}
edit_uint64_with_commas(njcr->JobBytes, b2),
edit_uint64_with_commas(bps, b3),
njcr->JobErrors);
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
len = Mmsg(msg, _(" Files Examined=%s\n"),
edit_uint64_with_commas(njcr->num_files_examined, b1));
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
if (njcr->JobFiles > 0) {
njcr->lock();
len = Mmsg(msg, _(" Processing file: %s\n"), njcr->last_fname);
njcr->unlock();
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
found = true;
if (njcr->store_bsock) {
len = Mmsg(msg, " SDReadSeqNo=%" lld " fd=%d\n",
njcr->store_bsock->read_seqno, njcr->store_bsock->m_fd);
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
} else {
len = Mmsg(msg, _(" SDSocket closed.\n"));
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
}
endeach_jcr(njcr);
if (!api) {
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
- sendit(msg.c_str(), len, arg);
+ sendit(msg.c_str(), len, sp);
}
- sendit(_("====\n"), 5, arg);
+ sendit(_("====\n"), 5, sp);
}
}
-static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void list_terminated_jobs(STATUS_PKT *sp, bool api)
{
char dt[MAX_TIME_LENGTH], b1[30], b2[30];
char level[10];
if (!api) {
msg = _("\nTerminated Jobs:\n");
- sendit(msg, strlen(msg), arg);
+ sendit(msg, strlen(msg), sp);
}
if (last_jobs->size() == 0) {
- if (!api) sendit(_("====\n"), 5, arg);
+ if (!api) sendit(_("====\n"), 5, sp);
return;
}
lock_last_jobs_list();
if (!api) {
msg = _(" JobId Level Files Bytes Status Finished Name \n");
- sendit(msg, strlen(msg), arg);
+ sendit(msg, strlen(msg), sp);
msg = _("======================================================================\n");
- sendit(msg, strlen(msg), arg);
+ sendit(msg, strlen(msg), sp);
}
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
termstat,
dt, JobName);
}
- sendit(buf, strlen(buf), arg);
+ sendit(buf, strlen(buf), sp);
}
- if (!api) sendit(_("====\n"), 5, arg);
+ if (!api) sendit(_("====\n"), 5, sp);
unlock_last_jobs_list();
}
/*
* Send to bsock (Director or Console)
*/
-static void bsock_sendit(const char *msg, int len, void *arg)
+static void sendit(const char *msg, int len, STATUS_PKT *sp)
{
- BSOCK *user = (BSOCK *)arg;
-
- user->msg = check_pool_memory_size(user->msg, len+1);
- memcpy(user->msg, msg, len+1);
- user->msglen = len+1;
- user->send();
+ if (sp->bs) {
+ BSOCK *user = sp->bs;
+ user->msg = check_pool_memory_size(user->msg, len+1);
+ memcpy(user->msg, msg, len+1);
+ user->msglen = len+1;
+ user->send();
+ } else {
+ sp->callback(msg, len, sp->context);
+ }
}
/*
int status_cmd(JCR *jcr)
{
BSOCK *user = jcr->dir_bsock;
+ STATUS_PKT sp;
user->fsend("\n");
- output_status(bsock_sendit, (void *)user);
+ sp.bs = user;
+ output_status(&sp);
user->signal(BNET_EOD);
return 1;
POOLMEM *cmd;
JCR *njcr;
s_last_job* job;
+ STATUS_PKT sp;
+ sp.bs = dir;
cmd = get_memory(dir->msglen+1);
if (sscanf(dir->msg, qstatus, cmd) != 1) {
dir->fsend(DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
} else if (strcasecmp(cmd, "header") == 0) {
- list_status_header(bsock_sendit, (void *)dir, true/*api*/);
+ list_status_header(&sp, true/*api*/);
} else if (strcasecmp(cmd, "running") == 0) {
- list_running_jobs(bsock_sendit, (void *)dir, true/*api*/);
+ list_running_jobs(&sp, true/*api*/);
} else if (strcasecmp(cmd, "terminated") == 0) {
- list_terminated_jobs(bsock_sendit, (void *)dir, true/*api*/);
+ list_terminated_jobs(&sp, true/*api*/);
} else {
pm_strcpy(&jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
dir->fsend(_("2900 Bad .status command, wrong argument.\n"));
- bnet_sig(dir, BNET_EOD);
+ dir->signal(BNET_EOD);
free_memory(cmd);
return 0;
}
- bnet_sig(dir, BNET_EOD);
+ dir->signal(BNET_EOD);
free_memory(cmd);
return 1;
}
--- /dev/null
+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2008-2008 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.
+ 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 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
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Status packet definition that is used in both the SD and FD. It
+ * permits Win32 to call output_status() and get the output back
+ * at the callback address line by line, and for Linux code,
+ * the output can be sent directly to a BSOCK.
+ *
+ * Kern Sibbald, March MMVII
+ *
+ * Version $Id: $
+ *
+ */
+
+#ifndef __STATUS_H_
+#define __STATUS_H_
+
+/*
+ * Packet to send to output_status()
+ */
+class STATUS_PKT {
+public:
+ BSOCK *bs; /* used on Unix machines */
+ void *context; /* Win32 */
+ void (*callback)(const char *msg, int len, void *context); /* Win32 */
+};
+
+extern void output_status(STATUS_PKT *sp);
+
+
+#endif
#include "bacula.h"
#include "stored.h"
+#include "lib/status.h"
/* Exported variables */
/* Forward referenced functions */
-static void sendit(const char *msg, int len, BSOCK *bs);
-static void sendit(POOL_MEM &msg, int len, BSOCK *bs);
+static void sendit(const char *msg, int len, STATUS_PKT *sp);
+static void sendit(POOL_MEM &msg, int len, STATUS_PKT *sp);
static void sendit(const char *msg, int len, void *arg);
-static void send_blocked_status(DEVICE *dev, BSOCK *bs);
-static void list_terminated_jobs(BSOCK *bs);
-static void list_running_jobs(BSOCK *bs);
-static void list_jobs_waiting_on_reservation(BSOCK *bs);
-static void list_status_header(BSOCK *bs);
-static void list_devices(BSOCK *bs);
+static void send_blocked_status(DEVICE *dev, STATUS_PKT *sp);
+static void list_terminated_jobs(STATUS_PKT *sp);
+static void list_running_jobs(STATUS_PKT *sp);
+static void list_jobs_waiting_on_reservation(STATUS_PKT *sp);
+static void list_status_header(STATUS_PKT *sp);
+static void list_devices(STATUS_PKT *sp);
static const char *level_to_str(int level);
/*
* Status command from Director
*/
-void output_status(BSOCK *bs)
+void output_status(STATUS_PKT *sp)
{
POOL_MEM msg(PM_MESSAGE);
int len;
- list_status_header(bs);
+ list_status_header(sp);
/*
* List running jobs
*/
- list_running_jobs(bs);
+ list_running_jobs(sp);
/*
* List jobs stuck in reservation system
*/
- list_jobs_waiting_on_reservation(bs);
+ list_jobs_waiting_on_reservation(sp);
/*
* List terminated jobs
*/
- list_terminated_jobs(bs);
+ list_terminated_jobs(sp);
/*
* List devices
*/
- list_devices(bs);
+ list_devices(sp);
len = Mmsg(msg, _("In Use Volume status:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
- list_volumes(sendit, (void *)bs);
- sendit("====\n\n", 6, bs);
+ list_volumes(sendit, (void *)sp);
+ sendit("====\n\n", 6, sp);
#ifdef xxx
if (debug_level > 10) {
}
#endif
- list_spool_stats(sendit, (void *)bs);
+ list_spool_stats(sendit, (void *)sp);
}
-static void list_devices(BSOCK *bs)
+static void list_devices(STATUS_PKT *sp)
{
DEVRES *device;
AUTOCHANGER *changer;
int bpb;
len = Mmsg(msg, _("\nDevice status:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
foreach_res(changer, R_AUTOCHANGER) {
len = Mmsg(msg, _("Autochanger \"%s\" with devices:\n"),
changer->hdr.name);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
foreach_alist(device, changer->device) {
if (device->dev) {
len = Mmsg(msg, " %s\n", device->dev->print_name());
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else {
len = Mmsg(msg, " %s\n", device->hdr.name);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
}
}
dev->VolHdr.VolumeName,
dev->pool_name[0]?dev->pool_name:"*unknown*",
dev->device->media_type);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else {
len = Mmsg(msg, _("Device %s open but no Bacula volume is currently mounted.\n"),
dev->print_name());
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
- send_blocked_status(dev, bs);
+ send_blocked_status(dev, sp);
if (dev->can_append()) {
bpb = dev->VolCatInfo.VolCatBlocks;
if (bpb <= 0) {
edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1),
edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2),
edit_uint64_with_commas(bpb, b3));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else { /* reading */
bpb = dev->VolCatInfo.VolCatReads;
if (bpb <= 0) {
edit_uint64_with_commas(dev->VolCatInfo.VolCatRBytes, b1),
edit_uint64_with_commas(dev->VolCatInfo.VolCatReads, b2),
edit_uint64_with_commas(bpb, b3));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
len = Mmsg(msg, _(" Positioned at File=%s Block=%s\n"),
edit_uint64_with_commas(dev->file, b1),
edit_uint64_with_commas(dev->block_num, b2));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else {
if (dev) {
len = Mmsg(msg, _("Device %s is not open.\n"), dev->print_name());
- sendit(msg, len, bs);
- send_blocked_status(dev, bs);
+ sendit(msg, len, sp);
+ send_blocked_status(dev, sp);
} else {
len = Mmsg(msg, _("Device \"%s\" is not open or does not exist.\n"), device->hdr.name);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
}
}
- sendit("====\n\n", 6, bs);
+ sendit("====\n\n", 6, sp);
}
-static void list_status_header(BSOCK *bs)
+static void list_status_header(STATUS_PKT *sp)
{
char dt[MAX_TIME_LENGTH];
char b1[35], b2[35], b3[35], b4[35], b5[35];
len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s\n"),
my_name, VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),
dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
edit_uint64_with_commas(sm_max_bytes, b3),
edit_uint64_with_commas(sm_buffers, b4),
edit_uint64_with_commas(sm_max_buffers, b5));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, "Sizes: boffset_t=%d size_t=%d int32_t=%d int64_t=%d\n",
(int)sizeof(boffset_t), (int)sizeof(size_t), (int)sizeof(int32_t),
(int)sizeof(int64_t));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
-static void send_blocked_status(DEVICE *dev, BSOCK *bs)
+static void send_blocked_status(DEVICE *dev, STATUS_PKT *sp)
{
POOL_MEM msg(PM_MESSAGE);
int len;
if (!dev) {
len = Mmsg(msg, _("No DEVICE structure.\n\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
return;
}
switch (dev->blocked()) {
case BST_UNMOUNTED:
len = Mmsg(msg, _(" Device is BLOCKED. User unmounted.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
break;
case BST_UNMOUNTED_WAITING_FOR_SYSOP:
len = Mmsg(msg, _(" Device is BLOCKED. User unmounted during wait for media/mount.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
break;
case BST_WAITING_FOR_SYSOP:
{
dcr->VolumeName,
dcr->pool_name,
dcr->media_type);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
found_jcr = true;
} else if (dcr->jcr->JobStatus == JS_WaitMedia) {
len = Mmsg(msg, _(" Device is BLOCKED waiting to create a volume for:\n"
" Media type: %s\n"),
dcr->pool_name,
dcr->media_type);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
found_jcr = true;
}
}
if (!found_jcr) {
len = Mmsg(msg, _(" Device is BLOCKED waiting for media.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
}
break;
case BST_DOING_ACQUIRE:
len = Mmsg(msg, _(" Device is being initialized.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
break;
case BST_WRITING_LABEL:
len = Mmsg(msg, _(" Device is blocked labeling a Volume.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
break;
default:
break;
if (dev->Slot > 0) {
len = Mmsg(msg, _(" Slot %d is loaded in drive %d.\n"),
dev->Slot, dev->drive_index);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else if (dev->Slot == 0) {
len = Mmsg(msg, _(" Drive %d is not loaded.\n"), dev->drive_index);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else {
len = Mmsg(msg, _(" Drive %d status unknown.\n"), dev->drive_index);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
}
if (debug_level > 1) {
len = Mmsg(msg, _("Configured device capabilities:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, "%sEOF %sBSR %sBSF %sFSR %sFSF %sEOM %sREM %sRACCESS %sAUTOMOUNT %sLABEL %sANONVOLS %sALWAYSOPEN\n",
dev->capabilities & CAP_EOF ? "" : "!",
dev->capabilities & CAP_LABEL ? "" : "!",
dev->capabilities & CAP_ANONVOLS ? "" : "!",
dev->capabilities & CAP_ALWAYSOPEN ? "" : "!");
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("Device state:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, "%sOPENED %sTAPE %sLABEL %sMALLOC %sAPPEND %sREAD %sEOT %sWEOT %sEOF %sNEXTVOL %sSHORT %sMOUNTED\n",
dev->is_open() ? "" : "!",
dev->state & ST_NEXTVOL ? "" : "!",
dev->state & ST_SHORT ? "" : "!",
dev->state & ST_MOUNTED ? "" : "!");
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("num_writers=%d block=%d\n\n"), dev->num_writers, dev->blocked());
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("Device parameters:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
dev->name());
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("File=%u block=%u\n"), dev->file, dev->block_num);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len = Mmsg(msg, _("Min block=%u Max block=%u\n"), dev->min_block_size, dev->max_block_size);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
}
-static void list_running_jobs(BSOCK *bs)
+static void list_running_jobs(STATUS_PKT *sp)
{
bool found = false;
int bps, sec;
POOL_MEM msg(PM_MESSAGE);
len = Mmsg(msg, _("\nRunning Jobs:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
foreach_jcr(jcr) {
if (jcr->JobStatus == JS_WaitFD) {
len = Mmsg(msg, _("%s Job %s waiting for Client connection.\n"),
job_type_to_str(jcr->JobType), jcr->Job);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
dcr = jcr->dcr;
rdcr = jcr->read_dcr;
rdcr->pool_name,
rdcr->dev?rdcr->dev->print_name():
rdcr->device->device_name);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
if (dcr && dcr->device) {
len = Mmsg(msg, _("Writing: %s %s job %s JobId=%d Volume=\"%s\"\n"
dcr->pool_name,
dcr->dev?dcr->dev->print_name():
dcr->device->device_name);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
len= Mmsg(msg, _(" spooling=%d despooling=%d despool_wait=%d\n"),
dcr->spooling, dcr->despooling, dcr->despool_wait);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
sec = time(NULL) - jcr->run_time;
if (sec <= 0) {
edit_uint64_with_commas(jcr->JobFiles, b1),
edit_uint64_with_commas(jcr->JobBytes, b2),
edit_uint64_with_commas(bps, b3));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
found = true;
#ifdef DEBUG
if (jcr->file_bsock) {
edit_uint64_with_commas(jcr->file_bsock->read_seqno, b1),
jcr->file_bsock->in_msg_no, jcr->file_bsock->out_msg_no,
jcr->file_bsock->m_fd);
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
} else {
len = Mmsg(msg, _(" FDSocket closed\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
#endif
}
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
}
- sendit("====\n", 5, bs);
+ sendit("====\n", 5, sp);
}
-static void list_jobs_waiting_on_reservation(BSOCK *bs)
+static void list_jobs_waiting_on_reservation(STATUS_PKT *sp)
{
JCR *jcr;
POOL_MEM msg(PM_MESSAGE);
int len;
len = Mmsg(msg, _("\nJobs waiting to reserve a drive:\n"));
- sendit(msg, len, bs);
+ sendit(msg, len, sp);
foreach_jcr(jcr) {
if (!jcr->reserve_msgs) {
continue;
}
- send_drive_reserve_messages(jcr, sendit, bs);
+ send_drive_reserve_messages(jcr, sendit, sp);
}
endeach_jcr(jcr);
- sendit("====\n", 5, bs);
+ sendit("====\n", 5, sp);
}
-static void list_terminated_jobs(BSOCK *bs)
+static void list_terminated_jobs(STATUS_PKT *sp)
{
char dt[MAX_TIME_LENGTH], b1[30], b2[30];
char level[10];
const char *msg;
msg = _("\nTerminated Jobs:\n");
- sendit(msg, strlen(msg), bs);
+ sendit(msg, strlen(msg), sp);
if (last_jobs->size() == 0) {
- sendit("====\n", 5, bs);
+ sendit("====\n", 5, sp);
return;
}
lock_last_jobs_list();
msg = _(" JobId Level Files Bytes Status Finished Name \n");
- sendit(msg, strlen(msg), bs);
+ sendit(msg, strlen(msg), sp);
msg = _("===================================================================\n");
- sendit(msg, strlen(msg), bs);
+ sendit(msg, strlen(msg), sp);
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
const char *termstat;
edit_uint64_with_suffix(je->JobBytes, b2),
termstat,
dt, JobName);
- sendit(buf, strlen(buf), bs);
+ sendit(buf, strlen(buf), sp);
}
unlock_last_jobs_list();
- sendit("====\n", 5, bs);
+ sendit("====\n", 5, sp);
}
/*
/*
* Send to Director
*/
-static void sendit(const char *msg, int len, BSOCK *bs)
+static void sendit(const char *msg, int len, STATUS_PKT *sp)
{
- memcpy(bs->msg, msg, len+1);
- bs->msglen = len+1;
- bs->send();
+ BSOCK *bs = sp->bs;
+ if (bs) {
+ memcpy(bs->msg, msg, len+1);
+ bs->msglen = len+1;
+ bs->send();
+ } else {
+ sp->callback(msg, len, sp->context);
+ }
}
-static void sendit(const char *msg, int len, void *bs)
+static void sendit(const char *msg, int len, void *sp)
{
- sendit(msg, len, (BSOCK *)bs);
+ sendit(msg, len, (STATUS_PKT *)sp);
}
-static void sendit(POOL_MEM &msg, int len, BSOCK *bs)
+static void sendit(POOL_MEM &msg, int len, STATUS_PKT *sp)
{
- memcpy(bs->msg, msg.c_str(), len+1);
- bs->msglen = len+1;
- bs->send();
+ BSOCK *bs = sp->bs;
+ if (bs) {
+ memcpy(bs->msg, msg.c_str(), len+1);
+ bs->msglen = len+1;
+ bs->send();
+ } else {
+ sp->callback(msg.c_str(), len, sp->context);
+ }
}
bool status_cmd(JCR *jcr)
{
BSOCK *bs = jcr->dir_bsock;
+ STATUS_PKT sp;
bs->fsend("\n");
- output_status(bs);
+ sp.bs = bs;
+ output_status(&sp);
bs->signal(BNET_EOD);
return 1;
}
#undef VERSION
#define VERSION "2.3.11"
-#define BDATE "03 March 2008"
-#define LSMDATE "03Mar08"
+#define BDATE "04 March 2008"
+#define LSMDATE "04Mar08"
#define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
#define BYEAR "2008" /* year for copyright messages in progs */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2007-2008 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.
extern int BaculaAppMain();
extern void LogErrorMsg(char *msg, char *fname, int lineno);
-extern void output_status(void sendit(const char *msg, int len, void *sarg), void *arg);
-
extern int BaculaMain(int argc, char *argv[]);
extern BOOL ReportStatus(DWORD state, DWORD exitcode, DWORD waithint);
extern void d_msg(const char *, int, int, const char *, ...);
#include "bacula.h"
#include "win32.h"
#include "statusDialog.h"
+#include "lib/status.h"
static BOOL CALLBACK dialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
void statusDialog::display()
{
if (m_textWin != NULL) {
+ STATUS_PKT sp;
long hPos = GetScrollPos(m_textWin, SB_HORZ);
long vPos = GetScrollPos(m_textWin, SB_VERT);
long selStart;
SendMessage(m_textWin, EM_GETSEL, (WPARAM)&selStart, (LPARAM)&selEnd);
SetWindowText(m_textWin, "");
- output_status(displayString, this);
+ sp.bs = NULL;
+ sp.context = this;
+ sp.callback = displayString;
+ output_status(&sp);
SendMessage(m_textWin, EM_SETSEL, selStart, selEnd);
SendMessage(m_textWin, WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, hPos), 0);
Technical notes on version 2.3
General:
+04Mar08
+kes Refactor FD and SD status commands to permit new API code in
+ SD, and to fix Win32 build.
+kes Win32 build is now working.
03Mar08
kes Implement 'MaxFullInterval' and start 'MaxDiffInterval' based on
some ideas in patch from Scott Bailey.
projects / bacula / bacula / commitdiff