*
*/
/*
- 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
/* Forward referenced functions */
static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
static void bsock_sendit(const char *msg, int len, void *arg);
-static char *level_to_str(int level);
+static const char *level_to_str(int level);
#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
static void do_status(void sendit(const char *msg, int len, void *sarg), void *arg)
{
int sec, bps;
- char *msg, b1[32], b2[32], b3[32];
+ char *msg, b1[32], b2[32], b3[32], b4[32];
int found, len;
JCR *njcr;
char dt[MAX_TIME_LENGTH];
privs = enable_backup_privileges(NULL, 1);
}
len = Mmsg(&msg,
- _("Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
+ _(" Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
p_OpenProcessToken?"":"!",
p_AdjustTokenPrivileges?"":"!",
p_LookupPrivilegeValue?"":"!",
sendit(msg, len, arg);
}
#endif
+ if (debug_level > 0) {
+ len = Mmsg(&msg, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
+ edit_uint64_with_commas(sm_bytes, b1),
+ edit_uint64_with_commas(sm_max_bytes, b2),
+ edit_uint64_with_commas(sm_buffers, b3),
+ edit_uint64_with_commas(sm_max_buffers, b4));
+ sendit(msg, len, arg);
+ }
+ if (debug_level > 0) {
+ len = Mmsg(&msg, _(" Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
+ sizeof(size_t));
+ sendit(msg, len, arg);
+ }
list_terminated_jobs(sendit, arg);
* List running jobs
*/
Dmsg0(1000, "Begin status jcr loop.\n");
+ len = Mmsg(&msg, _("Running Jobs:\n"));
+ sendit(msg, len, arg);
lock_jcr_chain();
foreach_jcr(njcr) {
bstrftime_nc(dt, sizeof(dt), njcr->start_time);
if (sec <= 0) {
sec = 1;
}
- bps = njcr->JobBytes / sec;
+ bps = (int)(njcr->JobBytes / sec);
len = Mmsg(&msg, _(" Files=%s Bytes=%s Bytes/sec=%s\n"),
edit_uint64_with_commas(njcr->JobFiles, b1),
edit_uint64_with_commas(njcr->JobBytes, b2),
unlock_jcr_chain();
Dmsg0(1000, "Begin status jcr loop.\n");
if (!found) {
- len = Mmsg(&msg, _("No jobs running.\n"));
+ len = Mmsg(&msg, _("No Jobs running.\n"));
sendit(msg, len, arg);
}
+ len = Mmsg(&msg, _("====\n"));
+ sendit(msg, len, arg);
free_pool_memory(msg);
}
sendit("\n", 1, arg); /* send separately */
msg = _("Terminated Jobs:\n");
sendit(msg, strlen(msg), arg);
- msg = _(" JobId Level Files Bytes Status Finished Name \n");
+ msg = _(" JobId Level Files Bytes Status Finished Name \n");
sendit(msg, strlen(msg), arg);
msg = _("======================================================================\n");
sendit(msg, strlen(msg), arg);
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
- char *termstat;
+ const char *termstat;
char buf[1000];
bstrftime_nc(dt, sizeof(dt), je->end_time);
*p = 0;
}
}
- bsnprintf(buf, sizeof(buf), _("%6d %-4s %8s %14s %-7s %-8s %s\n"),
+ bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %14s %-7s %-8s %s\n"),
je->JobId,
level,
edit_uint64_with_commas(je->JobFiles, b1),
dt, JobName);
sendit(buf, strlen(buf), arg);
}
- sendit("\n", 1, arg);
+ sendit("====\n", 5, arg);
unlock_last_jobs_list();
}
bnet_fsend(user, "\n");
do_status(bsock_sendit, (void *)user);
- bnet_fsend(user, "====\n");
bnet_sig(user, BNET_EOD);
return 1;
/*
* Convert Job Level into a string
*/
-static char *level_to_str(int level)
+static const char *level_to_str(int level)
{
- char *str;
+ const char *str;
switch (level) {
case L_BASE:
#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
#include <windows.h>
-static char buf[100];
int bacstat = 0;
struct s_win32_arg {
// when compiling with visual studio some strings are read-only
// and cause access violations. So we creat a tmp copy.
char *_msg = (char *)alloca(len);
- strncpy(_msg, msg, len-1);
- _msg[len-1] = 0;
+ bstrncpy(_msg, msg, len);
msg = _msg;
}
SendDlgItemMessage(arg->hwnd, arg->idlist, LB_ADDSTRING, 0, (LONG)msg);
do_status(win32_sendit, (void *)&arg);
}
-char *bac_status(int stat)
+char *bac_status(char *buf, int buf_len)
{
JCR *njcr;
- char *termstat = _("Bacula Idle");
+ const char *termstat = _("Bacula Idle");
+ struct s_last_job *job;
+ int stat = 0; /* Idle */
- bacstat = 0;
- if (last_jobs->size() > 0) {
- switch (last_job.JobStatus) {
- case JS_Canceled:
- bacstat = -1;
- termstat = _("Last Job Canceled");
- break;
- case JS_ErrorTerminated:
- bacstat = -1;
- termstat = _("Last Job Failed");
- break;
- default:
- break;
- }
+ if (!last_jobs) {
+ goto done;
}
Dmsg0(1000, "Begin bac_status jcr loop.\n");
lock_jcr_chain();
- for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
+ foreach_jcr(njcr) {
if (njcr->JobId != 0) {
- bacstat = 1;
+ stat = JS_Running;
termstat = _("Bacula Running");
free_locked_jcr(njcr);
break;
free_locked_jcr(njcr);
}
unlock_jcr_chain();
+ if (stat != 0) {
+ goto done;
+ }
+ if (last_jobs->size() > 0) {
+ job = (struct s_last_job *)last_jobs->last();
+ stat = job->JobStatus;
+ switch (job->JobStatus) {
+ case JS_Canceled:
+ termstat = _("Last Job Canceled");
+ break;
+ case JS_ErrorTerminated:
+ case JS_FatalError:
+ termstat = _("Last Job Failed");
+ break;
+ default:
+ if (job->Errors) {
+ termstat = _("Last Job had Warnings");
+ }
+ break;
+ }
+ }
Dmsg0(1000, "End bac_status jcr loop.\n");
- bstrncpy(buf, termstat, sizeof(buf));
+done:
+ bacstat = stat;
+ if (buf) {
+ bstrncpy(buf, termstat, buf_len);
+ }
return buf;
}
projects / bacula / bacula / blobdiff