X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_status.c;h=2b5a12216980d57a7707d337889c31c9221eee90;hb=0796a980f144632ab1faa901883e619ebd291d04;hp=a99280d286c11d0f1c3717dfc12684c78dedfcc5;hpb=cd81995314972c78e359e777cb70bfd4d927e5a0;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index a99280d286..2b5a122169 100644
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,6 +38,8 @@
 #include "bacula.h"
 #include "dird.h"
 
+extern void *start_heap;
+
 static void list_scheduled_jobs(UAContext *ua);
 static void list_running_jobs(UAContext *ua);
 static void list_terminated_jobs(UAContext *ua);
@@ -62,30 +64,38 @@ bool dot_status_cmd(UAContext *ua, const char *cmd)
    Dmsg1(20, "status:%s:\n", cmd);
 
    if ((ua->argc != 3) || (strcasecmp(ua->argk[1], "dir"))) {
-      bsendmsg(ua, "1900 Bad .status command, missing arguments.\n");
+      ua->send_msg("1900 Bad .status command, missing arguments.\n");
       return false;
    }
 
    if (strcasecmp(ua->argk[2], "current") == 0) {
-      bsendmsg(ua, OKqstatus, ua->argk[2]);
+      ua->send_msg(OKqstatus, ua->argk[2]);
       foreach_jcr(njcr) {
          if (njcr->JobId != 0 && acl_access_ok(ua, Job_ACL, njcr->job->name())) {
-            bsendmsg(ua, DotStatusJob, edit_int64(njcr->JobId, ed1), 
+            ua->send_msg(DotStatusJob, edit_int64(njcr->JobId, ed1), 
                      njcr->JobStatus, njcr->JobErrors);
          }
       }
       endeach_jcr(njcr);
    } else if (strcasecmp(ua->argk[2], "last") == 0) {
-      bsendmsg(ua, OKqstatus, ua->argk[2]);
+      ua->send_msg(OKqstatus, ua->argk[2]);
       if ((last_jobs) && (last_jobs->size() > 0)) {
          job = (s_last_job*)last_jobs->last();
          if (acl_access_ok(ua, Job_ACL, job->Job)) {
-            bsendmsg(ua, DotStatusJob, edit_int64(job->JobId, ed1), 
+            ua->send_msg(DotStatusJob, edit_int64(job->JobId, ed1), 
                   job->JobStatus, job->Errors);
          }
       }
+   } else if (strcasecmp(ua->argk[2], "header") == 0) {
+       list_dir_status_header(ua);
+   } else if (strcasecmp(ua->argk[2], "scheduled") == 0) {
+       list_scheduled_jobs(ua);
+   } else if (strcasecmp(ua->argk[2], "running") == 0) {
+       list_running_jobs(ua);
+   } else if (strcasecmp(ua->argk[2], "terminated") == 0) {
+       list_terminated_jobs(ua);
    } else {
-      bsendmsg(ua, "1900 Bad .status command, wrong argument.\n");
+      ua->send_msg("1900 Bad .status command, wrong argument.\n");
       return false;
    }
 
@@ -253,26 +263,32 @@ static void do_all_status(UAContext *ua)
 
 }
 
-static void do_director_status(UAContext *ua)
+void list_dir_status_header(UAContext *ua)
 {
    char dt[MAX_TIME_LENGTH];
-   char b1[35], b2[35], b3[35], b4[35];
+   char b1[35], b2[35], b3[35], b4[35], b5[35];
 
-   bsendmsg(ua, _("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
+   ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
             HOST_OS, DISTNAME, DISTVER);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    if (num_jobs_run == 1) {
-      bsendmsg(ua, _("Daemon started %s, 1 Job run since started.\n"), dt);
+      ua->send_msg(_("Daemon started %s, 1 Job run since started.\n"), dt);
    }
    else {
-      bsendmsg(ua, _("Daemon started %s, %d Jobs run since started.\n"),
+      ua->send_msg(_("Daemon started %s, %d Jobs run since started.\n"),
         dt, num_jobs_run);
    }
-   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));
+   ua->send_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),
+            edit_uint64_with_commas(sm_bytes, b2),
+            edit_uint64_with_commas(sm_max_bytes, b3),
+            edit_uint64_with_commas(sm_buffers, b4),
+            edit_uint64_with_commas(sm_max_buffers, b5));
+}
+
+static void do_director_status(UAContext *ua)
+{
+   list_dir_status_header(ua);
 
    /*
     * List scheduled Jobs
@@ -288,7 +304,7 @@ static void do_director_status(UAContext *ua)
     * List terminated jobs
     */
    list_terminated_jobs(ua);
-   bsendmsg(ua, _("====\n"));
+   ua->send_msg("====\n");
 }
 
 static void do_storage_status(UAContext *ua, STORE *store)
