Author: rjung
Date: Wed Jan 7 11:54:50 2015
New Revision: 1650043
URL: http://svn.apache.org/r1650043
Log:
Add warning if LB method busyness is used,
but no atomics support detected.
Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1650043&r1=1650042&r2=1650043&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Jan 7 11:54:50 2015
@@ -449,6 +449,7 @@ typedef int jk_sock_t;
if (y == 0 || y > INT_MAX) apr_atomic_inc32((volatile apr_uint32_t
*)x);\
} while (0)
#else
+#define JK_ATOMIC_MISSING
#define JK_ATOMIC_INCREMENT(x) (++(*x))
#define JK_ATOMIC_DECREMENT(x) \
do {\
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=1650043&r1=1650042&r2=1650043&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jan 7 11:54:50 2015
@@ -1903,6 +1903,12 @@ static int JK_METHOD init(jk_worker_t *p
p->s->last_reset = p->s->last_maintain_time;
p->lbmethod = jk_get_lb_method(props, p->name);
+#ifdef JK_ATOMIC_MISSING
+ if (p->lbmethod == JK_LB_METHOD_BUSYNESS) {
+ jk_log(log, JK_LOG_WARNING, "Missing support for atomics: "
+ "LB method 'busyness' not recommended");
+ }
+#endif
p->lblock = jk_get_lb_lock(props, p->name);
s = jk_get_lb_session_cookie(props, p->name, JK_SESSION_IDENTIFIER);
if (jk_check_attribute_length("session_cookie", s, log) == JK_FALSE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
