Author: rjung Date: Sun Jan 13 09:06:26 2008 New Revision: 611597 URL: http://svn.apache.org/viewvc?rev=611597&view=rev Log: Only use volatile for the shm workers and the sequence counter.
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h tomcat/connectors/trunk/jk/native/common/jk_status.c 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=611597&r1=611596&r2=611597&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Jan 13 09:06:26 2008 @@ -132,13 +132,13 @@ /* worker redirect route */ char redirect[JK_SHM_STR_SIZ+1]; /* worker distance */ - volatile int distance; + int distance; /* current activation state (config) of the worker */ - volatile int activation; + int activation; /* Current lb factor */ - volatile int lb_factor; + int lb_factor; /* Current lb reciprocal factor */ - volatile jk_uint64_t lb_mult; + jk_uint64_t lb_mult; /* Sequence counter starting at 0 and increasing * every time we change the config */ Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=611597&r1=611596&r2=611597&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_status.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 13 09:06:26 2008 @@ -2402,7 +2402,7 @@ const char *arg, int min, int max, - volatile int *param, + int *param, const char *lb_name, jk_logger_t *l) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]