@@ -300,10 +316,10 @@ static void do_storage_status(UAContext *ua, STORE *store)
    pm_strcpy(lstore.store_source, _("unknown source"));
    set_wstorage(ua->jcr, &lstore);
    /* Try connecting for up to 15 seconds */
-   bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"),
+   ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"),
       store->name(), store->address, store->SDport);
    if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
-      bsendmsg(ua, _("\nFailed to connect to Storage daemon %s.\n====\n"),
+      ua->send_msg(_("\nFailed to connect to Storage daemon %s.\n====\n"),
          store->name());
       if (ua->jcr->store_bsock) {
          bnet_close(ua->jcr->store_bsock);
@@ -315,7 +331,7 @@ static void do_storage_status(UAContext *ua, STORE *store)
    sd = ua->jcr->store_bsock;
    bnet_fsend(sd, "status");
    while (bnet_recv(sd) >= 0) {
-      bsendmsg(ua, "%s", sd->msg);
+      ua->send_msg("%s", sd->msg);
    }
    bnet_sig(sd, BNET_TERMINATE);
    bnet_close(sd);
@@ -338,10 +354,10 @@ static void do_client_status(UAContext *ua, CLIENT *client)
    ua->jcr->sd_auth_key = bstrdup("dummy");
 
    /* Try to connect for 15 seconds */
-   bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
+   ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
       client->name(), client->address, client->FDport);
    if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
-      bsendmsg(ua, _("Failed to connect to Client %s.\n====\n"),
+      ua->send_msg(_("Failed to connect to Client %s.\n====\n"),
          client->name());
       if (ua->jcr->file_bsock) {
          bnet_close(ua->jcr->file_bsock);
@@ -351,12 +367,12 @@ static void do_client_status(UAContext *ua, CLIENT *client)
    }
    Dmsg0(20, _("Connected to file daemon\n"));
    fd = ua->jcr->file_bsock;
-   bnet_fsend(fd, "status");
-   while (bnet_recv(fd) >= 0) {
-      bsendmsg(ua, "%s", fd->msg);
+   fd->fsend("status");
+   while (fd->recv() >= 0) {
+      ua->send_msg("%s", fd->msg);
    }
-   bnet_sig(fd, BNET_TERMINATE);
-   bnet_close(fd);
+   fd->signal(BNET_TERMINATE);
+   fd->close();
    ua->jcr->file_bsock = NULL;
 
    return;
@@ -364,9 +380,11 @@ static void do_client_status(UAContext *ua, CLIENT *client)
 
 static void prt_runhdr(UAContext *ua)
 {
-   bsendmsg(ua, _("\nScheduled Jobs:\n"));
-   bsendmsg(ua, _("Level          Type     Pri  Scheduled          Name               Volume\n"));
-   bsendmsg(ua, _("===================================================================================\n"));
+   if (!ua->api) {
+      ua->send_msg(_("\nScheduled Jobs:\n"));
+      ua->send_msg(_("Level          Type     Pri  Scheduled          Name               Volume\n"));
+      ua->send_msg(_("===================================================================================\n"));
+   }
 }
 
 /* Scheduling packet */
@@ -418,9 +436,15 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp)
       level_ptr = level_to_str(sp->level);
       break;
    }
-   bsendmsg(ua, _("%-14s %-8s %3d  %-18s %-18s %s\n"),
-      level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
-      sp->job->name(), mr.VolumeName);
+   if (ua->api) {
+      ua->send_msg(_("%-14s\t%-8s\t%3d\t%-18s\t%-18s\t%s\n"),
+         level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
+         sp->job->name(), mr.VolumeName);
+   } else {
+      ua->send_msg(_("%-14s %-8s %3d  %-18s %-18s %s\n"),
+         level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
+         sp->job->name(), mr.VolumeName);
+   }
    if (close_db) {
       db_close_database(jcr, jcr->db);
    }
@@ -469,8 +493,8 @@ static void list_scheduled_jobs(UAContext *ua)
    i = find_arg_with_value(ua, NT_("days"));
    if (i >= 0) {
      days = atoi(ua->argv[i]);
-     if ((days < 0) || (days > 50)) {
-       bsendmsg(ua, _("Ignoring invalid value for days. Max is 50.\n"));
+     if ((days < 0) || (days > 500) && !ua->api) {
+       ua->send_msg(_("Ignoring invalid value for days. Max is 500.\n"));
        days = 1;
      }
    }
@@ -512,10 +536,10 @@ static void list_scheduled_jobs(UAContext *ua)
    foreach_dlist(sp, &sched) {
       prt_runtime(ua, sp);
    }
-   if (num_jobs == 0) {
-      bsendmsg(ua, _("No Scheduled Jobs.\n"));
+   if (num_jobs == 0 && !ua->api) {
+      ua->send_msg(_("No Scheduled Jobs.\n"));
    }
-   bsendmsg(ua, _("====\n"));
+   if (!ua->api) ua->send_msg("====\n");
    Dmsg0(200, "Leave list_sched_jobs_runs()\n");
 }
 
@@ -530,15 +554,15 @@ static void list_running_jobs(UAContext *ua)
    bool pool_mem = false;
 
    Dmsg0(200, "enter list_run_jobs()\n");
-   bsendmsg(ua, _("\nRunning Jobs:\n"));
+   if (!ua->api) ua->send_msg(_("\nRunning Jobs:\n"));
    foreach_jcr(jcr) {
       if (jcr->JobId == 0) {      /* this is us */
          /* this is a console or other control job. We only show console
           * jobs in the status output.
           */
-         if (jcr->JobType == JT_CONSOLE) {
+         if (jcr->JobType == JT_CONSOLE && !ua->api) {
             bstrftime_nc(dt, sizeof(dt), jcr->start_time);
-            bsendmsg(ua, _("Console connected at %s\n"), dt);
+            ua->send_msg(_("Console connected at %s\n"), dt);
          }
          continue;
       }       
@@ -548,13 +572,15 @@ static void list_running_jobs(UAContext *ua)
 
    if (njobs == 0) {
       /* Note the following message is used in regress -- don't change */
-      bsendmsg(ua, _("No Jobs running.\n====\n"));
+      if (!ua->api)  ua->send_msg(_("No Jobs running.\n====\n"));
       Dmsg0(200, "leave list_run_jobs()\n");
       return;
    }
    njobs = 0;
-   bsendmsg(ua, _(" JobId Level   Name                       Status\n"));
-   bsendmsg(ua, _("======================================================================\n"));
+   if (!ua->api) {
+      ua->send_msg(_(" JobId Level   Name                       Status\n"));
+      ua->send_msg(_("======================================================================\n"));
+   }
    foreach_jcr(jcr) {
       if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
          continue;
@@ -590,7 +616,11 @@ static void list_running_jobs(UAContext *ua)
          break;
       case JS_WaitFD:
          emsg = (char *) get_pool_memory(PM_FNAME);
-         Mmsg(emsg, _("is waiting on Client %s"), jcr->client->name());
+         if (!jcr->client) {
+            Mmsg(emsg, _("is waiting on Client"));
+         } else {
+            Mmsg(emsg, _("is waiting on Client %s"), jcr->client->name());
+         }
          pool_mem = true;
          msg = emsg;
          break;
@@ -598,8 +628,10 @@ static void list_running_jobs(UAContext *ua)
          emsg = (char *) get_pool_memory(PM_FNAME);
          if (jcr->wstore) {
             Mmsg(emsg, _("is waiting on Storage %s"), jcr->wstore->name());
-         } else {
+         } else if (jcr->rstore) {
             Mmsg(emsg, _("is waiting on Storage %s"), jcr->rstore->name());
+         } else {
+            Mmsg(emsg, _("is waiting on Storage"));
          }
          pool_mem = true;
          msg = emsg;
@@ -622,9 +654,21 @@ static void list_running_jobs(UAContext *ua)
       case JS_WaitPriority:
          msg = _("is waiting for higher priority jobs to finish");
          break;
+      case JS_DataCommitting:
+         msg = _("SD committing Data");
+         break;
+      case JS_DataDespooling:
+         msg = _("SD despooling Data");
+         break;
+      case JS_AttrDespooling:
+         msg = _("SD despooling Attributes");
+         break;
+      case JS_AttrInserting:
+         msg = _("Dir inserting Attributes");
+         break;
 
       default:
-         emsg = (char *) get_pool_memory(PM_FNAME);
+         emsg = (char *)get_pool_memory(PM_FNAME);
          Mmsg(emsg, _("is in unknown state %c"), jcr->JobStatus);
          pool_mem = true;
          msg = emsg;
@@ -653,9 +697,25 @@ static void list_running_jobs(UAContext *ua)
             emsg = (char *)get_pool_memory(PM_FNAME);
             pool_mem = true;
          }
-         Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
-              jcr->client->name(), jcr->wstore->name());
-         msg = emsg;
+         if (!jcr->client || !jcr->wstore) {
+            Mmsg(emsg, _("is waiting for Client to connect to Storage daemon"));
+         } else {
+            Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
+                 jcr->client->name(), jcr->wstore->name());
+        }
+        msg = emsg;
+        break;
+      case JS_DataCommitting:
+         msg = _("SD committing Data");
+         break;
+      case JS_DataDespooling:
+         msg = _("SD despooling Data");
+         break;
+      case JS_AttrDespooling:
+         msg = _("SD despooling Attributes");
+         break;
+      case JS_AttrInserting:
+         msg = _("Dir inserting Attributes");
          break;
       }
       switch (jcr->JobType) {
@@ -669,11 +729,13 @@ static void list_running_jobs(UAContext *ua)
          break;
       }
 
-      bsendmsg(ua, _("%6d %-6s  %-20s %s\n"),
-         jcr->JobId,
-         level,
-         jcr->Job,
-         msg);
+      if (ua->api) {
+         ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\n"),
+            jcr->JobId, level, jcr->Job, msg);
+      } else {
+         ua->send_msg(_("%6d %-6s  %-20s %s\n"),
+            jcr->JobId, level, jcr->Job, msg);
+      }
 
       if (pool_mem) {
          free_pool_memory(emsg);
@@ -681,7 +743,7 @@ static void list_running_jobs(UAContext *ua)
       }
    }
    endeach_jcr(jcr);
