From c940ea5b58bb5007cba67c4f912d5f74f5ffc605 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 15 Mar 2004 23:08:41 +0000 Subject: [PATCH] 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 --- CHANGES | 9 +++++---- include/mpm_common.h | 4 ++-- server/core.c | 2 +- server/mpm/experimental/leader/leader.c | 4 ++-- server/mpm/experimental/perchild/perchild.c | 5 +++-- server/mpm/experimental/threadpool/threadpool.c | 4 ++-- server/mpm/winnt/child.c | 2 +- server/mpm/worker/worker.c | 4 ++-- server/mpm_common.c | 8 ++++---- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index bbe156d1f1..b3b7caf631 100644 --- a/CHANGES +++ b/CHANGES @@ -15,10 +15,11 @@ Changes with Apache 2.1.0-dev "ProxyErrorOverride On" is configured. PR 20183. [Marcus Janson , 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 f751cc64a0..85a4db5606 100644 --- 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 70d5f66904..b77a33b9d1 100644 --- 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 c9b275ed72..88d24b9851 100644 --- 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 484f630378..5e3522546b 100644 --- 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 fab5d99345..299088c22a 100644 --- 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 c74f41c22d..64b0c93813 100644 --- 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 5080f7b523..b13facdd33 100644 --- 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 968b4cd030..36d8e6de17 100644 --- 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; } -- 2.50.1