X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fstatus.c;h=1e2916e6e62deb09e2aa5dbbca66d1b14b2f5d30;hb=70fe74e091b2426c2209110ada86566ee2f89c97;hp=06ffdf991d51c4996bdf71701ed55f239b484aac;hpb=7a8791d4fa5c0d6206a83d735f9636a27c59d652;p=bacula%2Fbacula

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 06ffdf991d..1e2916e6e6 100644
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -4,25 +4,20 @@
  *     Kern Sibbald, May MMIII
  *
  *   Version $Id$
- *  
+ *
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2003-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -35,272 +30,422 @@
 extern BSOCK *filed_chan;
 extern int r_first, r_last;
 extern struct s_res resources[];
-extern char my_name[];
-extern time_t daemon_start_time;
-extern int num_jobs_run;
-
 
 /* Static variables */
-static char qstatus[] = ".status %s\n";
+static char qstatus[] = ".status %127s\n";
 
 static char OKqstatus[]   = "3000 OK .status\n";
 static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 
 
 /* Forward referenced functions */
-static void send_blocked_status(JCR *jcr, DEVICE *dev);
-static void list_terminated_jobs(void *arg);
-static void list_running_jobs(BSOCK *user);
-static void sendit(const char *msg, int len, void *arg);
-static const char *level_to_str(int level);
+static void send_blocked_status(DEVICE *dev, void sendit(const char *msg, int len, void *sarg), void *arg);
+static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
+static void list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
+static void list_jobs_waiting_on_reservation(void sendit(const char *msg, int len, void *sarg), void *arg);
 
+static const char *level_to_str(int level);
 
 /*
  * Status command from Director
  */
