X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_output.c;h=27ac0357724db8a02d1f72641842518a7dfb64ee;hb=fa1cad6e368a3c7d0a1ac4ad25176b7043b1310f;hp=b79001982e9d941adf14c83b8e4156f3263521f0;hpb=dd83d59687fe8779336a7238635daef7d739fbc9;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index b79001982e..27ac035772 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -36,7 +36,7 @@
 /* Imported variables */
 extern int r_first;
 extern int r_last;
-extern struct s_res resources[];
+extern RES_TABLE resources[];
 extern int console_msg_pending;
 extern FILE *con_fd;
 extern brwlock_t con_lock;
@@ -50,7 +50,7 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist);
 /*
  * Turn auto display of console messages on/off
  */
-int autodisplaycmd(UAContext *ua, char *cmd)
+int autodisplay_cmd(UAContext *ua, char *cmd)
 {
    static char *kw[] = {
       N_("on"), 
@@ -71,6 +71,31 @@ int autodisplaycmd(UAContext *ua, char *cmd)
    return 1; 
 }
 
+/*
+ * Turn gui processing on/off
+ */
+int gui_cmd(UAContext *ua, char *cmd)
+{
+   static char *kw[] = {
+      N_("on"), 
+      N_("off"),
+      NULL};
+
+   switch (find_arg_keyword(ua, kw)) {
+   case 0:
+      ua->jcr->gui = true;
+      break;
+   case 1:
+      ua->jcr->gui = false;
+      break;
+   default:
+      bsendmsg(ua, _("ON or OFF keyword missing.\n"));
+      break;
+   }
+   return 1; 
+}
+
+
 
 struct showstruct {char *res_name; int type;};
 static struct showstruct reses[] = {
@@ -82,7 +107,6 @@ static struct showstruct reses[] = {
    {N_("catalogs"),   R_CATALOG},
    {N_("schedules"),  R_SCHEDULE},
    {N_("filesets"),   R_FILESET},
-   {N_("groups"),     R_GROUP},
    {N_("pools"),      R_POOL},
    {N_("messages"),   R_MSGS},
    {N_("all"),        -1},
@@ -109,6 +133,7 @@ int show_cmd(UAContext *ua, char *cmd)
    Dmsg1(20, "show: %s\n", ua->UA_sock->msg);
 
 
+   LockRes();
    for (i=1; i<ua->argc; i++) {
       type = 0;
       res_name = ua->argk[i]; 
@@ -127,6 +152,7 @@ int show_cmd(UAContext *ua, char *cmd)
 	       break;
 	    }
 	 }
+
       } else {
 	 /* Dump a single resource with specified name */
 	 recurse = 0;
@@ -154,18 +180,20 @@ int show_cmd(UAContext *ua, char *cmd)
 	 for (j=0; reses[j].res_name; j++) {
             bsendmsg(ua, "%s\n", _(reses[j].res_name));
 	 }
-	 return 1;
+	 goto bail_out;
       case -3:
          bsendmsg(ua, _("%s resource %s not found.\n"), res_name, ua->argv[i]);
-	 return 1;
+	 goto bail_out;
       case 0:
          bsendmsg(ua, _("Resource %s not found\n"), res_name);
-	 return 1;
+	 goto bail_out;
       default:
 	 dump_resource(recurse?type:-type, res, bsendmsg, ua);
 	 break;
       }
    }
+bail_out:
+   UnlockRes();
    return 1;
 }
 
