costin 02/04/10 16:48:33
Modified: jk/native2/common jk_workerEnv.c
Log:
Add shm initialization ( does nothing at the moment )
Revision Changes Path
1.25 +14 -2 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_workerEnv.c 9 Apr 2002 21:00:38 -0000 1.24
+++ jk_workerEnv.c 10 Apr 2002 23:48:33 -0000 1.25
@@ -59,13 +59,14 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.24 $ *
+ * Version: $Revision: 1.25 $ *
***************************************************************************/
#include "jk_env.h"
#include "jk_workerEnv.h"
#include "jk_config.h"
#include "jk_worker.h"
+#include "jk_shm.h"
#include "jk_channel.h"
#include "jk_registry.h"
@@ -243,6 +244,10 @@
jk2_workerEnv_initWorkers( env, wEnv );
jk2_workerEnv_initHandlers( env, wEnv );
+
+ if( wEnv->shm != NULL ) {
+ wEnv->shm->init( env, wEnv->shm );
+ }
wEnv->uriMap->init(env, wEnv->uriMap );
@@ -554,8 +559,15 @@
wEnv->config->file = NULL;
wEnv->config->workerEnv = wEnv;
wEnv->config->map = wEnv->initData;
-
+ jkb=env->createBean2(env, wEnv->pool,"shm", "");
+ if( jkb==NULL ) {
+ wEnv->shm=NULL;
+ } else {
+ env->alias(env, "shm:", "shm");
+ wEnv->shm=(jk_shm_t *)jkb->object;
+ }
+
wEnv->uriMap->workerEnv = wEnv;
wEnv->perThreadWorker=0;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
