Author: rjung
Date: Sun Mar 11 07:24:01 2007
New Revision: 516907
URL: http://svn.apache.org/viewvc?view=rev&rev=516907
Log:
Replace APR precompiler directive by httpd mpm_query to detect MPM threading.
Add an info log message about auto-detected pool size.
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=516907&r1=516906&r2=516907
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Mar 11 07:24:01
2007
@@ -2612,6 +2612,7 @@
server_rec * s)
{
int rc;
+ int is_threaded;
int mpm_threads = 1;
/* jk_map_t *init_map = NULL; */
@@ -2650,11 +2651,14 @@
}
#endif
- /* Set default connection cache size for worker mpm */
-#if APR_HAS_THREADS
- if (ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads) != APR_SUCCESS)
- mpm_threads = 1;
-#endif
+ /* Set default connection cache size for multi-threaded MPMs */
+ if (ap_mpm_query(AP_MPMQ_IS_THREADED, &is_threaded) == APR_SUCCESS &&
+ is_threaded != AP_MPMQ_NOT_SUPPORTED) {
+ if (ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads) != APR_SUCCESS)
+ mpm_threads = 1;
+ }
+ jk_log(conf->log, JK_LOG_INFO,
+ "Setting default connection pool max size to %d", mpm_threads);
jk_set_worker_def_cache_size(mpm_threads);
/* if(map_alloc(&init_map)) { */
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=516907&r1=516906&r2=516907
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Mar 11
07:24:01 2007
@@ -26,6 +26,10 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ Replace APR precompiler directive by httpd mpm_query to detect MPM
threading.
+ Add an info log message about auto-detected pool size. (rjung)
+ </update>
<fix>
Make MMN check easier to understand and a little more precise
(for new ap_get_server_banner()/ap_get_server_description()).
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
