Author: rjung Date: Sun Jan 6 13:03:37 2008 New Revision: 609401 URL: http://svn.apache.org/viewvc?rev=609401&view=rev Log: Remove unused attributes from shm worker struct.
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h tomcat/connectors/trunk/jk/native/common/jk_status.c tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml 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=609401&r1=609400&r2=609401&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sun Jan 6 13:03:37 2008 @@ -41,7 +41,7 @@ */ #define JK_SHM_MAJOR '1' -#define JK_SHM_MINOR '2' +#define JK_SHM_MINOR '3' #define JK_SHM_STR_SIZ 63 #define JK_SHM_URI_SIZ 127 #define JK_SHM_DYNAMIC 16 @@ -50,11 +50,11 @@ /* Really huge numbers, but 64 workers should be enough */ #define JK_SHM_MAX_WORKERS 64 +#define JK_SHM_ALIGNMENT 64 +#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT) #define JK_SHM_WORKER_SIZE JK_SHM_ALIGN(sizeof(jk_shm_worker_t)) #define JK_SHM_SIZE(x) ((x) * JK_SHM_WORKER_SIZE) #define JK_SHM_DEF_SIZE JK_SHM_SIZE(JK_SHM_MAX_WORKERS) -#define JK_SHM_ALIGNMENT 64 -#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT) /** jk shm worker record structure */ struct jk_shm_worker @@ -68,8 +68,6 @@ volatile int busy; /* Maximum number of busy channels */ volatile int max_busy; - /* Number of currently connected channels */ - volatile int connected; /* worker name */ char name[JK_SHM_STR_SIZ+1]; /* route */ @@ -97,7 +95,6 @@ int retries; int lbmethod; int lblock; - unsigned int max_packet_size; /* Statistical data */ volatile time_t error_time; /* Service transfer rate time */ @@ -112,10 +109,6 @@ volatile jk_uint64_t elected_snapshot; /* Number of non 200 responses */ volatile jk_uint32_t errors; - /* Number of recovery attempts */ - volatile jk_uint32_t recoveries; - /* Number of recovery failures */ - volatile jk_uint32_t recovery_errors; /* Decayed number of reply_timeout errors */ volatile jk_uint32_t reply_timeouts; /* Number of client errors */ 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=609401&r1=609400&r2=609401&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_status.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 6 13:03:37 2008 @@ -2977,8 +2977,6 @@ wr->s->errors = 0; wr->s->lb_value = 0; wr->s->max_busy = 0; - wr->s->recoveries = 0; - wr->s->recovery_errors = 0; wr->s->readed = 0; wr->s->transferred = 0; wr->s->state = JK_LB_STATE_IDLE; @@ -2999,8 +2997,6 @@ wr->s->errors = 0; wr->s->lb_value = 0; wr->s->max_busy = 0; - wr->s->recoveries = 0; - wr->s->recovery_errors = 0; wr->s->readed = 0; wr->s->transferred = 0; wr->s->state = JK_LB_STATE_IDLE; Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=609401&r1=609400&r2=609401&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Jan 6 13:03:37 2008 @@ -44,6 +44,9 @@ <subsection name="Native"> <changelog> <update> + SHM: Remove unused attributes. (rjung) + </update> + <update> SHM: Automatically determine shm size for all web servers. (rjung) </update> <update> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]