X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fstatus.c;h=aa515c9552c51c2393cd000f94ebb42f6db07089;hb=bbbc4771dfad256a2ad69cbf8b5914e9f99e2463;hp=ca53cd6d5221407c80de73ae2520fed35c641274;hpb=11d8835fc311a298ad8308ce2c59b8179318bcde;p=bacula%2Fbacula

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index ca53cd6d52..aa515c9552 100644
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 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
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,12 +15,12 @@
    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
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -30,20 +30,19 @@
  *
  *    Kern Sibbald, August MMI
  *
- *   Version $Id$
- *
  */
 
 #include "bacula.h"
 #include "filed.h"
+#include "lib/status.h"
 
 extern void *start_heap;
 
 /* Forward referenced functions */
-static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void  list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void  list_status_header(void sendit(const char *msg, int len, void *sarg), void *arg, bool api);
-static void bsock_sendit(const char *msg, int len, void *arg);
+static void  list_terminated_jobs(STATUS_PKT *sp);
+static void  list_running_jobs(STATUS_PKT *sp);
+static void  list_status_header(STATUS_PKT *sp);
+static void sendit(const char *msg, int len, STATUS_PKT *sp);
 static const char *level_to_str(int level);
 
 /* Static variables */
@@ -66,14 +65,14 @@ extern VSSClient *g_pVSSClient;
 /*
  * General status generator
  */
-void output_status(void sendit(const char *msg, int len, void *sarg), void *arg)
+void output_status(STATUS_PKT *sp)
 {
-   list_status_header(sendit, arg, false /*no api*/);
-   list_running_jobs(sendit, arg, false /*no api*/);
-   list_terminated_jobs(sendit, arg, false /*no api*/);
+   list_status_header(sp);
+   list_running_jobs(sp);
+   list_terminated_jobs(sp);
 }
 
