mod_status: Complete the data shown for async

MPMs in "auto" mode.  Added number of processes,
number of stopping processes and number
of busy and idle workers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1837589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c7e8a37b6f31a54aada4e3a1e29f811da7a8f0fa..4946e859e73ea7dbaa647c88df0cc744d7db79a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_status: Complete the data shown for async MPMs in "auto" mode.
+     Added number of processes, number of stopping processes and number
+     of busy and idle workers.  [Rainer Jung]
+
   *) mod_proxy: Improve the balancer member data shown in mod_status when
      "ProxyStatus" is "On": add "busy" count and show byte counts in auto
      mode always in units of kilobytes.  [Rainer Jung]

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 3b89350321ab9528c4575c80ef4f9f23b90e1658..490e9e8615b305d03d779f44e8770c001c6640ea 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -557,16 +557,18 @@ static int status_handler(request_rec *r)
                 lingering_close  += ps_record->lingering_close;
                 busy_workers     += thread_busy_buffer[i];
                 idle_workers     += thread_idle_buffer[i];
+                procs++;
+                if (ps_record->quiescing) {
+                    stopping++;
+                }
                 if (!short_report) {
                     const char *dying = "no";
                     const char *old = "";
                     if (ps_record->quiescing) {
                         dying = "yes";
-                        stopping++;
                     }
                     if (ps_record->generation != mpm_generation)
                         old = " (old gen)";
-                    procs++;
                     ap_rprintf(r, "<tr><td>%u</td><td>%" APR_PID_T_FMT "</td>"
                                       "<td>%s%s</td>"
                                       "<td>%u</td><td>%s</td>"
@@ -598,12 +600,18 @@ static int status_handler(request_rec *r)
                           write_completion, keep_alive, lingering_close);
         }
         else {
-            ap_rprintf(r, "ConnsTotal: %d\n"
+            ap_rprintf(r, "Processes: %d\n"
+                          "Stopping: %d\n"
+                          "BusyWorkers: %d\n"
+                          "IdleWorkers: %d\n"
+                          "ConnsTotal: %d\n"
                           "ConnsAsyncWriting: %d\n"
                           "ConnsAsyncKeepAlive: %d\n"
                           "ConnsAsyncClosing: %d\n",
-                       connections, write_completion, keep_alive,
-                       lingering_close);
+                          procs, stopping,
+                          busy_workers, idle_workers,
+                          connections,
+                          write_completion, keep_alive, lingering_close);
         }
     }