cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c

[costin]

costin      02/05/14 13:40:22

  Modified:    jk/native2/common jk_workerEnv.c
  Log:
  Create a shm slot for each workerEnv child.
  
  There are still some tricky issues with the childId in apache2
  ( this is not relevant for single-process servers )
  
  Revision  Changes    Path
  1.41      +12 -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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- jk_workerEnv.c    14 May 2002 16:57:37 -0000      1.40
  +++ jk_workerEnv.c    14 May 2002 20:40:22 -0000      1.41
  @@ -59,7 +59,7 @@
    * Description: Workers controller                                         *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    * Author:      Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.40 $                                           *
  + * Version:     $Revision: 1.41 $                                           *
    ***************************************************************************/
   
   #include "jk_env.h"
  @@ -341,6 +341,15 @@
           wEnv->shm->init( env, wEnv->shm );
       }
       
  +    if( wEnv->shm != NULL && wEnv->childId >= 0 ) {
  +        char shmName[128];
  +        snprintf( shmName, 128, "epStat.%d", wEnv->childId );
  +        
  +        wEnv->epStat=wEnv->shm->createSlot( env, wEnv->shm, shmName, 8096 );
  +        wEnv->epStat->structCnt=0;
  +        env->l->jkLog(env, env->l, JK_LOG_ERROR, "workerEnv.init() create slot 
%s\n",  shmName );
  +    }
  +    
       wEnv->uriMap->init(env, wEnv->uriMap );
   
       env->l->jkLog(env, env->l, JK_LOG_INFO, "workerEnv.init() ok %s\n", configFile 
);
  @@ -701,7 +710,8 @@
       wEnv->config->map = wEnv->initData;
   
       wEnv->childId=-1;
  -    
  +
  +    wEnv->epStat=NULL;
       jkb=env->createBean2(env, wEnv->pool,"shm", "");
       if( jkb==NULL ) {
           wEnv->shm=NULL;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>