svn commit: r750067 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_lb_worker.c

[rjung]

Author: rjung
Date: Wed Mar  4 16:38:20 2009
New Revision: 750067

URL: http://svn.apache.org/viewvc?rev=750067&view=rev
Log:
Move Logging outside of locked block
in pull/push and include sequence counters in
debug log message.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
    tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=750067&r1=750066&r2=750067&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Mar  4 
16:38:20 2009
@@ -971,12 +971,12 @@
     struct sockaddr_in inet_addr;
     JK_TRACE_ENTER(l);
 
-    if (locked == JK_FALSE)
-        jk_shm_lock();
     if (JK_IS_DEBUG_LEVEL(l))
         jk_log(l, JK_LOG_DEBUG,
-               "syncing mem for ajp worker '%s' from shm",
-               aw->name);
+               "syncing mem for ajp worker '%s' from shm (%u -> %u) [%u->%u]",
+               aw->name, aw->sequence, aw->s->h.sequence, aw->addr_sequence, 
aw->s->addr_sequence);
+    if (locked == JK_FALSE)
+        jk_shm_lock();
 
     aw->cache_timeout = aw->s->cache_timeout;
     aw->connect_timeout = aw->s->connect_timeout;
@@ -1018,12 +1018,12 @@
 {
     JK_TRACE_ENTER(l);
 
-    if (locked == JK_FALSE)
-        jk_shm_lock();
     if (JK_IS_DEBUG_LEVEL(l))
         jk_log(l, JK_LOG_DEBUG,
-               "syncing shm for ajp worker '%s' from mem",
-               aw->name);
+               "syncing shm for ajp worker '%s' from mem (%u -> %u) [%u->%u]",
+               aw->name, aw->s->h.sequence, aw->sequence, 
aw->s->addr_sequence, aw->addr_sequence);
+    if (locked == JK_FALSE)
+        jk_shm_lock();
 
     aw->s->cache_timeout = aw->cache_timeout;
     aw->s->connect_timeout = aw->connect_timeout;

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=750067&r1=750066&r2=750067&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Mar  4 16:38:20 
2009
@@ -288,12 +288,12 @@
 
     JK_TRACE_ENTER(l);
 
-    if (locked == JK_FALSE)
-        jk_shm_lock();
     if (JK_IS_DEBUG_LEVEL(l))
         jk_log(l, JK_LOG_DEBUG,
-               "syncing mem for lb '%s' from shm",
-               p->name);
+               "syncing mem for lb '%s' from shm (%u->%u)",
+               p->name, p->sequence, p->s->h.sequence);
+    if (locked == JK_FALSE)
+        jk_shm_lock();
     p->sticky_session = p->s->sticky_session;
     p->sticky_session_force = p->s->sticky_session_force;
     p->recover_wait_time = p->s->recover_wait_time;
@@ -342,12 +342,12 @@
 
     JK_TRACE_ENTER(l);
 
-    if (locked == JK_FALSE)
-        jk_shm_lock();
     if (JK_IS_DEBUG_LEVEL(l))
         jk_log(l, JK_LOG_DEBUG,
-               "syncing shm for lb '%s' from mem",
-               p->name);
+               "syncing shm for lb '%s' from mem (%u->%u)",
+               p->name, p->s->h.sequence, p->sequence);
+    if (locked == JK_FALSE)
+        jk_shm_lock();
     p->s->sticky_session = p->sticky_session;
     p->s->sticky_session_force = p->sticky_session_force;
     p->s->recover_wait_time = p->recover_wait_time;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org