-   bsendmsg(ua, _("====\n"));
+   if (!ua->api) ua->send_msg("====\n");
    Dmsg0(200, "leave list_run_jobs()\n");
 }
 
@@ -691,14 +753,16 @@ static void list_terminated_jobs(UAContext *ua)
    char level[10];
 
    if (last_jobs->empty()) {
-      bsendmsg(ua, _("No Terminated Jobs.\n"));
+      if (!ua->api) ua->send_msg(_("No Terminated Jobs.\n"));
       return;
    }
    lock_last_jobs_list();
    struct s_last_job *je;
-   bsendmsg(ua, _("\nTerminated Jobs:\n"));
-   bsendmsg(ua, _(" JobId  Level    Files      Bytes   Status   Finished        Name \n"));
-   bsendmsg(ua, _("====================================================================\n"));
+   if (!ua->api) {
+      ua->send_msg(_("\nTerminated Jobs:\n"));
+      ua->send_msg(_(" JobId  Level    Files      Bytes   Status   Finished        Name \n"));
+      ua->send_msg(_("====================================================================\n"));
+   }
    foreach_dlist(je, last_jobs) {
       char JobName[MAX_NAME_LENGTH];
       const char *termstat;
@@ -748,14 +812,24 @@ static void list_terminated_jobs(UAContext *ua)
          termstat = _("Other");
          break;
       }
-      bsendmsg(ua, _("%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);
-   }
-   bsendmsg(ua, _("\n"));
+      if (ua->api) {
+         ua->send_msg(_("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
+            je->JobId,
+            level,
+            edit_uint64_with_commas(je->JobFiles, b1),
+            edit_uint64_with_suffix(je->JobBytes, b2),
+            termstat,
+            dt, JobName);
+      } else {
+         ua->send_msg(_("%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);
+      }
+   }
+   if (!ua->api) ua->send_msg(_("\n"));
    unlock_last_jobs_list();
 }