-int status_cmd(JCR *jcr)
+void output_status(void sendit(const char *msg, int len, void *sarg), void *arg)
 {
    DEVRES *device;
+   AUTOCHANGER *changer;
    DEVICE *dev;
-   BSOCK *user = jcr->dir_bsock;
    char dt[MAX_TIME_LENGTH];
-   char b1[30], b2[30], b3[30];
+   char *msg, b1[35], b2[35], b3[35], b4[35];
    int bpb;
+   int len;
+
+   msg = (char *)get_pool_memory(PM_MESSAGE);
+
+   len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s\n"), 
+              my_name, VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
+   sendit(msg, len, arg);
 
-   bnet_fsend(user, "\n%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
-	      HOST_OS, DISTNAME, DISTVER);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
-   bnet_fsend(user, _("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];
-      bnet_fsend(user, _(" 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));
-   }
+
+
+   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, arg);
+
+   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);
 
    /*
     * List running jobs
     */
-   list_running_jobs(user);
+   list_running_jobs(sendit, arg);
+
+   /*
+    * List jobs stuck in reservation system
+    */
+   list_jobs_waiting_on_reservation(sendit, arg);
 
    /*
     * List terminated jobs
     */
-   list_terminated_jobs(user);
+   list_terminated_jobs(sendit, arg);
 
    /*
     * List devices
     */
-   bnet_fsend(user, _("\nDevice status:\n"));
-   LockRes();
-   foreach_res(device, R_DEVICE) {
-      for (dev=device->dev; dev; dev=dev->next) {
-	 if (dev_state(dev, ST_OPENED)) {
-	    if (dev_state(dev, ST_LABEL)) {
-               bnet_fsend(user, _("Device \"%s\" is mounted with Volume \"%s\"\n"), 
-		  dev_name(dev), dev->VolHdr.VolName);
-	    } else {
-               bnet_fsend(user, _("Device \"%s\" open but no Bacula volume is mounted.\n"), dev_name(dev));
-	    }
-	    send_blocked_status(jcr, dev);
-	    if (dev_state(dev, ST_APPEND)) {
-	       bpb = dev->VolCatInfo.VolCatBlocks;
-	       if (bpb <= 0) {
-		  bpb = 1;
-	       }
-	       bpb = dev->VolCatInfo.VolCatBytes / bpb;
-               bnet_fsend(user, _("    Total Bytes=%s Blocks=%s Bytes/block=%s\n"),
-		  edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1),
-		  edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2), 
-		  edit_uint64_with_commas(bpb, b3));
-	    } else {  /* reading */
-	       bpb = dev->VolCatInfo.VolCatReads;
-	       if (bpb <= 0) {
-		  bpb = 1;
-	       }
-	       if (dev->VolCatInfo.VolCatRBytes > 0) {
-		  bpb = dev->VolCatInfo.VolCatRBytes / bpb;
-	       } else {
-		  bpb = 0;
-	       }
-               bnet_fsend(user, _("    Total Bytes Read=%s Blocks Read=%s Bytes/block=%s\n"),
-		  edit_uint64_with_commas(dev->VolCatInfo.VolCatRBytes, b1),
-		  edit_uint64_with_commas(dev->VolCatInfo.VolCatReads, b2), 
-		  edit_uint64_with_commas(bpb, b3));
-	    }
-            bnet_fsend(user, _("    Positioned at File=%s Block=%s\n"), 
-	       edit_uint64_with_commas(dev->file, b1),
-	       edit_uint64_with_commas(dev->block_num, b2));
-
-	 } else {
-            bnet_fsend(user, _("Device \"%s\" is not open.\n"), dev_name(dev));
-	    send_blocked_status(jcr, dev);
-	 }
+   len = Mmsg(msg, _("\nDevice status:\n"));
+   sendit(msg, len, arg);
+
+   foreach_res(changer, R_AUTOCHANGER) {
+      len = Mmsg(msg, _("Autochanger \"%s\" with devices:\n"),
+         changer->hdr.name);
+      sendit(msg, len, arg);
+
+      foreach_alist(device, changer->device) {
+         if (device->dev) {
+            len = Mmsg(msg, "   %s\n", device->dev->print_name());
+            sendit(msg, len, arg);
+         } else {
+            len = Mmsg(msg, "   %s\n", device->hdr.name);
+            sendit(msg, len, arg);
+         }
       }
    }
-   UnlockRes();
-
+   foreach_res(device, R_DEVICE) {
+      dev = device->dev;
+      if (dev && dev->is_open()) {
+         if (dev->is_labeled()) {
+            len = Mmsg(msg, _("Device %s is mounted with Volume=\"%s\" Pool=\"%s\"\n"),
+               dev->print_name(), dev->VolHdr.VolumeName, 
+               dev->pool_name[0]?dev->pool_name:"*unknown*");
+            sendit(msg, len, arg);
+         } else {
+            len = Mmsg(msg, _("Device %s open but no Bacula volume is mounted.\n"), 
+               dev->print_name());
+            sendit(msg, len, arg);
+         }
+         send_blocked_status(dev, sendit, arg);
+         if (dev->can_append()) {
+            bpb = dev->VolCatInfo.VolCatBlocks;
+            if (bpb <= 0) {
+               bpb = 1;
+            }
+            bpb = dev->VolCatInfo.VolCatBytes / bpb;
+            len = Mmsg(msg, _("    Total Bytes=%s Blocks=%s Bytes/block=%s\n"),
+               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, arg);
+         } else {  /* reading */
+            bpb = dev->VolCatInfo.VolCatReads;
+            if (bpb <= 0) {
+               bpb = 1;
+            }
+            if (dev->VolCatInfo.VolCatRBytes > 0) {
+               bpb = dev->VolCatInfo.VolCatRBytes / bpb;
+            } else {
+               bpb = 0;
+            }
+            len = Mmsg(msg, _("    Total Bytes Read=%s Blocks Read=%s Bytes/block=%s\n"),
+               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, arg);
+         }
+         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, arg);
 
-#ifdef xfull_status
-   bnet_fsend(user, "\n\n");
-   dump_resource(R_DEVICE, resources[R_DEVICE-r_first].res_head, sendit, user);
+      } else {
+         if (dev) {
+            len = Mmsg(msg, _("Device %s is not open.\n"), dev->print_name());
+            sendit(msg, len, arg);
+            send_blocked_status(dev, sendit, arg);
+        } else {
+            len = Mmsg(msg, _("Device \"%s\" is not open or does not exist.\n"), device->hdr.name);
+            sendit(msg, len, arg);
+         }
+      }
+   }
+   sendit("====\n\n", 6, arg);
+   len = Mmsg(msg, _("In Use Volume status:\n"));
+   sendit(msg, len, arg);
+   list_volumes(sendit, arg);
+   sendit("====\n\n", 6, arg);
+
+#ifdef xxx
+   if (debug_level > 10) {
+      bnet_fsend(user, _("====\n\n"));
+      dump_resource(R_DEVICE, resources[R_DEVICE-r_first].res_head, sendit, user);
+      bnet_fsend(user, _("====\n\n"));
+   }
 #endif
-   bnet_fsend(user, "====\n\n");
 
-   list_spool_stats(user);
+   list_spool_stats(sendit, arg);
 
-   bnet_sig(user, BNET_EOD);
-   return 1;
+   free_pool_memory(msg);
 }
 
