cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/09/12 06:14:37 Modified:jk/native/common jk_shm.h Log: Cleanup. Revision ChangesPath 1.24 +1 -3 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_shm.h 12 Sep 2005 12:53:05 - 1.23 +++ jk_shm.h 12 Sep 2005 13:14:37 - 1.24 @@ -87,10 +87,8 @@ volatile time_t service_time; /* Number of bytes read from remote */ volatile size_t readed; -volatile size_t rd; /* Number of bytes transferred to remote */ volatile size_t transferred; -volatile size_t wr; /* Number of times the worker was elected */ volatile size_t elected; /* Number of non 200 responses */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/21 02:31:08
Modified:jk/native/common jk_shm.h
Log:
Use volatile to supress (hopefully) caching in registers the data
that can be changed in multi cpu systems.
Revision ChangesPath
1.16 +13 -13jakarta-tomcat-connectors/jk/native/common/jk_shm.h
Index: jk_shm.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_shm.h 20 Feb 2005 18:31:21 - 1.15
+++ jk_shm.h 21 Feb 2005 10:31:08 - 1.16
@@ -55,7 +55,7 @@
{
int id;
/* Number of currently busy channels */
-int busy;
+volatile int busy;
/* worker name */
charname[JK_SHM_STR_SIZ+1];
/* worker domain */
@@ -63,28 +63,28 @@
/* worker redirect route */
charredirect[JK_SHM_STR_SIZ+1];
/* current status of the worker */
-int is_disabled;
-int is_busy;
+volatile int is_disabled;
+volatile int is_busy;
/* Current lb factor */
-int lb_factor;
+volatile int lb_factor;
/* Current lb value */
-int lb_value;
-int in_error_state;
-int in_recovering;
+volatile int lb_value;
+volatile int in_error_state;
+volatile int in_recovering;
int sticky_session;
int sticky_session_force;
int recover_wait_time;
int retries;
/* Statistical data */
-time_t error_time;
+volatile time_t error_time;
/* Number of bytes read from remote */
-size_t readed;
+volatile size_t readed;
/* Number of bytes transferred to remote */
-size_t transferred;
+volatile size_t transferred;
/* Number of times the worker was elected */
-size_t elected;
+volatile size_t elected;
/* Number of non 200 responses */
-size_t errors;
+volatile size_t errors;
};
typedef struct jk_shm_worker jk_shm_worker_t;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/16 00:25:10 Modified:jk/native/common jk_shm.h Log: Removed all local_* parameters. Revision ChangesPath 1.11 +2 -9 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_shm.h 15 Feb 2005 08:51:43 - 1.10 +++ jk_shm.h 16 Feb 2005 08:25:10 - 1.11 @@ -71,14 +71,7 @@ /* Current lb factor */ int lb_factor; /* Current lb value */ -int lb_value; - -/* Those are going to be deprecated */ -int is_local_worker; -int is_local_domain; -int in_local_worker_mode; -int local_worker_only; - +int lb_value; int in_error_state; int in_recovering; int sticky_session; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/15 00:51:43 Modified:jk/native/common jk_shm.h Log: Add sticky_session_force element. Revision ChangesPath 1.10 +13 -8 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_shm.h 15 Feb 2005 07:26:11 - 1.9 +++ jk_shm.h 15 Feb 2005 08:51:43 - 1.10 @@ -71,25 +71,30 @@ /* Current lb factor */ int lb_factor; /* Current lb value */ -int lb_value; +int lb_value; + +/* Those are going to be deprecated */ int is_local_worker; int is_local_domain; -int in_error_state; -int in_recovering; int in_local_worker_mode; int local_worker_only; + +int in_error_state; +int in_recovering; int sticky_session; +int sticky_session_force; int recover_wait_time; int retries; +/* Statistical data */ time_t error_time; /* Number of bytes read from remote */ -size_t readed; +size_t readed; /* Number of bytes transferred to remote */ -size_t transferred; +size_t transferred; /* Number of times the worker was elected */ -size_t elected; +size_t elected; /* Number of non 200 responses */ -size_t errors; +size_t errors; }; typedef struct jk_shm_worker jk_shm_worker_t; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/14 23:26:11 Modified:jk/native/common jk_shm.h Log: Add retries and is_disabled to shared memory worker record Revision ChangesPath 1.9 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_shm.h 13 Feb 2005 12:08:05 - 1.8 +++ jk_shm.h 15 Feb 2005 07:26:11 - 1.9 @@ -67,7 +67,7 @@ /* worker redirect route */ charredirect[JK_SHM_STR_SIZ+1]; /* current status of the worker */ -int status; +int is_disabled; /* Current lb factor */ int lb_factor; /* Current lb value */ @@ -80,6 +80,7 @@ int local_worker_only; int sticky_session; int recover_wait_time; +int retries; time_t error_time; /* Number of bytes read from remote */ size_t readed; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/09 03:47:33 Modified:jk/native/common jk_shm.h Log: Fix worker dara record. Revision ChangesPath 1.4 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_shm.h 7 Feb 2005 19:06:35 - 1.3 +++ jk_shm.h 9 Feb 2005 11:47:33 - 1.4 @@ -59,11 +59,11 @@ /* Maximum number of channels */ int max_conn; /* worker name */ -charroute[JK_SHM_STR_SIZ+1]; +charname[JK_SHM_STR_SIZ+1]; /* worker domain */ chardomain[JK_SHM_STR_SIZ+1]; /* worker redirect route */ -charredirect_route[JK_SHM_STR_SIZ+1]; +charredirect[JK_SHM_STR_SIZ+1]; /* current status of the worker */ int status; /* Current lb factor */ @@ -78,7 +78,7 @@ int local_worker_only; int sticky_session; int recover_wait_time; -int error_time; +time_t error_time; /* Number of bytes read from remote */ int readed; /* Number of bytes transferred to remote */ @@ -112,7 +112,7 @@ /* allocate shm worker record */ -jk_shm_w_rec_t *jk_shm_alloc(); +jk_shm_w_rec_t *jk_shm_worker_alloc(); #ifdef __cplusplus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/09 04:33:13 Modified:jk/native/common jk_shm.h Log: Change size params to use size_t. Revision ChangesPath 1.5 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_shm.h 9 Feb 2005 11:47:33 - 1.4 +++ jk_shm.h 9 Feb 2005 12:33:13 - 1.5 @@ -80,13 +80,13 @@ int recover_wait_time; time_t error_time; /* Number of bytes read from remote */ -int readed; +size_t readed; /* Number of bytes transferred to remote */ -int transferred; +size_t transferred; /* Number of times the worker was elected */ -int elected; +size_t elected; /* Number of non 200 responses */ -int errors; +size_t errors; }; typedef struct jk_shm_w_rec jk_shm_w_rec_t; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
