-- Resent, because of mail setup problems during original commit --
Author: rjung
Date: Wed May 10 01:41:48 2006
New Revision: 405677
URL: http://svn.apache.org/viewcvs?rev=405677&view=rev
Log:
Replace hard coded size of magic header by macro.
Compute size of shm using sizeof.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=405677&r1=405676&r2=405677&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Wed May 10
01:41:48 2006
@@ -30,7 +30,7 @@
struct jk_shm_header_data
{
/* Shared memory magic JK_SHM_MAGIC */
- char magic[8];
+ char magic[JK_SHM_MAGIC_SIZ];
size_t size;
size_t pos;
unsigned int childs;
@@ -127,7 +127,7 @@
jk_shmem.filename = "memory";
jk_shmem.fd = 0;
jk_shmem.attached = 0;
- memcpy(jk_shmem.hdr->h.data.magic, shm_signature, 8);
+ memcpy(jk_shmem.hdr->h.data.magic, shm_signature, JK_SHM_MAGIC_SIZ);
jk_shmem.hdr->h.data.size = sz;
JK_INIT_CS(&(jk_shmem.cs), rc);
if (JK_IS_DEBUG_LEVEL(l))
@@ -320,7 +320,7 @@
/* Clear shared memory */
if (!attached) {
memset(jk_shmem.hdr, 0, jk_shmem.size);
- memcpy(jk_shmem.hdr->h.data.magic, shm_signature, 8);
+ memcpy(jk_shmem.hdr->h.data.magic, shm_signature,
JK_SHM_MAGIC_SIZ);
jk_shmem.hdr->h.data.size = sz;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=405677&r1=405676&r2=405677&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Wed May 10
01:41:48 2006
@@ -44,11 +44,14 @@
#define JK_SHM_URI_SIZ 127
#define JK_SHM_DYNAMIC 16
#define JK_SHM_MAGIC '!', 'J', 'K', 'S', 'H', 'M', JK_SHM_MAJOR,
JK_SHM_MINOR
+#define JK_SHM_MAGIC_SIZ 8
/* Really huge numbers, but 64 workers should be enough */
#define JK_SHM_MAX_WORKERS 64
-#define JK_SHM_DEF_SIZE (JK_SHM_MAX_WORKERS * 512)
-#define JK_SHM_ALIGN(x) JK_ALIGN(x, 64)
+#define JK_SHM_WORKER_SIZE JK_SHM_ALIGN(sizeof(jk_shm_worker_t))
+#define JK_SHM_DEF_SIZE (JK_SHM_MAX_WORKERS * JK_SHM_WORKER_SIZE)
+#define JK_SHM_ALIGNMENT 64
+#define JK_SHM_ALIGN(x) JK_ALIGN(x, JK_SHM_ALIGNMENT)
/* Use 1 minute for measuring read/write data */
#define JK_SERVICE_TRANSFER_INTERVAL 60
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