-static void send_blocked_status(JCR *jcr, DEVICE *dev) 
+static void send_blocked_status(DEVICE *dev, void sendit(const char *msg, int len, void *sarg), void *arg)
 {
-   BSOCK *user = jcr->dir_bsock;
+   char *msg;
+   int len;
+
+   msg = (char *)get_pool_memory(PM_MESSAGE);
 
+   if (!dev) {
+      len = Mmsg(msg, _("No DEVICE structure.\n\n"));
+      sendit(msg, len, arg);
+      free_pool_memory(msg);
+      return;
+   }
    switch (dev->dev_blocked) {
    case BST_UNMOUNTED:
-      bnet_fsend(user, _("    Device is BLOCKED. User unmounted.\n"));
+      len = Mmsg(msg, _("    Device is BLOCKED. User unmounted.\n"));
+      sendit(msg, len, arg);
       break;
    case BST_UNMOUNTED_WAITING_FOR_SYSOP:
-      bnet_fsend(user, _("    Device is BLOCKED. User unmounted during wait for media/mount.\n"));
+      len = Mmsg(msg, _("    Device is BLOCKED. User unmounted during wait for media/mount.\n"));
+      sendit(msg, len, arg);
       break;
    case BST_WAITING_FOR_SYSOP:
-      if (jcr->JobStatus == JS_WaitMount) {
-         bnet_fsend(user, _("    Device is BLOCKED waiting for mount of volume \"%s\".\n"),
-	    jcr->VolumeName);
-      } else {
-         bnet_fsend(user, _("    Device is BLOCKED waiting for appendable media.\n"));
+      {
+         dlist *dcrs = dev->attached_dcrs;
+         bool found_jcr = false;
+
+         if (dcrs != NULL) {
+            DCR *dcr;
+
+            for (dcr = (DCR *)dcrs->first(); dcr != NULL; dcr = (DCR *)dcrs->next(dcr)) {
+               if (dcr->jcr->JobStatus == JS_WaitMount) {
+                  len = Mmsg(msg, _("    Device is BLOCKED waiting for mount of volume \"%s\".\n"),
+                     dcr->VolumeName);
+                  sendit(msg, len, arg);
+                  found_jcr = true;
+               }
+            }
+         }
+
+         if (!found_jcr) {
+            len = Mmsg(msg, _("    Device is BLOCKED waiting for media.\n"));
+            sendit(msg, len, arg);
+         }
       }
       break;
    case BST_DOING_ACQUIRE:
-      bnet_fsend(user, _("    Device is being initialized.\n"));
+      len = Mmsg(msg, _("    Device is being initialized.\n"));
+      sendit(msg, len, arg);
       break;
    case BST_WRITING_LABEL:
-      bnet_fsend(user, _("    Device is blocked labeling a Volume.\n"));
+      len = Mmsg(msg, _("    Device is blocked labeling a Volume.\n"));
+      sendit(msg, len, arg);
       break;
    default:
       break;
    }
+   /* Send autochanger slot status */
+   if (dev->is_autochanger()) {
+      if (dev->Slot > 0) {
+         len = Mmsg(msg, _("    Slot %d is loaded in drive %d.\n"), 
+            dev->Slot, dev->drive_index);
+         sendit(msg, len, arg);
+      } else if (dev->Slot == 0) {
+         len = Mmsg(msg, _("    Drive %d is not loaded.\n"), dev->drive_index);
+         sendit(msg, len, arg);
+      } else {
+         len = Mmsg(msg, _("    Drive %d status unknown.\n"), dev->drive_index);
+         sendit(msg, len, arg);
+      }
+   }
    if (debug_level > 1) {
-      bnet_fsend(user, _("Configured device capabilities:\n"));
-      bnet_fsend(user, "%sEOF ", dev->capabilities & CAP_EOF ? "" : "!");
-      bnet_fsend(user, "%sBSR ", dev->capabilities & CAP_BSR ? "" : "!");
-      bnet_fsend(user, "%sBSF ", dev->capabilities & CAP_BSF ? "" : "!");
-      bnet_fsend(user, "%sFSR ", dev->capabilities & CAP_FSR ? "" : "!");
-      bnet_fsend(user, "%sFSF ", dev->capabilities & CAP_FSF ? "" : "!");
-      bnet_fsend(user, "%sEOM ", dev->capabilities & CAP_EOM ? "" : "!");
-      bnet_fsend(user, "%sREM ", dev->capabilities & CAP_REM ? "" : "!");
-      bnet_fsend(user, "%sRACCESS ", dev->capabilities & CAP_RACCESS ? "" : "!");
-      bnet_fsend(user, "%sAUTOMOUNT ", dev->capabilities & CAP_AUTOMOUNT ? "" : "!");
-      bnet_fsend(user, "%sLABEL ", dev->capabilities & CAP_LABEL ? "" : "!");
-      bnet_fsend(user, "%sANONVOLS ", dev->capabilities & CAP_ANONVOLS ? "" : "!");
-      bnet_fsend(user, "%sALWAYSOPEN ", dev->capabilities & CAP_ALWAYSOPEN ? "" : "!");
-      bnet_fsend(user, "\n");
-
-      bnet_fsend(user, _("Device status:\n"));
-      bnet_fsend(user, "%sOPENED ", dev->state & ST_OPENED ? "" : "!");
-      bnet_fsend(user, "%sTAPE ", dev->state & ST_TAPE ? "" : "!");
-      bnet_fsend(user, "%sLABEL ", dev->state & ST_LABEL ? "" : "!");
-      bnet_fsend(user, "%sMALLOC ", dev->state & ST_MALLOC ? "" : "!");
-      bnet_fsend(user, "%sAPPEND ", dev->state & ST_APPEND ? "" : "!");
-      bnet_fsend(user, "%sREAD ", dev->state & ST_READ ? "" : "!");
-      bnet_fsend(user, "%sEOT ", dev->state & ST_EOT ? "" : "!");
-      bnet_fsend(user, "%sWEOT ", dev->state & ST_WEOT ? "" : "!");
-      bnet_fsend(user, "%sEOF ", dev->state & ST_EOF ? "" : "!");
-      bnet_fsend(user, "%sNEXTVOL ", dev->state & ST_NEXTVOL ? "" : "!");
-      bnet_fsend(user, "%sSHORT ", dev->state & ST_SHORT ? "" : "!");
-      bnet_fsend(user, "\n");
-
-      bnet_fsend(user, _("Device parameters:\n"));
-      bnet_fsend(user, "Device name: %s\n", dev->dev_name);
-      bnet_fsend(user, "File=%u block=%u\n", dev->file, dev->block_num);
-      bnet_fsend(user, "Min block=%u Max block=%u\n", dev->min_block_size, dev->max_block_size);
+      len = Mmsg(msg, _("Configured device capabilities:\n"));
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, "%sEOF %sBSR %sBSF %sFSR %sFSF %sEOM %sREM %sRACCESS %sAUTOMOUNT %sLABEL %sANONVOLS %sALWAYSOPEN\n",
+         dev->capabilities & CAP_EOF ? "" : "!", 
+         dev->capabilities & CAP_BSR ? "" : "!", 
+         dev->capabilities & CAP_BSF ? "" : "!", 
+         dev->capabilities & CAP_FSR ? "" : "!", 
+         dev->capabilities & CAP_FSF ? "" : "!", 
+         dev->capabilities & CAP_EOM ? "" : "!", 
+         dev->capabilities & CAP_REM ? "" : "!", 
+         dev->capabilities & CAP_RACCESS ? "" : "!",
+         dev->capabilities & CAP_AUTOMOUNT ? "" : "!", 
+         dev->capabilities & CAP_LABEL ? "" : "!", 
+         dev->capabilities & CAP_ANONVOLS ? "" : "!", 
+         dev->capabilities & CAP_ALWAYSOPEN ? "" : "!");
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("Device state:\n"));
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, "%sOPENED %sTAPE %sLABEL %sMALLOC %sAPPEND %sREAD %sEOT %sWEOT %sEOF %sNEXTVOL %sSHORT %sMOUNTED\n", 
+         dev->is_open() ? "" : "!", 
+         dev->is_tape() ? "" : "!", 
+         dev->is_labeled() ? "" : "!", 
+         dev->state & ST_MALLOC ? "" : "!", 
+         dev->can_append() ? "" : "!", 
+         dev->can_read() ? "" : "!", 
+         dev->at_eot() ? "" : "!", 
+         dev->state & ST_WEOT ? "" : "!", 
+         dev->at_eof() ? "" : "!", 
+         dev->state & ST_NEXTVOL ? "" : "!", 
+         dev->state & ST_SHORT ? "" : "!", 
+         dev->state & ST_MOUNTED ? "" : "!");
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("num_writers=%d block=%d\n\n"), dev->num_writers, dev->dev_blocked);
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("Device parameters:\n"));
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
+         dev->name());
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("File=%u block=%u\n"), dev->file, dev->block_num);
+      sendit(msg, len, arg);
+
+      len = Mmsg(msg, _("Min block=%u Max block=%u\n"), dev->min_block_size, dev->max_block_size);
+      sendit(msg, len, arg);
    }
 
