mturk 2005/02/16 00:30:58
Modified: jk/native/common jk_lb_worker.c
Log:
You already know ... Remove the CRLFs. SVN, you are my last chance!
Revision Changes Path
1.52 +130 -130 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- jk_lb_worker.c 16 Feb 2005 08:27:52 -0000 1.51
+++ jk_lb_worker.c 16 Feb 2005 08:30:58 -0000 1.52
@@ -207,112 +207,112 @@
static worker_record_t *find_best_bydomain(lb_worker_t *p,
const char *domain,
- jk_logger_t *l)
-{
- unsigned int i;
- int total_factor = 0;
- worker_record_t *candidate = NULL;
-
- /* First try to see if we have available candidate */
- for (i = 0; i < p->num_of_workers; i++) {
- /* Skip all workers that are not member of domain */
- if (strlen(p->lb_workers[i].s->domain) == 0 ||
- strcmp(p->lb_workers[i].s->domain, domain))
- continue;
- /* Take into calculation only the workers that are
- * not in error state or not disabled.
- */
- if (!p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- p->lb_workers[i].s->lb_value += p->lb_workers[i].s->lb_factor;
- total_factor += p->lb_workers[i].s->lb_factor;
- if (!candidate || p->lb_workers[i].s->lb_value >
candidate->s->lb_value)
- candidate = &p->lb_workers[i];
- }
- }
-
- if (candidate) {
- candidate->s->lb_value -= total_factor;
- }
-
- return candidate;
-}
+ jk_logger_t *l)
+{
+ unsigned int i;
+ int total_factor = 0;
+ worker_record_t *candidate = NULL;
+
+ /* First try to see if we have available candidate */
+ for (i = 0; i < p->num_of_workers; i++) {
+ /* Skip all workers that are not member of domain */
+ if (strlen(p->lb_workers[i].s->domain) == 0 ||
+ strcmp(p->lb_workers[i].s->domain, domain))
+ continue;
+ /* Take into calculation only the workers that are
+ * not in error state or not disabled.
+ */
+ if (!p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ p->lb_workers[i].s->lb_value += p->lb_workers[i].s->lb_factor;
+ total_factor += p->lb_workers[i].s->lb_factor;
+ if (!candidate || p->lb_workers[i].s->lb_value >
candidate->s->lb_value)
+ candidate = &p->lb_workers[i];
+ }
+ }
+
+ if (candidate) {
+ candidate->s->lb_value -= total_factor;
+ }
+
+ return candidate;
+}
static worker_record_t *find_best_byrequests(lb_worker_t *p,
- jk_logger_t *l)
-{
- unsigned int i;
- int total_factor = 0;
- worker_record_t *candidate = NULL;
-
- /* First try to see if we have available candidate */
- for (i = 0; i < p->num_of_workers; i++) {
- /* If the worker is in error state run
- * retry on that worker. It will be marked as
- * operational if the retry timeout is elapsed.
- * The worker might still be unusable, but we try
- * anyway.
- */
- if (p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- retry_worker(&p->lb_workers[i], p->s->recover_wait_time, l);
- }
- /* Take into calculation only the workers that are
- * not in error state or not disabled.
- */
- if (!p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- p->lb_workers[i].s->lb_value += p->lb_workers[i].s->lb_factor;
- total_factor += p->lb_workers[i].s->lb_factor;
- if (!candidate || p->lb_workers[i].s->lb_value >
candidate->s->lb_value)
- candidate = &p->lb_workers[i];
- }
- }
-
- if (candidate) {
- candidate->s->lb_value -= total_factor;
- }
-
- return candidate;
-}
+ jk_logger_t *l)
+{
+ unsigned int i;
+ int total_factor = 0;
+ worker_record_t *candidate = NULL;
+
+ /* First try to see if we have available candidate */
+ for (i = 0; i < p->num_of_workers; i++) {
+ /* If the worker is in error state run
+ * retry on that worker. It will be marked as
+ * operational if the retry timeout is elapsed.
+ * The worker might still be unusable, but we try
+ * anyway.
+ */
+ if (p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ retry_worker(&p->lb_workers[i], p->s->recover_wait_time, l);
+ }
+ /* Take into calculation only the workers that are
+ * not in error state or not disabled.
+ */
+ if (!p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ p->lb_workers[i].s->lb_value += p->lb_workers[i].s->lb_factor;
+ total_factor += p->lb_workers[i].s->lb_factor;
+ if (!candidate || p->lb_workers[i].s->lb_value >
candidate->s->lb_value)
+ candidate = &p->lb_workers[i];
+ }
+ }
+
+ if (candidate) {
+ candidate->s->lb_value -= total_factor;
+ }
+
+ return candidate;
+}
static worker_record_t *find_best_bytraffic(lb_worker_t *p,
- jk_logger_t *l)
-{
- unsigned int i;
- size_t mytraffic = 0;
- size_t curmin = 0;
- worker_record_t *candidate = NULL;
-
- /* First try to see if we have available candidate */
- for (i = 0; i < p->num_of_workers; i++) {
- /* If the worker is in error state run
- * retry on that worker. It will be marked as
- * operational if the retry timeout is elapsed.
- * The worker might still be unusable, but we try
- * anyway.
- */
- if (p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- retry_worker(&p->lb_workers[i], p->s->recover_wait_time, l);
- }
- /* Take into calculation only the workers that are
- * not in error state or not disabled.
- */
- if (!p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- mytraffic =
(p->lb_workers[i].s->transferred/p->lb_workers[i].s->lb_factor) +
-
(p->lb_workers[i].s->readed/p->lb_workers[i].s->lb_factor);
- if (!candidate || mytraffic < curmin) {
- candidate = &p->lb_workers[i];
- curmin = mytraffic;
- }
- }
- }
-
- return candidate;
-}
+ jk_logger_t *l)
+{
+ unsigned int i;
+ size_t mytraffic = 0;
+ size_t curmin = 0;
+ worker_record_t *candidate = NULL;
+
+ /* First try to see if we have available candidate */
+ for (i = 0; i < p->num_of_workers; i++) {
+ /* If the worker is in error state run
+ * retry on that worker. It will be marked as
+ * operational if the retry timeout is elapsed.
+ * The worker might still be unusable, but we try
+ * anyway.
+ */
+ if (p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ retry_worker(&p->lb_workers[i], p->s->recover_wait_time, l);
+ }
+ /* Take into calculation only the workers that are
+ * not in error state or not disabled.
+ */
+ if (!p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ mytraffic =
(p->lb_workers[i].s->transferred/p->lb_workers[i].s->lb_factor) +
+
(p->lb_workers[i].s->readed/p->lb_workers[i].s->lb_factor);
+ if (!candidate || mytraffic < curmin) {
+ candidate = &p->lb_workers[i];
+ curmin = mytraffic;
+ }
+ }
+ }
+
+ return candidate;
+}
static worker_record_t *find_best_worker(lb_worker_t * p,
jk_logger_t *l)
@@ -331,8 +331,8 @@
const char *name,
jk_logger_t *l)
{
- unsigned int i;
- int total_factor = 0;
+ unsigned int i;
+ int total_factor = 0;
int uses_domain = 0;
worker_record_t *candidate = NULL;
@@ -342,40 +342,40 @@
candidate = find_best_bydomain(p, name, l);
}
if (candidate) {
- if (candidate->s->in_error_state && !candidate->s->is_disabled) {
- retry_worker(candidate, p->s->recover_wait_time, l);
+ if (candidate->s->in_error_state && !candidate->s->is_disabled) {
+ retry_worker(candidate, p->s->recover_wait_time, l);
}
if (candidate->s->in_error_state) {
- /* We have a worker that is unusable.
- * It can be in error or disabled, but in case
- * it has a redirection set use that redirection worker.
- * This enables to safely remove the member from the
- * balancer. Of course you will need a some kind of
- * session replication between those two remote.
- */
- if (*candidate->s->redirect)
- candidate = find_by_session(p, candidate->s->redirect, l);
- else if (*candidate->s->domain && !uses_domain) {
- uses_domain = 1;
+ /* We have a worker that is unusable.
+ * It can be in error or disabled, but in case
+ * it has a redirection set use that redirection worker.
+ * This enables to safely remove the member from the
+ * balancer. Of course you will need a some kind of
+ * session replication between those two remote.
+ */
+ if (*candidate->s->redirect)
+ candidate = find_by_session(p, candidate->s->redirect, l);
+ else if (*candidate->s->domain && !uses_domain) {
+ uses_domain = 1;
candidate = find_best_bydomain(p, candidate->s->domain, l);
}
if (candidate && candidate->s->in_error_state)
candidate = NULL;
}
}
- if (candidate && !uses_domain) {
- for (i = 0; i < p->num_of_workers; i++) {
- if (!p->lb_workers[i].s->in_error_state &&
- !p->lb_workers[i].s->is_disabled) {
- /* Skip all workers that are not member of candidate domain
*/
- if (*candidate->s->domain &&
- strcmp(p->lb_workers[i].s->domain, candidate->s->domain))
- continue;
- p->lb_workers[i].s->lb_value +=
p->lb_workers[i].s->lb_factor;
- total_factor += p->lb_workers[i].s->lb_factor;
- }
- }
- candidate->s->lb_value -= total_factor;
+ if (candidate && !uses_domain) {
+ for (i = 0; i < p->num_of_workers; i++) {
+ if (!p->lb_workers[i].s->in_error_state &&
+ !p->lb_workers[i].s->is_disabled) {
+ /* Skip all workers that are not member of candidate domain
*/
+ if (*candidate->s->domain &&
+ strcmp(p->lb_workers[i].s->domain, candidate->s->domain))
+ continue;
+ p->lb_workers[i].s->lb_value +=
p->lb_workers[i].s->lb_factor;
+ total_factor += p->lb_workers[i].s->lb_factor;
+ }
+ }
+ candidate->s->lb_value -= total_factor;
}
return candidate;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