@@ -304,7 +332,7 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
       /* List MEDIA or VOLUMES */
       } else if (strcasecmp(ua->argk[i], _("media")) == 0 ||
                  strcasecmp(ua->argk[i], _("volumes")) == 0) {
-	 int done = FALSE;
+	 bool done = false;
 	 for (j=i+1; j<ua->argc; j++) {
             if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
 	       bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
@@ -320,7 +348,7 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
 	    n = db_get_job_volume_names(ua->jcr, ua->db, jobid, &VolumeName);
             bsendmsg(ua, _("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
 	    free_pool_memory(VolumeName);
-	    done = TRUE;
+	    done = true;
 	 }
 	 /* if no job or jobid keyword found, then we list all media */
 	 if (!done) {
@@ -372,6 +400,11 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
                  strcasecmp(ua->argk[i], _("nextvolume")) == 0) {
 	 JOB *job;
 	 JCR *jcr = ua->jcr;
+	 POOL *pool;
+	 RUN *run;
+	 time_t runtime;
+	 bool found = false;
+
          i = find_arg_with_value(ua, "job");
 	 if (i <= 0) {
 	    if ((job = select_job_resource(ua)) == NULL) {
@@ -386,21 +419,37 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
 	       }
 	    }
 	 }
-	 if (!complete_jcr_for_job(jcr, job, NULL)) {
-	    return 1;
-	 }
+	 for (run=NULL; (run = find_next_run(run, job, runtime)); ) {
+	    pool = run ? run->pool : NULL;
+	    if (!complete_jcr_for_job(jcr, job, pool)) {
+	       return 1;
+	    }
 	   
-	 if (!find_next_volume_for_append(jcr, &mr, 0)) {
-            bsendmsg(ua, "Could not find next Volume\n");
+	    if (!find_next_volume_for_append(jcr, &mr, 0)) {
+               bsendmsg(ua, _("Could not find next Volume.\n"));
+	       if (jcr->db) {
+		  db_close_database(jcr, jcr->db);
+		  jcr->db = NULL;
+	       }
+	       return 1;
+	    } else {
+               bsendmsg(ua, _("The next Volume to be used by Job \"%s\" will be %s\n"), 
+		  job->hdr.name, mr.VolumeName);
+	       found = true;
+	    }
+	    if (jcr->db) {
+	       db_close_database(jcr, jcr->db);
+	       jcr->db = NULL;
+	    }
+	 }
+	 if (jcr->db) {
 	    db_close_database(jcr, jcr->db);
 	    jcr->db = NULL;
-	    return 1;
-	 } else {
-            bsendmsg(ua, "The next Volume to be used by Job \"%s\" will be %s\n", 
-	       job->hdr.name, mr.VolumeName);
 	 }
-	 db_close_database(jcr, jcr->db);
-	 jcr->db = NULL;
+	 if (!found) {
+            bsendmsg(ua, _("Could not find next Volume.\n"));
+	 }
+	 return 1;
       } else {
          bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
       }
@@ -408,6 +457,102 @@ static int do_list_cmd(UAContext *ua, char *cmd, e_list_type llist)
    return 1;
 }
 
+/* 
+ * For a given job, we examine all his run records
+ *  to see if it is scheduled today or tomorrow.
+ */
+RUN *find_next_run(RUN *run, JOB *job, time_t &runtime)
+{
+   time_t now, tomorrow;
+   SCHED *sched;
+   struct tm tm;
+   int mday, wday, month, wom, tmday, twday, tmonth, twom, i, hour;
+   int woy, twoy;
+   int tod, tom;
+
+   sched = job->schedule;
+   if (sched == NULL) { 	   /* scheduled? */
+      return NULL;		   /* no nothing to report */
+   }
+   /* Break down current time into components */ 
+   now = time(NULL);
+   localtime_r(&now, &tm);
+   mday = tm.tm_mday - 1;
+   wday = tm.tm_wday;
+   month = tm.tm_mon;
+   wom = mday / 7;
+   woy = tm_woy(now);
+
+   /* Break down tomorrow into components */
+   tomorrow = now + 60 * 60 * 24;
+   localtime_r(&tomorrow, &tm);
+   tmday = tm.tm_mday - 1;
+   twday = tm.tm_wday;
+   tmonth = tm.tm_mon;
+   twom = tmday / 7;
+   twoy  = tm_woy(tomorrow);
+
+   if (run == NULL) {
+      run = sched->run;
+   } else {
+      run = run->next;
+   }
+   for ( ; run; run=run->next) {
+      /* 
+       * Find runs in next 24 hours
+       */
+      tod = (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) && 
+	     bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
+	     bit_is_set(woy, run->woy);
+
+      tom = (bit_is_set(tmday, run->mday) || bit_is_set(twday, run->wday)) &&
+	     bit_is_set(tmonth, run->month) && bit_is_set(twom, run->wom) &&
+	     bit_is_set(twoy, run->woy);
+
+//    Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
+//    Dmsg2(200, "wom=%d twom=%d\n", wom, twom);
+//    Dmsg1(200, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+      if (tod) {		   /* Jobs scheduled today (next 24 hours) */
+	 /* find time (time_t) job is to be run */
+	 localtime_r(&now, &tm);
+	 hour = 0;
+	 for (i=tm.tm_hour; i < 24; i++) {
+	    if (bit_is_set(i, run->hour)) {
+	       tm.tm_hour = i;
+	       tm.tm_min = run->minute;
+	       tm.tm_sec = 0;
+	       runtime = mktime(&tm);
+	       if (runtime > now) {
+                  Dmsg2(000, "Found it level=%d %c\n", run->level, run->level);
+		  return run;	      /* found it, return run resource */
+	       }
+	    }
+	 }
+      }
+
+//    Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
+      if (tom) {		/* look at jobs scheduled tomorrow */
+	 localtime_r(&tomorrow, &tm);
+	 hour = 0;
+	 for (i=0; i < 24; i++) {
+	    if (bit_is_set(i, run->hour)) {
+	       hour = i;
+	       break;
+	    }
+	 }
+	 tm.tm_hour = hour;
+	 tm.tm_min = run->minute;
+	 tm.tm_sec = 0;
+	 runtime = mktime(&tm);
+//       Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
+	 if (runtime < tomorrow) {
+	    return run; 	      /* found it, return run resource */
+	 }
+      }
+   } /* end for loop over runs */ 
+   /* Nothing found */
+   return NULL;
+}
 /* 
  * Fill in the remaining fields of the jcr as if it
  *  is going to run the job.
@@ -438,8 +583,10 @@ int complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool)
       if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
          Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, 
 	    db_strerror(jcr->db));
-	 db_close_database(jcr, jcr->db);
-	 jcr->db = NULL;
+	 if (jcr->db) {
+	    db_close_database(jcr, jcr->db);
+	    jcr->db = NULL;
+	 }
 	 return 0;
       } else {
          Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
@@ -538,11 +685,12 @@ again:
    len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
    va_end(arg_ptr);
    if (len < 0 || len >= maxlen) {
-      msg = realloc_pool_memory(msg, maxlen + 200);
+      msg = realloc_pool_memory(msg, maxlen + maxlen/2);
       goto again;
    }
 
    if (bs) {
+      bs->msg = msg;
       bs->msglen = len;
       bnet_send(bs);
    } else {			      /* No UA, send to Job */