Author: rjung
Date: Sun Dec 21 19:10:32 2014
New Revision: 1647189
URL: http://svn.apache.org/r1647189
Log:
Choosse names for constants that reflect more
correctly their meaning.
The original names only made sense when we did
not have automatic shm size calculation many
releases ago.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_shm.h
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1647189&r1=1647188&r2=1647189&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Dec 21 19:10:32 2014
@@ -1358,8 +1358,8 @@ static const char *jk_set_shm_size(cmd_p
int sz = 0;
/* we need an absolute path */
sz = atoi(shm_size) * 1024;
- if (sz < JK_SHM_DEF_SIZE)
- sz = JK_SHM_DEF_SIZE;
+ if (sz < JK_SHM_MIN_SIZE)
+ sz = JK_SHM_MIN_SIZE;
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = sz;
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1647189&r1=1647188&r2=1647189&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sun Dec 21 19:10:32 2014
@@ -1453,8 +1453,8 @@ static const char *jk_set_shm_size(cmd_p
}
sz = atoi(shm_size) * 1024;
- if (sz < JK_SHM_DEF_SIZE)
- sz = JK_SHM_DEF_SIZE;
+ if (sz < JK_SHM_MIN_SIZE)
+ sz = JK_SHM_MIN_SIZE;
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = sz;
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1647189&r1=1647188&r2=1647189&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Sun Dec 21 19:10:32 2014
@@ -50,10 +50,10 @@ extern "C"
/* XXX: Check if adding struct members for overflow */
#define JK_SHM_SLOT_SIZE 384
/* Really huge numbers, but 64 workers should be enough */
-#define JK_SHM_MAX_WORKERS 64
+#define JK_SHM_DEF_WORKERS 64
#define JK_SHM_ALIGNMENT JK_SHM_SLOT_SIZE
#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT)
-#define JK_SHM_DEF_SIZE ((JK_SHM_SLOT_SIZE * JK_SHM_MAX_WORKERS * 3)
+ JK_SHM_ALIGNMENT)
+#define JK_SHM_MIN_SIZE ((JK_SHM_SLOT_SIZE * JK_SHM_DEF_WORKERS * 3)
+ JK_SHM_ALIGNMENT)
/** jk shm generic worker record structure */
struct jk_shm_worker_header
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
