use existing directive name ThreadStackSize instead of

WorkerStackSize

as made obvious by: Brad Nicholes

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

diff --git a/CHANGES b/CHANGES
index bbe156d1f1ff95a6529873583d43e36e2225d699..b3b7caf63191f0f82e863a2066ab2a15902d3cb5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,10 +15,11 @@ Changes with Apache 2.1.0-dev
      "ProxyErrorOverride On" is configured.  PR 20183.
      [Marcus Janson <marcus.janson tre.se>, Joe Orton]
 
-  *) Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
-     to override default thread stack size for threads which handle
-     client connections.  Required for some third-party modules on
-     platforms with small default thread stack size.  [Jeff Trawick]
+  *) Threaded MPMs for Unix and Win32: Add support for ThreadStackSize 
+     directive (previously NetWare-only) to override default thread 
+     stack size for threads which handle client connections.  Required 
+     for some third-party modules on platforms with small default 
+     thread stack size.  [Jeff Trawick]
 
   *) Win32: Tweak worker thread accounting routines to eliminate
      server hang when number of Listen directives in httpd.conf

diff --git a/include/mpm_common.h b/include/mpm_common.h
index f751cc64a05e89f654a3725b1e60ab7882246303..85a4db560687ae956c45f6f9170c878f9b34f381 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -249,8 +249,8 @@ extern const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy,
 #endif
 
 #ifdef AP_MPM_WANT_SET_STACKSIZE
-extern apr_size_t ap_worker_stacksize;
-extern const char *ap_mpm_set_worker_stacksize(cmd_parms *cmd, void *dummy,
+extern apr_size_t ap_thread_stacksize;
+extern const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy,
                                                const char *arg);
 #endif
 

diff --git a/server/core.c b/server/core.c
index 70d5f669049838fb727267935b4721c086de3ef4..b77a33b9d1b56cad6e264bb85427625ec75c10fd 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3240,7 +3240,7 @@ AP_INIT_TAKE1("MaxMemFree", ap_mpm_set_max_mem_free, NULL, RSRC_CONF,
               "Maximum number of 1k blocks a particular childs allocator may hold."),
 #endif
 #ifdef AP_MPM_WANT_SET_STACKSIZE
-AP_INIT_TAKE1("WorkerStackSize", ap_mpm_set_worker_stacksize, NULL, RSRC_CONF,
+AP_INIT_TAKE1("ThreadStackSize", ap_mpm_set_thread_stacksize, NULL, RSRC_CONF,
               "Size in bytes of stack used by threads handling client connections"),
 #endif
 #if AP_ENABLE_EXCEPTION_HOOK

diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index c9b275ed72f8f1acf057d4bc6b9090c2671a1557..88d24b98511f61823c1679a08b87b1c7c70da851 100644 (file)
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -1074,8 +1074,8 @@ static void child_main(int child_num_arg)
     apr_threadattr_create(&thread_attr, pchild);
     /* 0 means PTHREAD_CREATE_JOINABLE */
     apr_threadattr_detach_set(thread_attr, 0);
-    if (ap_worker_stacksize != 0) {
-        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
+    if (ap_thread_stacksize != 0) {
+        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
     }
 
     ts->threads = threads;

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 484f630378b7a0e2ddfb3d57ea15b364ebbcbc87..5e3522546b6be7983cc1a0a77a0d51b4ad6318a8 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -982,8 +982,9 @@ static void child_main(int child_num_arg)
                     APR_THREAD_MUTEX_DEFAULT, pchild);
 
     apr_threadattr_create(&worker_thread_attr, pchild);
-    apr_threadattr_detach_set(worker_thread_attr, 1);                               if (ap_worker_stacksize != 0) {
-        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
+    apr_threadattr_detach_set(worker_thread_attr, 1);
+    if (ap_thread_stacksize != 0) {
+        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
     }
 
     /* We are creating worker threads right now */

diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index fab5d993459f18a17ac13c15e97b0166b3ab064c..299088c22af1e456fa00f1dcc3176ec64384db53 100644 (file)
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -1289,8 +1289,8 @@ static void child_main(int child_num_arg)
     apr_threadattr_create(&thread_attr, pchild);
     /* 0 means PTHREAD_CREATE_JOINABLE */
     apr_threadattr_detach_set(thread_attr, 0);
-    if (ap_worker_stacksize != 0) {
-        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
+    if (ap_thread_stacksize != 0) {
+        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
     }
 
     ts->threads = threads;

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index c74f41c22dcecfe12e96981f28062e31cf4b7c39..64b0c9381393af6a09d3f10e5faf127ed07fc9ce 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -928,7 +928,7 @@ void child_main(apr_pool_t *pconf)
                 continue;
             }
             ap_update_child_status_from_indexes(0, i, SERVER_STARTING, NULL);
-            child_handles[i] = (HANDLE) _beginthreadex(NULL, (unsigned)ap_worker_stacksize,
+            child_handles[i] = (HANDLE) _beginthreadex(NULL, (unsigned)ap_thread_stacksize,
                                                        (LPTHREAD_START_ROUTINE) worker_main,
                                                        (void *) i, 0, &tid);
             if (child_handles[i] == 0) {

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 5080f7b523348e6816e25b27dbb0a4eddee57712..b13facdd33364f95a79e4843b3adcd0e9665b67f 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1164,8 +1164,8 @@ static void child_main(int child_num_arg)
     /* 0 means PTHREAD_CREATE_JOINABLE */
     apr_threadattr_detach_set(thread_attr, 0);
 
-    if (ap_worker_stacksize != 0) {
-        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
+    if (ap_thread_stacksize != 0) {
+        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
     }
     
     ts->threads = threads;

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 968b4cd0304453a97933a48edc4d51b47f26b547..36d8e6de1708dabd10ba0432dd73e437d311d776 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -871,9 +871,9 @@ const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy,
 #endif /* AP_MPM_WANT_SET_MAX_MEM_FREE */
 
 #ifdef AP_MPM_WANT_SET_STACKSIZE
-apr_size_t ap_worker_stacksize = 0; /* use system default */
+apr_size_t ap_thread_stacksize = 0; /* use system default */
 
-const char *ap_mpm_set_worker_stacksize(cmd_parms *cmd, void *dummy,
+const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy,
                                         const char *arg)
 {
     long value;
@@ -884,10 +884,10 @@ const char *ap_mpm_set_worker_stacksize(cmd_parms *cmd, void *dummy,
     
     value = strtol(arg, NULL, 0);
     if (value < 0 || errno == ERANGE)
-        return apr_pstrcat(cmd->pool, "Invalid WorkerStackSize value: ", 
+        return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ", 
                            arg, NULL);
 
-    ap_worker_stacksize = (apr_size_t)value;
+    ap_thread_stacksize = (apr_size_t)value;
 
     return NULL;
 }