]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/status.c
kes Refactor FD and SD status commands to permit new API code in
[bacula/bacula] / bacula / src / stored / status.c
index 204fc88fe15b22475d88957908c2e8ea0822dda7..5a82b753aedd48cf83473cd16a99a4dea47e8f09 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "bacula.h"
 #include "stored.h"
+#include "lib/status.h"
 
 /* Exported variables */
 
@@ -53,55 +54,55 @@ static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 
 
 /* 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) {
@@ -111,11 +112,11 @@ void output_status(BSOCK *bs)
    }
 #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;
@@ -126,20 +127,20 @@ static void list_devices(BSOCK *bs)
    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);
          }
       }
    }
@@ -155,13 +156,13 @@ static void list_devices(BSOCK *bs)
                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) {
@@ -172,7 +173,7 @@ static void list_devices(BSOCK *bs)
                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) {
@@ -187,28 +188,28 @@ static void list_devices(BSOCK *bs)
                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];
@@ -217,14 +218,14 @@ static void list_status_header(BSOCK *bs)
 
    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),
@@ -232,31 +233,31 @@ static void list_status_header(BSOCK *bs)
          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:
       {
@@ -273,7 +274,7 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
                              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"
@@ -281,7 +282,7 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
                                     "       Media type:  %s\n"),
                              dcr->pool_name,
                              dcr->media_type);
-                  sendit(msg, len, bs);
+                  sendit(msg, len, sp);
                   found_jcr = true;
                }
             }
@@ -289,17 +290,17 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
 
          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;
@@ -309,18 +310,18 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
       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 ? "" : "!", 
@@ -335,10 +336,10 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
          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() ? "" : "!", 
@@ -353,27 +354,27 @@ static void send_blocked_status(DEVICE *dev, BSOCK *bs)
          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;
@@ -385,13 +386,13 @@ static void list_running_jobs(BSOCK *bs)
    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;
@@ -415,7 +416,7 @@ static void list_running_jobs(BSOCK *bs)
                    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"
@@ -428,10 +429,10 @@ static void list_running_jobs(BSOCK *bs)
                    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) {
@@ -442,7 +443,7 @@ static void list_running_jobs(BSOCK *bs)
             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) {
@@ -450,10 +451,10 @@ static void list_running_jobs(BSOCK *bs)
                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
       }
@@ -462,33 +463,33 @@ static void list_running_jobs(BSOCK *bs)
 
    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];
@@ -496,16 +497,16 @@ static void list_terminated_jobs(BSOCK *bs)
    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;
@@ -558,10 +559,10 @@ static void list_terminated_jobs(BSOCK *bs)
          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);
 }
 
 /*
@@ -614,23 +615,33 @@ static const char *level_to_str(int level)
 /*
  * 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);
+   }
 }
 
 
@@ -640,9 +651,11 @@ static void sendit(POOL_MEM &msg, int len, BSOCK *bs)
 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;
 }