Author: rjung
Date: Sun Jan 6 06:11:29 2008
New Revision: 609313
URL: http://svn.apache.org/viewvc?rev=609313&view=rev
Log:
Part 2 of r609310: Make open/attach logging for shm
consistent for all web servers.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=609313&r1=609312&r2=609313&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Sun Jan 6 06:11:29 2008
@@ -92,7 +92,7 @@
return 0;
}
- jk_shmem.size = JK_SHM_ALIGN(sizeof(jk_shm_header_t) + sz);
+ jk_shmem.size = JK_SHM_ALIGN(sizeof(jk_shm_header_t) + sz);
#if defined (WIN32)
if (fname) {
@@ -167,9 +167,11 @@
JK_INIT_CS(&(jk_shmem.cs), rc);
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "%s shared memory size=%u free=%u addr=%#lx",
+ "%s shared memory %s size=%u free=%u addr=%#lx",
attached ? "Attached" : "Initialized",
- jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
+ jk_shm_name(), jk_shmem.size,
+ jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
+ jk_shmem.hdr);
JK_TRACE_EXIT(l);
return 0;
}
@@ -182,8 +184,8 @@
jk_shmem.attached = 1;
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "Attached shared memory [%d] size=%u free=%u addr=%#lx",
- jk_shmem.hdr->h.data.childs, jk_shmem.hdr->h.data.size,
+ "Attached shared memory %s [%d] size=%u free=%u addr=%#lx",
+ jk_shm_name(), jk_shmem.hdr->h.data.childs, jk_shmem.size,
jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
}
@@ -445,8 +447,10 @@
jk_shmem.hdr->h.data.childs = 1;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "Initialized shared memory size=%u free=%u addr=%#lx",
- jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
+ "Initialized shared memory %s size=%u free=%u addr=%#lx",
+ jk_shm_name(), jk_shmem.size,
+ jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
+ jk_shmem.hdr);
}
else {
unsigned int nchild;
@@ -455,8 +459,8 @@
nchild = jk_shmem.hdr->h.data.childs;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "Attached shared memory [%d] size=%u free=%u addr=%#lx",
- nchild, jk_shmem.hdr->h.data.size,
+ "Attached shared memory %s [%d] size=%u free=%u addr=%#lx",
+ jk_shm_name(), nchild, jk_shmem.size,
jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
