Author: rjung
Date: Fri Nov 30 02:26:42 2007
New Revision: 599767
URL: http://svn.apache.org/viewvc?rev=599767&view=rev
Log:
Complete half-baked r599743. Care about signedness
and apply reverse order to the relevant loop to.
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=599767&r1=599766&r2=599767&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Nov 30
02:26:42 2007
@@ -2607,14 +2607,15 @@
}
JK_ENTER_CS(&aw->cs, rc);
if (rc) {
- unsigned int i, n = 0, cnt = 0;
+ unsigned int n = 0, cnt = 0;
+ int i;
/* Count open slots */
- for (i = aw->ep_cache_sz - 1; i >= 0; i--) {
+ for (i = (int)aw->ep_cache_sz - 1; i >= 0; i--) {
if (aw->ep_cache[i] && IS_VALID_SOCKET(aw->ep_cache[i]->sd))
cnt++;
}
/* Handle worker cache and recycle timeouts */
- for (i = 0; i < aw->ep_cache_sz; i++) {
+ for (i = (int)aw->ep_cache_sz - 1; i >= 0; i--) {
/* Skip the closed sockets */
if (aw->ep_cache[i] && IS_VALID_SOCKET(aw->ep_cache[i]->sd)) {
int elapsed = (int)difftime(now,
aw->ep_cache[i]->last_access);
@@ -2627,11 +2628,11 @@
ajp_reset_endpoint(aw->ep_cache[i], l);
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "cleaning pool slot=%u elapsed %d in %d",
+ "cleaning pool slot=%d elapsed %d in %d",
i, elapsed, (int)(difftime(time(NULL),
rt)));
}
}
- if ((cnt - n) <= aw->ep_mincache_sz) {
+ if (cnt <= aw->ep_mincache_sz + n) {
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]
