You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2003/01/23 13:15:42 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
mturk 2003/01/23 04:15:42
Modified: jk/native2/common jk_shm.c
Log:
Report the missing shm file as INFO not ERROR, cause it is
obvious that the user didn't specify the [shm] in the config.
Revision Changes Path
1.31 +9 -7 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_shm.c 27 Sep 2002 13:07:28 -0000 1.30
+++ jk_shm.c 23 Jan 2003 12:15:42 -0000 1.31
@@ -262,7 +262,7 @@
int toWrite=shm->size - filestat.st_size;
memset( bytes, 0, 1024 );
- lseek(fd, 0, SEEK_END);
+ lseek(fd, 0, SEEK_END);
while( toWrite > 0 ) {
int written;
@@ -282,7 +282,7 @@
"shm.create(): Can't stat2 %s %d %s\n",
shm->fname, errno, strerror( errno ));
return JK_ERR;
- }
+ }
}
shm->privateData = mmap(NULL, filestat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
@@ -293,7 +293,7 @@
"shm.create(): Can't mmap %s %d %s\n",
shm->fname, errno, strerror( errno ));
- close(fd);
+ close(fd);
return JK_ERR;
}
@@ -330,7 +330,7 @@
shm->privateData=NULL;
if( shm->fname==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "shm.init(): No file\n");
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.init(): shm file not specified\n");
return JK_ERR;
}
@@ -471,6 +471,8 @@
/* XXX interprocess sync */
slotId=shm->head->lastSlot++;
}
+ else
+ return NULL;
slot=shm->getSlot( env, shm, slotId );
if( slot==NULL ) return NULL;
@@ -497,11 +499,11 @@
char *value=(char *)valueP;
if( strcmp( "file", name ) == 0 ) {
- shm->fname=value;
+ shm->fname=value;
} else if( strcmp( "size", name ) == 0 ) {
- shm->size=atoi(value);
+ shm->size=atoi(value);
} else {
- return JK_ERR;
+ return JK_ERR;
}
return JK_OK;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>