+   free_pool_memory(msg);
 }
 
-static void list_running_jobs(BSOCK *user)
+static void list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg)
 {
    bool found = false;
    int bps, sec;
    JCR *jcr;
+   DCR *dcr, *rdcr;
    char JobName[MAX_NAME_LENGTH];
-   char b1[30], b2[30], b3[30];
-   
-   bnet_fsend(user, _("\nRunning Jobs:\n"));
-   lock_jcr_chain();
+   char *msg, b1[30], b2[30], b3[30];
+   int len;
+
+   msg = (char *)get_pool_memory(PM_MESSAGE);
+
+   len = Mmsg(msg, _("\nRunning Jobs:\n"));
+   sendit(msg, len, arg);
+
    foreach_jcr(jcr) {
       if (jcr->JobStatus == JS_WaitFD) {
-         bnet_fsend(user, _("%s Job %s waiting for Client connection.\n"),
-	    job_type_to_str(jcr->JobType), jcr->Job);
+         len = Mmsg(msg, _("%s Job %s waiting for Client connection.\n"),
+            job_type_to_str(jcr->JobType), jcr->Job);
+         sendit(msg, len, arg);
       }
-      if (jcr->device) {
-	 bstrncpy(JobName, jcr->Job, sizeof(JobName));
-	 /* There are three periods after the Job name */
-	 char *p;
-	 for (int i=0; i<3; i++) {
+      dcr = jcr->dcr;
+      rdcr = jcr->read_dcr;
+      if ((dcr && dcr->device) || rdcr && rdcr->device) {
+         bstrncpy(JobName, jcr->Job, sizeof(JobName));
+         /* There are three periods after the Job name */
+         char *p;
+         for (int i=0; i<3; i++) {
             if ((p=strrchr(JobName, '.')) != NULL) {
-	       *p = 0;
-	    }
-	 }
-         bnet_fsend(user, _("%s %s job %s JobId=%d Volume=\"%s\" device=\"%s\"\n"), 
-		   job_level_to_str(jcr->JobLevel),
-		   job_type_to_str(jcr->JobType),
-		   JobName,
-		   jcr->JobId,
-		   jcr->VolumeName,
-		   jcr->device->device_name);
-	 sec = time(NULL) - jcr->run_time;
-	 if (sec <= 0) {
-	    sec = 1;
-	 }
-	 bps = jcr->JobBytes / sec;
-         bnet_fsend(user, _("    Files=%s Bytes=%s Bytes/sec=%s\n"), 
-	    edit_uint64_with_commas(jcr->JobFiles, b1),
-	    edit_uint64_with_commas(jcr->JobBytes, b2),
-	    edit_uint64_with_commas(bps, b3));
-	 found = true;
+               *p = 0;
+            }
+         }
+         if (rdcr && rdcr->device) {
+            len = Mmsg(msg, _("Reading: %s %s job %s JobId=%d Volume=\"%s\"\n"
+                            "    pool=\"%s\" device=\"%s\"\n"),
+                   job_level_to_str(jcr->JobLevel),
+                   job_type_to_str(jcr->JobType),
+                   JobName,
+                   jcr->JobId,
+                   rdcr->VolumeName,
+                   rdcr->pool_name,
+                   rdcr->dev?rdcr->dev->print_name(): 
+                            rdcr->device->device_name);
+            sendit(msg, len, arg);
+         }
+         if (dcr && dcr->device) {
+            len = Mmsg(msg, _("Writing: %s %s job %s JobId=%d Volume=\"%s\"\n"
+                            "    pool=\"%s\" device=\"%s\"\n"),
+                   job_level_to_str(jcr->JobLevel),
+                   job_type_to_str(jcr->JobType),
+                   JobName,
+                   jcr->JobId,
+                   dcr->VolumeName,
+                   dcr->pool_name,
+                   dcr->dev?dcr->dev->print_name(): 
+                            dcr->device->device_name);
+            sendit(msg, len, arg);
+         }
+         sec = time(NULL) - jcr->run_time;
+         if (sec <= 0) {
+            sec = 1;
+         }
+         bps = jcr->JobBytes / sec;
+         len = Mmsg(msg, _("    Files=%s Bytes=%s Bytes/sec=%s\n"),
+            edit_uint64_with_commas(jcr->JobFiles, b1),
+            edit_uint64_with_commas(jcr->JobBytes, b2),
+            edit_uint64_with_commas(bps, b3));
+         sendit(msg, len, arg);
+         found = true;
 #ifdef DEBUG
-	 if (jcr->file_bsock) {
-            bnet_fsend(user, "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n", 
-	       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->fd);
-	 } else {
-            bnet_fsend(user, "    FDSocket closed\n");
-	 }
+         if (jcr->file_bsock) {
+            len = Mmsg(msg, _("    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"),
+               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->fd);
+            sendit(msg, len, arg);
+         } else {
+            len = Mmsg(msg, _("    FDSocket closed\n"));
+            sendit(msg, len, arg);
+         }
 #endif
       }
-      free_locked_jcr(jcr);
    }
-   unlock_jcr_chain();
-   if (!found) {
-      bnet_fsend(user, _("No Jobs running.\n"));
+   endeach_jcr(jcr);
+
+   sendit("====\n", 5, arg);
+
+   free_pool_memory(msg);
+}
+
+static void list_jobs_waiting_on_reservation(void sendit(const char *msg, int len, void *sarg), void *arg)
+{ 
+   JCR *jcr;
+   char *msg;
+
+   msg = _("\nJobs waiting to reserve a drive:\n");
+   sendit(msg, strlen(msg), arg);
+
+   foreach_jcr(jcr) {
+      if (!jcr->reserve_msgs) {
+         continue;
+      }
+      send_drive_reserve_messages(jcr, sendit, arg);
    }
-   bnet_fsend(user, "====\n");
+   endeach_jcr(jcr);
+
+   sendit("====\n", 5, arg);
 }
 
-static void list_terminated_jobs(void *arg)
+
+static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg)
 {
    char dt[MAX_TIME_LENGTH], b1[30], b2[30];
    char level[10];
    struct s_last_job *je;
    const char *msg;
 
+   msg =  _("\nTerminated Jobs:\n");
+   sendit(msg, strlen(msg), arg);
    if (last_jobs->size() == 0) {
-      msg = _("No Terminated Jobs.\n"); 
-      sendit(msg, strlen(msg), arg);
+      sendit("====\n", 5, arg);
       return;
    }
    lock_last_jobs_list();
-   msg =  _("\nTerminated 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"); 
+   msg =  _("===================================================================\n");
    sendit(msg, strlen(msg), arg);
    foreach_dlist(je, last_jobs) {
       char JobName[MAX_NAME_LENGTH];
@@ -312,58 +457,58 @@ static void list_terminated_jobs(void *arg)
       case JT_ADMIN:
       case JT_RESTORE:
          bstrncpy(level, "    ", sizeof(level));
-	 break;
+         break;
       default:
-	 bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
-	 level[4] = 0;
-	 break;
+         bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
+         level[4] = 0;
+         break;
       }
       switch (je->JobStatus) {
       case JS_Created:
-         termstat = "Created";
-	 break;
+         termstat = _("Created");
+         break;
       case JS_FatalError:
       case JS_ErrorTerminated:
-         termstat = "Error";
-	 break;
+         termstat = _("Error");
+         break;
       case JS_Differences:
-         termstat = "Diffs";
-	 break;
+         termstat = _("Diffs");
+         break;
       case JS_Canceled:
-         termstat = "Cancel";
-	 break;
+         termstat = _("Cancel");
+         break;
       case JS_Terminated:
-         termstat = "OK";
-	 break;
+         termstat = _("OK");
+         break;
       default:
-         termstat = "Other";
-	 break;
+         termstat = _("Other");
+         break;
       }
       bstrncpy(JobName, je->Job, sizeof(JobName));
       /* There are three periods after the Job name */
       char *p;
       for (int i=0; i<3; i++) {
          if ((p=strrchr(JobName, '.')) != NULL) {
-	    *p = 0;
-	 }
+            *p = 0;
+         }
       }
