Author: rjung
Date: Wed Aug 23 11:11:13 2006
New Revision: 434110
URL: http://svn.apache.org/viewvc?rev=434110&view=rev
Log:
Make constant naming more consistent, separate defaults from values.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=434110&r1=434109&r2=434110&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Aug 23 11:11:13
2006
@@ -102,7 +102,7 @@
{
unsigned int i = 0;
JK_TRACE_ENTER(l);
- if (p->lbmethod != JK_LB_BYBUSYNESS) {
+ if (p->lbmethod != JK_LB_METHOD_BUSYNESS) {
for (i = 0; i < p->num_of_workers; i++) {
p->lb_workers[i].s->lb_value = 0;
}
@@ -272,7 +272,7 @@
jk_uint64_t curmax = 0;
JK_TRACE_ENTER(l);
- if (p->lbmethod != JK_LB_BYBUSYNESS) {
+ if (p->lbmethod != JK_LB_METHOD_BUSYNESS) {
for (i = 0; i < p->num_of_workers; i++) {
p->lb_workers[i].s->lb_value >>= exponent;
if (p->lb_workers[i].s->lb_value > curmax) {
@@ -664,9 +664,9 @@
if (p->worker->s->busy > p->worker->s->max_busy)
p->worker->s->max_busy = p->worker->s->busy;
rec->s->busy++;
- if (p->worker->lbmethod == JK_LB_BYREQUESTS)
+ if (p->worker->lbmethod == JK_LB_METHOD_REQUESTS)
rec->s->lb_value += rec->s->lb_mult;
- else if (p->worker->lbmethod == JK_LB_BYBUSYNESS)
+ else if (p->worker->lbmethod == JK_LB_METHOD_BUSYNESS)
rec->s->lb_value += rec->s->lb_mult;
if (rec->s->busy > rec->s->max_busy)
rec->s->max_busy = rec->s->busy;
@@ -684,9 +684,9 @@
/* Update partial reads and writes if any */
rec->s->readed += rd;
rec->s->transferred += wr;
- if (p->worker->lbmethod == JK_LB_BYTRAFFIC)
+ if (p->worker->lbmethod == JK_LB_METHOD_TRAFFIC)
rec->s->lb_value += (rd+wr)*rec->s->lb_mult;
- else if (p->worker->lbmethod == JK_LB_BYBUSYNESS)
+ else if (p->worker->lbmethod == JK_LB_METHOD_BUSYNESS)
if (rec->s->lb_value >= rec->s->lb_mult)
rec->s->lb_value -= rec->s->lb_mult;
else {
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=434110&r1=434109&r2=434110&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Wed Aug 23 11:11:13
2006
@@ -38,16 +38,20 @@
#define JK_LB_WORKER_TYPE (5)
#define JK_LB_DEF_DOMAIN_NAME ("unknown")
-#define JK_LB_BYREQUESTS (0)
-#define JK_LB_BYTRAFFIC (1)
-#define JK_LB_BYBUSYNESS (2)
-#define JK_LB_METHOD_REQUESTS ("Request")
-#define JK_LB_METHOD_TRAFFIC ("Traffic")
-#define JK_LB_METHOD_BUSYNESS ("Busyness")
-#define JK_LB_LOCK_DEFAULT (0)
-#define JK_LB_LOCK_PESSIMISTIC (1)
-#define JK_LB_LM_DEFAULT ("Optimistic")
-#define JK_LB_LM_PESSIMISTIC ("Pessimistic")
+#define JK_LB_METHOD_REQUESTS (1)
+#define JK_LB_METHOD_TRAFFIC (2)
+#define JK_LB_METHOD_BUSYNESS (3)
+#define JK_LB_METHOD_DEF (JK_LB_METHOD_BUSYNESS)
+#define JK_LB_METHOD_TEXT_REQUESTS ("Request")
+#define JK_LB_METHOD_TEXT_TRAFFIC ("Traffic")
+#define JK_LB_METHOD_TEXT_BUSYNESS ("Busyness")
+#define JK_LB_METHOD_TEXT_DEF (JK_LB_METHOD_TEXT_BUSYNESS)
+#define JK_LB_LOCK_OPTIMISTIC (1)
+#define JK_LB_LOCK_PESSIMISTIC (2)
+#define JK_LB_LOCK_DEF (JK_LB_LOCK_DEF)
+#define JK_LB_LOCK_TEXT_OPTIMISTIC ("Optimistic")
+#define JK_LB_LOCK_TEXT_PESSIMISTIC ("Pessimistic")
+#define JK_LB_LOCK_TEXT_DEF (JK_LB_LOCK_TEXT_OPTIMISTIC)
/* Time to wait before retry. */
#define WAIT_BEFORE_RECOVER (60)
@@ -59,23 +63,23 @@
#define JK_LB_DECAY_MULT (1)
static const char *lb_locking_type[] = {
- JK_LB_LM_DEFAULT,
- JK_LB_LM_PESSIMISTIC,
"unknown",
+ JK_LB_LOCK_TEXT_OPTIMISTIC,
+ JK_LB_LOCK_TEXT_PESSIMISTIC,
NULL
};
static const char *lb_method_type[] = {
- JK_LB_METHOD_REQUESTS,
- JK_LB_METHOD_TRAFFIC,
- JK_LB_METHOD_BUSYNESS,
"unknown",
+ JK_LB_METHOD_TEXT_REQUESTS,
+ JK_LB_METHOD_TEXT_TRAFFIC,
+ JK_LB_METHOD_TEXT_BUSYNESS,
NULL
};
struct worker_record
{
- jk_worker_t *w;
+ jk_worker_t *w;
/* Shared memory worker data */
jk_shm_worker_t *s;
/* Current jvmRoute. Can be name or domain */
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=434110&r1=434109&r2=434110&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Wed Aug 23 11:11:13 2006
@@ -808,21 +808,21 @@
char buf[1024];
const char *v;
if (!m || !wname) {
- return JK_LB_BYREQUESTS;
+ return JK_LB_METHOD_DEF;
}
MAKE_WORKER_PARAM(METHOD_OF_WORKER);
v = jk_map_get_string(m, buf, NULL);
if (!v)
- return JK_LB_BYREQUESTS;
+ return JK_LB_METHOD_DEF;
else if (*v == 't' || *v == 'T' || *v == '1')
- return JK_LB_BYTRAFFIC;
+ return JK_LB_METHOD_TRAFFIC;
else if (*v == 'r' || *v == 'R' || *v == '0')
- return JK_LB_BYREQUESTS;
+ return JK_LB_METHOD_REQUESTS;
else if (*v == 'b' || *v == 'B' || *v == '2')
- return JK_LB_BYBUSYNESS;
+ return JK_LB_METHOD_BUSYNESS;
else
- return JK_LB_BYREQUESTS;
+ return JK_LB_METHOD_DEF;
}
int jk_get_lb_lock(jk_map_t *m, const char *wname)
@@ -830,19 +830,19 @@
char buf[1024];
const char *v;
if (!m || !wname) {
- return JK_LB_LOCK_DEFAULT;
+ return JK_LB_LOCK_DEF;
}
MAKE_WORKER_PARAM(LOCK_OF_WORKER);
v = jk_map_get_string(m, buf, NULL);
if (!v)
- return JK_LB_LOCK_DEFAULT;
+ return JK_LB_LOCK_DEF;
else if (*v == 'o' || *v == 'O' || *v == '0')
- return JK_LB_LOCK_DEFAULT;
+ return JK_LB_LOCK_OPTIMISTIC;
else if (*v == 'p' || *v == 'P' || *v == '1')
return JK_LB_LOCK_PESSIMISTIC;
else
- return JK_LB_LOCK_DEFAULT;
+ return JK_LB_LOCK_DEF;
}
int jk_get_lb_worker_list(jk_map_t *m,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