-static void  list_status_header(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void  list_status_header(STATUS_PKT *sp)
 {
    POOL_MEM msg(PM_MESSAGE);
    char b1[32], b2[32], b3[32], b4[32], b5[35];
@@ -82,25 +81,25 @@ static void  list_status_header(void sendit(const char *msg, int len, void *sarg
 
    len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"), 
               my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
-   sendit(msg.c_str(), len, arg);
+   sendit(msg.c_str(), 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.c_str(), len, arg);
+   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
+        dt, num_jobs_run, job_count());
+   sendit(msg.c_str(), len, sp);
 #if defined(HAVE_WIN32)
    if (debug_level > 0) {
       if (!privs) {
          privs = enable_backup_privileges(NULL, 1);
       }
       len = Mmsg(msg, "VSS %s, Priv 0x%x\n", g_pVSSClient?"enabled":"disabled", privs);
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
                  p_OpenProcessToken?"":"!",
                  p_AdjustTokenPrivileges?"":"!",
                  p_LookupPrivilegeValue?"":"!",
                  p_CreateFileA?"":"!",
                  p_CreateFileW?"":"!");
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, " %sWUL,%sWMKD,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
                  p_wunlink?"":"!",
                  p_wmkdir?"":"!",
@@ -113,7 +112,7 @@ static void  list_status_header(void sendit(const char *msg, int len, void *sarg
                  p_BackupRead?"":"!",
                  p_BackupWrite?"":"!",
                  p_SetProcessShutdownParameters?"":"!");
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n",
                  p_WideCharToMultiByte?"":"!",
                  p_MultiByteToWideChar?"":"!",
@@ -123,13 +122,13 @@ static void  list_status_header(void sendit(const char *msg, int len, void *sarg
                  p_FindNextFileW?"":"!",
                  p_SetCurrentDirectoryA?"":"!",
                  p_SetCurrentDirectoryW?"":"!");
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW\n",  
                  p_GetCurrentDirectoryA?"":"!",
                  p_GetCurrentDirectoryW?"":"!",
                  p_GetVolumePathNameW?"":"!",
                  p_GetVolumeNameForVolumeMountPointW?"":"!");
-     sendit(msg.c_str(), len, arg);
+     sendit(msg.c_str(), len, sp);
    }
 #endif
    len = Mmsg(msg, _(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
@@ -138,13 +137,28 @@ static void  list_status_header(void sendit(const char *msg, int len, void *sarg
          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.c_str(), len, arg);
+   sendit(msg.c_str(), len, sp);
    len = Mmsg(msg, _(" Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d\n"),
          sizeof(boffset_t), sizeof(size_t), debug_level, get_trace());
-   sendit(msg.c_str(), len, arg);
+   sendit(msg.c_str(), len, sp);
+   if (debug_level > 0 && plugin_list->size() > 0) {
+      Plugin *plugin;
+      int len;
+      pm_strcpy(msg, "Plugin: ");
+      foreach_alist(plugin, plugin_list) {
+         len = pm_strcat(msg, plugin->file);
+         if (len > 80) {
+            pm_strcat(msg, "\n   ");
+         } else {
+            pm_strcat(msg, " ");
+         }
+      }
+      len = pm_strcat(msg, "\n");
+      sendit(msg.c_str(), len, sp);
+   }
 }
 
-static void  list_running_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void  list_running_jobs(STATUS_PKT *sp)
 {
    int sec, bps;
    POOL_MEM msg(PM_MESSAGE);
@@ -157,9 +171,9 @@ static void  list_running_jobs(void sendit(const char *msg, int len, void *sarg)
     * List running jobs
     */
    Dmsg0(1000, "Begin status jcr loop.\n");
-   if (!api) {
+   if (!sp->api) {
       len = Mmsg(msg, _("\nRunning Jobs:\n"));
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
    }
    const char *vss = "";
 #ifdef WIN32_VSS
@@ -174,11 +188,12 @@ static void  list_running_jobs(void sendit(const char *msg, int len, void *sarg)
       } else {
          len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
                     njcr->JobId, njcr->Job);
-         sendit(msg.c_str(), len, arg);
-         len = Mmsg(msg, _("    %s%s Job started: %s\n"),
-                    vss, job_type_to_str(njcr->JobType), dt);
+         sendit(msg.c_str(), len, sp);
+         len = Mmsg(msg, _("    %s%s %s Job started: %s\n"),
+                    vss, level_to_str(njcr->getJobLevel()), 
+                    job_type_to_str(njcr->getJobType()), dt);
       }
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       if (njcr->JobId == 0) {
          continue;
       }
@@ -192,61 +207,61 @@ static void  list_running_jobs(void sendit(const char *msg, int len, void *sarg)
            edit_uint64_with_commas(njcr->JobBytes, b2),
            edit_uint64_with_commas(bps, b3),
            njcr->JobErrors);
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, _("    Files Examined=%s\n"),
            edit_uint64_with_commas(njcr->num_files_examined, b1));
-      sendit(msg.c_str(), len, arg);
+      sendit(msg.c_str(), len, sp);
       if (njcr->JobFiles > 0) {
          njcr->lock();
          len = Mmsg(msg, _("    Processing file: %s\n"), njcr->last_fname);
          njcr->unlock();
-         sendit(msg.c_str(), len, arg);
+         sendit(msg.c_str(), len, sp);
       }
 
       found = true;
       if (njcr->store_bsock) {
          len = Mmsg(msg, "    SDReadSeqNo=%" lld " fd=%d\n",
              njcr->store_bsock->read_seqno, njcr->store_bsock->m_fd);
-         sendit(msg.c_str(), len, arg);
+         sendit(msg.c_str(), len, sp);
       } else {
          len = Mmsg(msg, _("    SDSocket closed.\n"));
-         sendit(msg.c_str(), len, arg);
+         sendit(msg.c_str(), len, sp);
       }
    }
    endeach_jcr(njcr);
 
-   if (!api) {
+   if (!sp->api) {
       if (!found) {
          len = Mmsg(msg, _("No Jobs running.\n"));
-         sendit(msg.c_str(), len, arg);
+         sendit(msg.c_str(), len, sp);
       }
-      sendit(_("====\n"), 5, arg);
+      sendit(_("====\n"), 5, sp);
    }
 }
   
 
-static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg, bool api)
+static void list_terminated_jobs(STATUS_PKT *sp)
 {
    char dt[MAX_TIME_LENGTH], b1[30], b2[30];
    char level[10];
    struct s_last_job *je;
    const char *msg;
 
-   if (!api) {
+   if (!sp->api) {
       msg =  _("\nTerminated Jobs:\n");
-      sendit(msg, strlen(msg), arg);
+      sendit(msg, strlen(msg), sp);
    }
 
    if (last_jobs->size() == 0) {
-      if (!api) sendit(_("====\n"), 5, arg);
+      if (!sp->api) sendit(_("====\n"), 5, sp);
       return;
    }
    lock_last_jobs_list();
-   if (!api) {
+   if (!sp->api) {
       msg =  _(" JobId  Level    Files      Bytes   Status   Finished        Name \n");
-      sendit(msg, strlen(msg), arg);
+      sendit(msg, strlen(msg), sp);
       msg = _("======================================================================\n");
-      sendit(msg, strlen(msg), arg);
+      sendit(msg, strlen(msg), sp);
    }
    foreach_dlist(je, last_jobs) {
       char JobName[MAX_NAME_LENGTH];
@@ -293,7 +308,7 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sar
             *p = 0;
          }
       }
-      if (api) {
+      if (sp->api) {
          bsnprintf(buf, sizeof(buf), _("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
             je->JobId,
             level,
@@ -310,9 +325,9 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sar
             termstat,
             dt, JobName);
       }
-      sendit(buf, strlen(buf), arg);
+      sendit(buf, strlen(buf), sp);
    }
-   if (!api) sendit(_("====\n"), 5, arg);
+   if (!sp->api) sendit(_("====\n"), 5, sp);
    unlock_last_jobs_list();
 }
 
@@ -320,14 +335,17 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sar
 /*
  * Send to bsock (Director or Console)
  */
-static void bsock_sendit(const char *msg, int len, void *arg)
+static void sendit(const char *msg, int len, STATUS_PKT *sp)          
 {
-   BSOCK *user = (BSOCK *)arg;
-
-   user->msg = check_pool_memory_size(user->msg, len+1);
-   memcpy(user->msg, msg, len+1);
-   user->msglen = len+1;
-   user->send();
+   if (sp->bs) {
+      BSOCK *user = sp->bs;
+      user->msg = check_pool_memory_size(user->msg, len+1);
+      memcpy(user->msg, msg, len+1);
+      user->msglen = len+1;
+      user->send();
+   } else {
+      sp->callback(msg, len, sp->context);
+   }
 }
 
 /*
@@ -336,9 +354,12 @@ static void bsock_sendit(const char *msg, int len, void *arg)
 int status_cmd(JCR *jcr)
 {
    BSOCK *user = jcr->dir_bsock;
+   STATUS_PKT sp;
 
    user->fsend("\n");
-   output_status(bsock_sendit, (void *)user);
+   sp.bs = user;
+   sp.api = false;                         /* no API output */
+   output_status(&sp);
 
    user->signal(BNET_EOD);
    return 1;
@@ -353,7 +374,9 @@ int qstatus_cmd(JCR *jcr)
    POOLMEM *cmd;
    JCR *njcr;
    s_last_job* job;
+   STATUS_PKT sp;
 
+   sp.bs = dir;
    cmd = get_memory(dir->msglen+1);
 
    if (sscanf(dir->msg, qstatus, cmd) != 1) {
@@ -381,21 +404,24 @@ int qstatus_cmd(JCR *jcr)
          dir->fsend(DotStatusJob, job->JobId, job->JobStatus, job->Errors);
       }
    } else if (strcasecmp(cmd, "header") == 0) {
-       list_status_header(bsock_sendit, (void *)dir, true/*api*/);
+       sp.api = true;
+       list_status_header(&sp);
    } else if (strcasecmp(cmd, "running") == 0) {
-       list_running_jobs(bsock_sendit, (void *)dir, true/*api*/);
+       sp.api = true;
+       list_running_jobs(&sp);
    } else if (strcasecmp(cmd, "terminated") == 0) {
-       list_terminated_jobs(bsock_sendit, (void *)dir, true/*api*/);
+       sp.api = true;
+       list_terminated_jobs(&sp);
    } else {
       pm_strcpy(&jcr->errmsg, dir->msg);
       Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
       dir->fsend(_("2900 Bad .status command, wrong argument.\n"));
-      bnet_sig(dir, BNET_EOD);
+      dir->signal(BNET_EOD);
       free_memory(cmd);
       return 0;
    }
 
-   bnet_sig(dir, BNET_EOD);
+   dir->signal(BNET_EOD);
    free_memory(cmd);
    return 1;
 }