Author: rjung
Date: Sun Jan 13 09:52:30 2008
New Revision: 611608
URL: http://svn.apache.org/viewvc?rev=611608&view=rev
Log:
Add max_packet_size to shm and fix comments
and a log message.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h
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=611608&r1=611607&r2=611608&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sun Jan 13 09:52:30
2008
@@ -162,7 +162,7 @@
return lb_method_type[p->lbmethod];
}
-/* Return the int representation of the lb lock type */
+/* Return the int representation of the lb method type */
int jk_lb_get_method_code(const char *v)
{
if (!v)
@@ -185,7 +185,7 @@
return lb_state_type[p->s->state];
}
-/* Return the int representation of the lb lock type */
+/* Return the int representation of the lb state */
int jk_lb_get_state_code(const char *v)
{
if (!v)
@@ -281,6 +281,7 @@
p->retries = p->s->retries;
p->lbmethod = p->s->lbmethod;
p->lblock = p->s->lblock;
+ p->max_packet_size = p->s->max_packet_size;
p->sequence = p->s->h.sequence;
for (i = 0; i < p->num_of_workers; i++) {
@@ -322,6 +323,7 @@
p->s->retries = p->retries;
p->s->lbmethod = p->lbmethod;
p->s->lblock = p->lblock;
+ p->s->max_packet_size = p->max_packet_size;
p->s->h.sequence = p->sequence;
for (i = 0; i < p->num_of_workers; i++) {
@@ -1356,7 +1358,7 @@
p->lb_workers[i].s = jk_shm_alloc_lb_sub_worker(&p->p);
if (p->lb_workers[i].s == NULL) {
jk_log(l, JK_LOG_ERROR,
- "allocating ajp13 worker record from shared
memory");
+ "allocating lb sub worker record from shared
memory");
JK_TRACE_EXIT(l);
return JK_FALSE;
}
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=611608&r1=611607&r2=611608&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sun Jan 13 09:52:30 2008
@@ -167,6 +167,7 @@
int retries;
int lbmethod;
int lblock;
+ unsigned int max_packet_size;
volatile time_t last_maintain_time;
};
typedef struct jk_shm_lb_worker jk_shm_lb_worker_t;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
