Author: mturk
Date: Thu Mar 29 23:58:38 2007
New Revision: 523964
URL: http://svn.apache.org/viewvc?view=rev&rev=523964
Log:
Put the entire code that is JK_SHM_LOCK_REOPEN dependent inside #ifdef
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?view=diff&rev=523964&r1=523963&r2=523964
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Thu Mar 29 23:58:38 2007
@@ -237,21 +237,18 @@
#define MAP_FILE (0)
#endif
-#ifdef JK_SHM_LOCK_REOPEN
-static int shm_lock_reopen = 1;
-#else
-static int shm_lock_reopen = 0;
-#endif
-
static int do_shm_open_lock(const char *fname, int attached, jk_logger_t *l)
{
int rc;
char flkname[256];
JK_TRACE_ENTER(l);
- if (attached) {
- if (shm_lock_reopen)
- jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0666);
+ if (attached && jk_shmem.lockname) {
+#ifdef JK_SHM_LOCK_REOPEN
+ jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0666);
+#else
+ errno = EINVAL;
+#endif
if (jk_shmem.fd_lock == -1) {
rc = errno;
JK_TRACE_EXIT(l);
@@ -265,25 +262,24 @@
}
if (!jk_shmem.lockname) {
- if (shm_lock_reopen) {
- int i;
- jk_shmem.fd_lock = -1;
- mode_t mask = umask(0);
- for (i = 0; i < 8; i++) {
- strcpy(flkname, "/tmp/jkshmlock.XXXXXX");
- if (mktemp(flkname)) {
- jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC,
0666);
- if (jk_shmem.fd_lock >= 0)
- break;
- }
+#ifdef JK_SHM_LOCK_REOPEN
+ int i;
+ jk_shmem.fd_lock = -1;
+ mode_t mask = umask(0);
+ for (i = 0; i < 8; i++) {
+ strcpy(flkname, "/tmp/jkshmlock.XXXXXX");
+ if (mktemp(flkname)) {
+ jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ if (jk_shmem.fd_lock >= 0)
+ break;
}
- umask(mask);
- }
- else {
- strcpy(flkname, fname);
- strcat(flkname, ".lock");
- jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
}
+ umask(mask);
+#else
+ strcpy(flkname, fname);
+ strcat(flkname, ".lock");
+ jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
+#endif
if (jk_shmem.fd_lock == -1) {
rc = errno;
JK_TRACE_EXIT(l);
@@ -470,12 +466,12 @@
if (jk_shmem.hdr) {
--jk_shmem.hdr->h.data.childs;
+#ifdef JK_SHM_LOCK_REOPEN
if (jk_shmem.fd_lock >= 0) {
- if (shm_lock_reopen) {
- close(jk_shmem.fd_lock);
- jk_shmem.fd_lock = -1;
- }
+ close(jk_shmem.fd_lock);
+ jk_shmem.fd_lock = -1;
}
+#endif
JK_DELETE_CS(&(jk_shmem.cs), rc);
if (jk_shmem.attached) {
int p = (int)getpid();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
