Author: rjung
Date: Wed Jan 7 14:51:42 2015
New Revision: 1650072
URL: http://svn.apache.org/r1650072
Log:
Remove busy counter for sub worker.
It simply shadows the ajp busy counter.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_shm.h
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=1650072&r1=1650071&r2=1650072&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jan 7 14:51:42 2015
@@ -1343,7 +1343,6 @@ static int JK_METHOD service(jk_endpoint
jk_shm_lock();
/* Increment the number of workers serving request */
- busy = JK_ATOMIC_INCREMENT(&(rec->s->busy));
busy = JK_ATOMIC_INCREMENT(&(p->worker->s->busy));
if (busy > p->worker->s->max_busy)
p->worker->s->max_busy = busy;
@@ -1444,7 +1443,6 @@ static int JK_METHOD service(jk_endpoint
* restart of the server.
*/
JK_ATOMIC_DECREMENT(&(p->worker->s->busy));
- JK_ATOMIC_DECREMENT(&(rec->s->busy));
if (service_stat == JK_TRUE) {
/*
* Successful request.
@@ -1549,7 +1547,7 @@ static int JK_METHOD service(jk_endpoint
*/
time_t now = time(NULL);
rec->s->errors++;
- if (rec->s->busy == 0 ||
+ if (aw->s->busy == 0 ||
p->worker->error_escalation_time == 0 ||
(rec->s->first_error_time > 0 &&
(int)difftime(now, rec->s->first_error_time) >=
p->worker->error_escalation_time)) {
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1650072&r1=1650071&r2=1650072&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Wed Jan 7 14:51:42 2015
@@ -135,8 +135,6 @@ struct jk_shm_lb_sub_worker
char domain[JK_SHM_STR_SIZ];
/* worker redirect route */
char redirect[JK_SHM_STR_SIZ];
- /* Number of currently busy channels */
- volatile int busy;
/* worker distance */
volatile int distance;
/* current activation state (config) of the worker */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