-      bsnprintf(buf, sizeof(buf), _("%6d  %-6s %8s %14s %-7s  %-8s %s\n"), 
-	 je->JobId,
-	 level, 
-	 edit_uint64_with_commas(je->JobFiles, b1),
-	 edit_uint64_with_commas(je->JobBytes, b2), 
-	 termstat,
-	 dt, JobName);
+      bsnprintf(buf, sizeof(buf), _("%6d  %-6s %8s %10s  %-7s  %-8s %s\n"),
+         je->JobId,
+         level,
+         edit_uint64_with_commas(je->JobFiles, b1),
+         edit_uint64_with_suffix(je->JobBytes, b2),
+         termstat,
+         dt, JobName);
       sendit(buf, strlen(buf), arg);
    }
-   sendit("====\n", 5, arg);
    unlock_last_jobs_list();
+   sendit("====\n", 5, arg);
 }
 
 /*
  * Convert Job Level into a string
  */
-static const char *level_to_str(int level) 
+static const char *level_to_str(int level)
 {
    const char *str;
 
@@ -408,9 +553,9 @@ static const char *level_to_str(int level)
 }
 
 /*
- * Send to Director 
+ * Send to Director
  */
-static void sendit(const char *msg, int len, void *arg)
+static void bsock_sendit(const char *msg, int len, void *arg)
 {
    BSOCK *user = (BSOCK *)arg;
 
@@ -419,51 +564,115 @@ static void sendit(const char *msg, int len, void *arg)
    bnet_send(user);
 }
 
