Author: mturk
Date: Mon Jun 26 13:07:54 2006
New Revision: 417288
URL: http://svn.apache.org/viewvc?rev=417288&view=rev
Log:
Properly determine the minimum cache size.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=417288&r1=417287&r2=417288&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Jun 26
13:07:54 2006
@@ -2188,7 +2188,12 @@
}
JK_ENTER_CS(&aw->cs, rc);
if (rc) {
- unsigned int i, n = 0;
+ unsigned int i, n = 0, cnt = 0;
+ /* Count opended slots */
+ for (i = 0; i < aw->ep_cache_sz; i++) {
+ if (aw->ep_cache[i] && aw->ep_cache[i]->sd >= 0)
+ cnt++;
+ }
/* Handle worker cache and recycle timeouts */
for (i = 0; i < aw->ep_cache_sz; i++) {
/* Skip the closed sockets */
@@ -2207,7 +2212,7 @@
i, elapsed, (int)(difftime(time(NULL),
rt)));
}
}
- if (n > aw->ep_mincache_sz) {
+ if ((cnt - n) < aw->ep_mincache_sz) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
"reached pool min size %u from %u cache slots",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
