Begin to move the code that updates the child status out of the MPMs and

into the main-line code.  This ensures that all MPMs can easily forget
about updating their status.

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

diff --git a/CHANGES b/CHANGES
index 6e6b9c2c643597a504a48326d7f495d7aff8b6aa..bd90971b998f5140c2dda23ca259ac9f088e33eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0b1
 
+  *) Begin to move the calls to update_child_status into common code, so
+     that each individual MPM does not need to update the scoreboard itself.
+     [Ryan Bloom]
+
   *) Allow mod_tls to compile under Unix boxes where openssl has been
      installed to the system include files.
      [Gomez Henri <new-httpd@slib.fr>]

diff --git a/server/connection.c b/server/connection.c
index 15c74584759f96dfe448208bfc0261307afabcc5..375be1dfddb93d7bf6e745315793ee59065fac33 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -269,6 +269,9 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server,
     conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));
     apr_status_t rv;
 
+    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(id), 
+                                  SERVER_BUSY_READ, (request_rec *) NULL);
+
     /* Got a connection structure, so initialize what fields we can
      * (the rest are zeroed out by pcalloc).
      */

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 3ac66849baa9749fa6ecd32f5715f54afff547a6..68a878a80303b8d69485b9ce3768cfe966606067 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -419,9 +419,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
 
     ap_sock_disable_nagle(sock);
 
-    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(conn_id),
-                                  SERVER_BUSY_READ, (request_rec *) NULL);
-
     current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
     if (current_conn) {
         ap_process_connection(current_conn);

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index a9420fff1b7a19c6c205d8aa234483429d330999..e017f28162366993d5d67e5103c5176991fc4fc4 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -414,9 +414,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
 
     ap_sock_disable_nagle(sock);
 
-    (void) ap_update_child_status(my_child_num, my_thread_num,  
-                                 SERVER_BUSY_READ, (request_rec *) NULL);
-
     current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
     if (current_conn) {
         ap_process_connection(current_conn);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2694dc33002ad74d999ee9a0a63f880c8cd7714a..9095fc5f8d98f49bd0a770e556e013eba403cda0 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -790,9 +790,6 @@ static void child_main(int child_num_arg)
 
        ap_sock_disable_nagle(csd);
 
-       (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(my_child_num), SERVER_BUSY_READ,
-                                  (request_rec *) NULL);
-
        current_conn = ap_new_connection(ptrans, ap_server_conf, csd, 
                                          my_child_num);
         if (current_conn) {

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 0119e0944615dae9ebb16c553a76d98aa1f1b1f6..156891f00f62dde5767e504face25db0376a5f2f 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -691,9 +691,6 @@ static void thread_main(void *thread_num_arg)
 
        ap_sock_disable_nagle(csd);
 
-       (void) ap_update_child_status(0, THREAD_GLOBAL(thread_num), SERVER_BUSY_READ,
-                                  (request_rec *) NULL);
-
        current_conn = ap_new_connection(ptrans, ap_server_conf, csd,
                                          THREAD_GLOBAL(thread_num));
 

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 22fe03651b02b831df90238b5fc6ee13b8afdd5b..952ee3e0cdd9fbaf0ed2f760a03d32c4a8a03819 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1162,9 +1162,6 @@ static void worker_main(int thread_num)
         sockinfo.type    = SOCK_STREAM;
         apr_os_sock_make(&context->sock, &sockinfo, context->ptrans);
 
-        ap_update_child_status(0, thread_num,  
-                               SERVER_BUSY_READ, (request_rec *) NULL);
-
         c = ap_new_connection(context->ptrans, server_conf, context->sock,
                               thread_num);