+/*
+ * Status command from Director
+ */
+bool status_cmd(JCR *jcr)
+{
+   BSOCK *user = jcr->dir_bsock;
+
+   bnet_fsend(user, "\n");
+   output_status(bsock_sendit, (void *)user);
+
+   bnet_sig(user, BNET_EOD);
+   return 1;
+}
+
 /*
  * .status command from Director
  */
-int qstatus_cmd(JCR *jcr)
+bool qstatus_cmd(JCR *jcr)
 {
    BSOCK *dir = jcr->dir_bsock;
-   char time[dir->msglen+1];
+   POOL_MEM time;
    JCR *njcr;
    s_last_job* job;
-      
-   if (sscanf(dir->msg, qstatus, time) != 1) {
-      pm_strcpy(&jcr->errmsg, dir->msg);
+
+   if (sscanf(dir->msg, qstatus, time.c_str()) != 1) {
+      pm_strcpy(jcr->errmsg, dir->msg);
       Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
-      bnet_fsend(dir, "3900 Bad .status command, missing argument.\n");
+      bnet_fsend(dir, _("3900 Bad .status command, missing argument.\n"));
       bnet_sig(dir, BNET_EOD);
-      return 0;
+      return false;
    }
    unbash_spaces(time);
-   
-   if (strcmp(time, "current") == 0) {
-      bnet_fsend(dir, OKqstatus, time);
-      lock_jcr_chain();
+
+   if (strcmp(time.c_str(), "current") == 0) {
+      bnet_fsend(dir, OKqstatus, time.c_str());
       foreach_jcr(njcr) {
          if (njcr->JobId != 0) {
             bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
          }
-         free_locked_jcr(njcr);
       }
-      unlock_jcr_chain();
-   }
-   else if (strcmp(time, "last") == 0) {
-      bnet_fsend(dir, OKqstatus, time);
+      endeach_jcr(njcr);
+   } else if (strcmp(time.c_str(), "last") == 0) {
+      bnet_fsend(dir, OKqstatus, time.c_str());
       if ((last_jobs) && (last_jobs->size() > 0)) {
          job = (s_last_job*)last_jobs->last();
          bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
       }
-   }
-   else {
-      pm_strcpy(&jcr->errmsg, dir->msg);
+   } else {
+      pm_strcpy(jcr->errmsg, dir->msg);
       Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
-      bnet_fsend(dir, "3900 Bad .status command, wrong argument.\n");
+      bnet_fsend(dir, _("3900 Bad .status command, wrong argument.\n"));
       bnet_sig(dir, BNET_EOD);
-      return 0;
+      return false;
    }
-   
    bnet_sig(dir, BNET_EOD);
-   return 1;
+   return true;
 }
+
+#if defined(HAVE_WIN32)
+int bacstat = 0;
+
+char *bac_status(char *buf, int buf_len)
+{
+   JCR *njcr;
+   const char *termstat = _("Bacula Storage: Idle");
+   struct s_last_job *job;
+   int stat = 0;                      /* Idle */
+
+   if (!last_jobs) {
+      goto done;
+   }
+   Dmsg0(1000, "Begin bac_status jcr loop.\n");
+   foreach_jcr(njcr) {
+      if (njcr->JobId != 0) {
+         stat = JS_Running;
+         termstat = _("Bacula Storage: Running");
+         break;
+      }
+   }
+   endeach_jcr(njcr);
+
+   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 = _("Bacula Storage: Last Job Canceled");
+         break;
+      case JS_ErrorTerminated:
+      case JS_FatalError:
+         termstat = _("Bacula Storage: Last Job Failed");
+         break;
+      default:
+         if (job->Errors) {
+            termstat = _("Bacula Storage: Last Job had Warnings");
+         }
+         break;
+      }
+   }
+   Dmsg0(1000, "End bac_status jcr loop.\n");
+done:
+   bacstat = stat;
+   if (buf) {
+      bstrncpy(buf, termstat, buf_len);
+   }
+   return buf;
+}
+
+#endif /* HAVE_WIN32 */