From: Stefan Fritsch <sf@apache.org>
Date: Mon, 11 Apr 2016 19:25:27 +0000 (+0000)
Subject: Display process slot number in the async overview
X-Git-Tag: 2.5.0-alpha~1760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6dd382dbbced6f7a16f8fd40014263061b7c6c5;p=apache

Display process slot number in the async overview


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

diff --git a/CHANGES b/CHANGES
index 9d4232fb38..012b07b159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_status: Display the process slot number in the async connection
+     overview. [Stefan Fritsch]
+
   *) mod_include: add the <!--#comment ...> syntax in order to include comments
      in a SSI file. [Christophe Jaillet based on a suggestion from Rob]
 
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 4ff9df1988..675c04a4f0 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -537,7 +537,8 @@ static int status_handler(request_rec *r)
         int busy_workers = 0, idle_workers = 0;
         if (!short_report)
             ap_rputs("\n\n<table rules=\"all\" cellpadding=\"1%\">\n"
-                     "<tr><th rowspan=\"2\">PID</th>"
+                     "<tr><th rowspan=\"2\">Slot</th>"
+		         "<th rowspan=\"2\">PID</th>"
                          "<th colspan=\"2\">Connections</th>\n"
                          "<th colspan=\"2\">Threads</th>"
                          "<th colspan=\"4\">Async connections</th></tr>\n"
@@ -554,11 +555,12 @@ static int status_handler(request_rec *r)
                 busy_workers     += thread_busy_buffer[i];
                 idle_workers     += thread_idle_buffer[i];
                 if (!short_report)
-                    ap_rprintf(r, "<tr><td>%" APR_PID_T_FMT "</td><td>%u</td>"
-                                      "<td>%s</td><td>%u</td><td>%u</td>"
+                    ap_rprintf(r, "<tr><td>%u</td><td>%" APR_PID_T_FMT "</td>"
+                                      "<td>%u</td><td>%s</td><td>%u</td>"
                                       "<td>%u</td><td>%u</td><td>%u</td>"
+                                      "<td>%u</td>"
                                       "</tr>\n",
-                               ps_record->pid, ps_record->connections,
+                               i, ps_record->pid, ps_record->connections,
                                ps_record->not_accepting ? "no" : "yes",
                                thread_busy_buffer[i], thread_idle_buffer[i],
                                ps_record->write_completion,