Author: rjung
Date: Wed Sep 28 14:45:46 2011
New Revision: 1176902
URL: http://svn.apache.org/viewvc?rev=1176902&view=rev
Log:
Fix decay_load for lb method "Next":
if one lb_value was "0", the special rule for
curmin==0 led to a wrong new curmin.
Choose a separate marker variable instead
of a special value.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1176902&r1=1176901&r2=1176902&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Sep 28 14:45:46 2011
@@ -625,6 +625,7 @@ static jk_uint64_t decay_load(lb_worker_
unsigned int i;
jk_uint64_t curmax = 0;
jk_uint64_t curmin = 0;
+ int no_curmin = JK_TRUE;
lb_sub_worker_t *w;
ajp_worker_t *aw;
@@ -651,7 +652,8 @@ static jk_uint64_t decay_load(lb_worker_
* defined by mapping rules here.
*/
if (JK_WORKER_USABLE(w->s->state, w->activation)) {
- if (curmin == 0 || w->s->lb_value < curmin) {
+ if (w->s->lb_value < curmin || no_curmin == JK_TRUE) {
+ no_curmin = JK_FALSE;
curmin = w->s->lb_value;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
