Move OS/2 MPM specific variables out of scoreboard & into an array local to

the MPM.

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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index dcbdb8234fa999654923abe3c1eb95a75ccbb95d..94daa238c9177f13989840a2a6c1df02e77930eb 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -172,11 +172,6 @@ typedef struct {
 #endif
 #ifndef OPTIMIZE_TIMEOUTS
     time_t last_used;
-#endif
-#ifdef SPMT_OS2_MPM
-    apr_wait_t thread_retval;
-    char deferred_die;
-    ap_generation_t generation;        /* generation of this thread */
 #endif
     char client[32];           /* Keep 'em small... */
     char request[64];          /* We just want an idea... */

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 184f92f2953450d3fbc7aa3f9aa5053870afa0f9..5f0d5e65e5acfae9255f1845ccd2e5e91dfabbe9 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -132,6 +132,11 @@ static struct thread_globals **ppthread_globals = NULL;
 
 #define THREAD_GLOBAL(gvar) ((*ppthread_globals)->gvar)
 
+struct thread_control_t {
+    apr_wait_t thread_retval;
+    char deferred_die;
+    ap_generation_t generation;        /* generation of this thread */
+} thread_control[HARD_THREAD_LIMIT];
 
 /* a clean exit from a child with proper cleanup */
 static void clean_child_exit(int code)
@@ -140,7 +145,8 @@ static void clean_child_exit(int code)
         apr_destroy_pool(THREAD_GLOBAL(pchild));
     }
 
-    ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].thread_retval = code;
+    thread_control[THREAD_GLOBAL(thread_num)].deferred_die = 0;
+    thread_control[THREAD_GLOBAL(thread_num)].thread_retval = code;
     _endthread();
 }
 
@@ -257,7 +263,7 @@ static int wait_or_timeout(apr_wait_t *status)
     if (ret == 0) {
         int thread_num = find_thread_by_tid(tid);
         ap_assert( thread_num > 0 );
-        *status = ap_scoreboard_image->servers[0][thread_num].thread_retval;
+        *status = thread_control[thread_num].thread_retval;
        return tid;
     }
     
@@ -428,7 +434,7 @@ static void usr1_handler(int sig)
     if (THREAD_GLOBAL(usr1_just_die)) {
        just_die(sig);
     }
-    ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].deferred_die = 1;
+    thread_control[THREAD_GLOBAL(thread_num)].deferred_die = 1;
 }
 
 /* volatile just in case */
@@ -568,15 +574,15 @@ static void set_signals(void)
 AP_DECLARE(void) ap_child_terminate(request_rec *r)
 {
     r->connection->keepalive = 0;
-    ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].deferred_die = 1;
+    thread_control[THREAD_GLOBAL(thread_num)].deferred_die = 1;
 }
 
 
 
 int ap_graceful_stop_signalled(void)
 {
-    if (ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].deferred_die ||
-       ap_scoreboard_image->global.running_generation != ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].generation) {
+    if (thread_control[THREAD_GLOBAL(thread_num)].deferred_die ||
+       ap_scoreboard_image->global.running_generation != thread_control[THREAD_GLOBAL(thread_num)].generation) {
        return 1;
     }
     return 0;
@@ -587,8 +593,8 @@ int ap_graceful_stop_signalled(void)
 int ap_stop_signalled(void)
 {
     if (shutdown_pending || restart_pending ||
-        ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].deferred_die ||
-       ap_scoreboard_image->global.running_generation != ap_scoreboard_image->servers[0][THREAD_GLOBAL(thread_num)].generation) {
+        thread_control[THREAD_GLOBAL(thread_num)].deferred_die ||
+       ap_scoreboard_image->global.running_generation != thread_control[THREAD_GLOBAL(thread_num)].generation) {
        return 1;
     }
     return 0;
@@ -872,6 +878,7 @@ static int make_child(server_rec *s, int slot)
     }
 
     ap_scoreboard_image->servers[0][slot].tid = tid;
+    thread_control[THREAD_GLOBAL(thread_num)].generation = ap_scoreboard_image->global.running_generation;
     return 0;
 }
 
@@ -966,7 +973,7 @@ static void perform_idle_server_maintenance(void)
         * shut down gracefully, in case it happened to pick up a request
         * while we were counting
         */
-       ap_scoreboard_image->servers[0][to_kill].deferred_die = 1;
+       thread_control[to_kill].deferred_die = 1;
        idle_spawn_rate = 1;
     }
     else if (idle_count < ap_daemons_min_free) {
@@ -1035,7 +1042,8 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     SAFE_ACCEPT(accept_mutex_init(pconf));
 
     if (!is_graceful) {
-       ap_create_scoreboard(pconf, SB_NOT_SHARED);
+        ap_create_scoreboard(pconf, SB_NOT_SHARED);
+        memset(thread_control, 0, sizeof(thread_control));
     }
 
     set_signals();
@@ -1218,7 +1226,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 
         /* kill off the idle ones */
         for (i = 0; i < ap_daemons_limit; ++i) {
-            ap_scoreboard_image->servers[0][i].deferred_die = 1;
+            thread_control[i].deferred_die = 1;
         }
 
        /* This is mostly for debugging... so that we know what is still