From cb3975a65b990f99a6e894e3229d49b239a9429c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 7 Jun 2002 14:08:05 +0000 Subject: [PATCH] Now that we have the functionality in apr, we can now have 2.0's startup message regarding AcceptMutex (what we are using and what the default is) "fully" match what is present in 1.3. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95568 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/mpm/experimental/leader/leader.c | 4 +++- server/mpm/experimental/perchild/perchild.c | 4 +++- server/mpm/experimental/threadpool/threadpool.c | 4 +++- server/mpm/mpmt_os2/mpmt_os2.c | 4 +++- server/mpm/netware/mpm_netware.c | 4 +++- server/mpm/prefork/prefork.c | 4 +++- server/mpm/worker/worker.c | 4 +++- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 7b63feca76..33c5a829e0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.37 + *) Make 2.0's "AcceptMutex" startup message now "completely" + match how 1.3 does it. [Jim Jagielski] + *) Implement a fixed size memory cache using a priority queue [Ian Holsman] diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c index 2e0c956944..661b0fce66 100644 --- a/server/mpm/experimental/leader/leader.c +++ b/server/mpm/experimental/leader/leader.c @@ -1642,7 +1642,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif restart_pending = shutdown_pending = 0; diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 08ec9385c6..53261026cc 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -1326,7 +1326,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif restart_pending = shutdown_pending = 0; diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c index 0563394b69..dffd4634f9 100644 --- a/server/mpm/experimental/threadpool/threadpool.c +++ b/server/mpm/experimental/threadpool/threadpool.c @@ -1862,7 +1862,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif restart_pending = shutdown_pending = 0; diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 621675d36d..84addf8e69 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -317,7 +317,9 @@ static char master_main() "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif if (one_process) { ap_scoreboard_image->parent[0].pid = getpid(); diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index bcc2d32caf..c4de43bffb 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -923,7 +923,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif show_server_data(); diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 428912914a..87c13f2775 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1012,7 +1012,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif restart_pending = shutdown_pending = 0; diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 5f801a627a..9882091551 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1732,7 +1732,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s", ap_valid_accept_mutex_string); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif restart_pending = shutdown_pending = 0; -- 2.50.1