*/
/*
- 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
static void list_terminated_jobs(UAContext *ua);
static void do_storage_status(UAContext *ua, STORE *store);
static void do_client_status(UAContext *ua, CLIENT *client);
-static void do_director_status(UAContext *ua, char *cmd);
-static void do_all_status(UAContext *ua, char *cmd);
+static void do_director_status(UAContext *ua);
+static void do_all_status(UAContext *ua);
/*
* status command
*/
-int status_cmd(UAContext *ua, char *cmd)
+int status_cmd(UAContext *ua, const char *cmd)
{
STORE *store;
CLIENT *client;
for (i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], _("all")) == 0) {
- do_all_status(ua, cmd);
+ do_all_status(ua);
return 1;
} else if (strcasecmp(ua->argk[i], _("dir")) == 0 ||
strcasecmp(ua->argk[i], _("director")) == 0) {
- do_director_status(ua, cmd);
+ do_director_status(ua);
return 1;
} else if (strcasecmp(ua->argk[i], _("client")) == 0) {
client = get_client_resource(ua);
}
/* If no args, ask for status type */
if (ua->argc == 1) {
+ char prmt[MAX_NAME_LENGTH];
+
start_prompt(ua, _("Status available for:\n"));
add_prompt(ua, _("Director"));
add_prompt(ua, _("Storage"));
add_prompt(ua, _("Client"));
add_prompt(ua, _("All"));
Dmsg0(20, "do_prompt: select daemon\n");
- if ((item=do_prompt(ua, "", _("Select daemon type for status"), cmd, MAX_NAME_LENGTH)) < 0) {
+ if ((item=do_prompt(ua, "", _("Select daemon type for status"), prmt, sizeof(prmt))) < 0) {
return 1;
}
Dmsg1(20, "item=%d\n", item);
switch (item) {
case 0: /* Director */
- do_director_status(ua, cmd);
+ do_director_status(ua);
break;
case 1:
store = select_storage_resource(ua);
}
break;
case 3:
- do_all_status(ua, cmd);
+ do_all_status(ua);
break;
default:
break;
return 1;
}
-static void do_all_status(UAContext *ua, char *cmd)
+static void do_all_status(UAContext *ua)
{
STORE *store, **unique_store;
CLIENT *client, **unique_client;
int i, j;
bool found;
- do_director_status(ua, cmd);
+ do_director_status(ua);
/* Count Storage items */
LockRes();
}
-static void do_director_status(UAContext *ua, char *cmd)
+static void do_director_status(UAContext *ua)
{
char dt[MAX_TIME_LENGTH];
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
bsendmsg(ua, _("Daemon started %s, %d Job%s run since started.\n"),
dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
+ if (debug_level > 0) {
+ char b1[35], b2[35], b3[35], b4[35];
+ bsendmsg(ua, _(" 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));
+ }
/*
* List scheduled Jobs
*/
static void prt_runhdr(UAContext *ua)
{
bsendmsg(ua, _("\nScheduled Jobs:\n"));
- bsendmsg(ua, _("Level Type Scheduled Name Volume\n"));
- bsendmsg(ua, _("===============================================================================\n"));
+ bsendmsg(ua, _("Level Type Pri Scheduled Name Volume\n"));
+ bsendmsg(ua, _("===================================================================================\n"));
}
-static void prt_runtime(UAContext *ua, JOB *job, int level, time_t runtime, POOL *pool)
+/* Scheduling packet */
+struct sched_pkt {
+ dlink link; /* keep this as first item!!! */
+ JOB *job;
+ int level;
+ int priority;
+ time_t runtime;
+ POOL *pool;
+};
+
+static void prt_runtime(UAContext *ua, sched_pkt *sp)
{
char dt[MAX_TIME_LENGTH];
- char *level_ptr;
+ const char *level_ptr;
bool ok = false;
bool close_db = false;
JCR *jcr = ua->jcr;
MEDIA_DBR mr;
memset(&mr, 0, sizeof(mr));
- if (job->JobType == JT_BACKUP) {
+ if (sp->job->JobType == JT_BACKUP) {
jcr->db = NULL;
- ok = complete_jcr_for_job(jcr, job, pool);
+ ok = complete_jcr_for_job(jcr, sp->job, sp->pool);
if (jcr->db) {
close_db = true; /* new db opened, remember to close it */
}
bstrncpy(mr.VolumeName, "*unknown*", sizeof(mr.VolumeName));
}
}
- bstrftime_nc(dt, sizeof(dt), runtime);
- switch (job->JobType) {
+ bstrftime_nc(dt, sizeof(dt), sp->runtime);
+ switch (sp->job->JobType) {
case JT_ADMIN:
case JT_RESTORE:
level_ptr = " ";
break;
default:
- level_ptr = level_to_str(level);
+ level_ptr = level_to_str(sp->level);
break;
}
- bsendmsg(ua, _("%-14s %-8s %-18s %-18s %s\n"),
- level_ptr, job_type_to_str(job->JobType), dt, job->hdr.name, mr.VolumeName);
+ bsendmsg(ua, _("%-14s %-8s %3d %-18s %-18s %s\n"),
+ level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
+ sp->job->hdr.name, mr.VolumeName);
if (close_db) {
db_close_database(jcr, jcr->db);
}
}
+/*
+ * Sort items by runtime, priority
+ */
+static int my_compare(void *item1, void *item2)
+{
+ sched_pkt *p1 = (sched_pkt *)item1;
+ sched_pkt *p2 = (sched_pkt *)item2;
+ if (p1->runtime < p2->runtime) {
+ return -1;
+ } else if (p1->runtime > p2->runtime) {
+ return 1;
+ }
+ if (p1->priority < p2->priority) {
+ return -1;
+ } else if (p1->priority > p2->priority) {
+ return 1;
+ }
+ return 0;
+}
+
/*
* Find all jobs to be run in roughly the
* next 24 hours.
RUN *run;
JOB *job;
int level, num_jobs = 0;
+ int priority;
bool hdr_printed = false;
+ dlist sched;
+ sched_pkt *sp;
Dmsg0(200, "enter list_sched_jobs()\n");
if (run->level) {
level = run->level;
}
+ priority = job->Priority;
+ if (run->Priority) {
+ priority = run->Priority;
+ }
if (!hdr_printed) {
prt_runhdr(ua);
hdr_printed = true;
}
- prt_runtime(ua, job, level, runtime, run->pool);
+ sp = (sched_pkt *)malloc(sizeof(sched_pkt));
+ sp->job = job;
+ sp->level = level;
+ sp->priority = priority;
+ sp->runtime = runtime;
+ sp->pool = run->pool;
+ sched.binary_insert(sp, my_compare);
num_jobs++;
}
-
} /* end for loop over resources */
UnlockRes();
+ foreach_dlist(sp, &sched) {
+ prt_runtime(ua, sp);
+ }
if (num_jobs == 0) {
bsendmsg(ua, _("No Scheduled Jobs.\n"));
- } else {
- bsendmsg(ua, "\n");
- }
+ }
+ bsendmsg(ua, "====\n");
Dmsg0(200, "Leave list_sched_jobs_runs()\n");
}
{
JCR *jcr;
int njobs = 0;
- char *msg;
+ const char *msg;
+ char *emsg; /* edited message */
char dt[MAX_TIME_LENGTH];
char level[10];
bool pool_mem = false;
Dmsg0(200, "enter list_run_jobs()\n");
+ bsendmsg(ua, _("\nRunning Jobs:\n"));
lock_jcr_chain();
foreach_jcr(jcr) {
njobs++;
}
if (njobs == 0) {
unlock_jcr_chain();
- bsendmsg(ua, _("No Running Jobs.\n"));
+ /* Note the following message is used in regress -- don't change */
+ bsendmsg(ua, _("No Jobs running.\n====\n"));
Dmsg0(200, "leave list_run_jobs()\n");
return;
}
njobs = 0;
- bsendmsg(ua, _("\nRunning Jobs:\n"));
bsendmsg(ua, _(" JobId Level Name Status\n"));
bsendmsg(ua, _("======================================================================\n"));
foreach_jcr(jcr) {
msg = _("has been canceled");
break;
case JS_WaitFD:
- msg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(&msg, _("is waiting on Client %s"), jcr->client->hdr.name);
+ emsg = (char *) get_pool_memory(PM_FNAME);
+ Mmsg(emsg, _("is waiting on Client %s"), jcr->client->hdr.name);
pool_mem = true;
+ msg = emsg;
break;
case JS_WaitSD:
- msg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(&msg, _("is waiting on Storage %s"), jcr->store->hdr.name);
+ emsg = (char *) get_pool_memory(PM_FNAME);
+ Mmsg(emsg, _("is waiting on Storage %s"), jcr->store->hdr.name);
pool_mem = true;
+ msg = emsg;
break;
case JS_WaitStoreRes:
msg = _("is waiting on max Storage jobs");
break;
default:
- msg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(&msg, _("is in unknown state %c"), jcr->JobStatus);
+ emsg = (char *) get_pool_memory(PM_FNAME);
+ Mmsg(emsg, _("is in unknown state %c"), jcr->JobStatus);
pool_mem = true;
+ msg = emsg;
break;
}
/*
switch (jcr->SDJobStatus) {
case JS_WaitMount:
if (pool_mem) {
- free_pool_memory(msg);
+ free_pool_memory(emsg);
pool_mem = false;
}
msg = _("is waiting for a mount request");
break;
case JS_WaitMedia:
if (pool_mem) {
- free_pool_memory(msg);
+ free_pool_memory(emsg);
pool_mem = false;
}
msg = _("is waiting for an appendable Volume");
break;
case JS_WaitFD:
if (!pool_mem) {
- msg = (char *) get_pool_memory(PM_FNAME);
+ emsg = (char *) get_pool_memory(PM_FNAME);
pool_mem = true;
}
- Mmsg(&msg, _("is waiting for Client %s to connect to Storage %s"),
+ Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
jcr->client->hdr.name, jcr->store->hdr.name);
+ msg = emsg;
break;
}
switch (jcr->JobType) {
msg);
if (pool_mem) {
- free_pool_memory(msg);
+ free_pool_memory(emsg);
pool_mem = false;
}
free_locked_jcr(jcr);
}
unlock_jcr_chain();
- bsendmsg(ua, "\n");
+ bsendmsg(ua, "====\n");
Dmsg0(200, "leave list_run_jobs()\n");
}
bsendmsg(ua, _("========================================================================\n"));
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
- char *termstat;
+ const char *termstat;
bstrftime_nc(dt, sizeof(dt), je->end_time);
switch (je->JobType) {
projects / bacula / bacula / blobdiff