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

[costin]

costin      02/05/14 13:39:26

  Modified:    jk/native2/common jk_endpoint.c
  Log:
  Use shm for the stat info, if possible.
  
  This is still unstable/experimental - needs more testing
  
  Revision  Changes    Path
  1.12      +15 -2     jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
  
  Index: jk_endpoint.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_endpoint.c     14 May 2002 17:13:22 -0000      1.11
  +++ jk_endpoint.c     14 May 2002 20:39:26 -0000      1.12
  @@ -115,6 +115,7 @@
       jk_workerEnv_t *workerEnv;
       jk_stat_t *stats;
       jk_pool_t *endpointPool = pool->create( env, pool, HUGE_POOL_SIZE );
  +    int epId;
   
       if (e==NULL) {
           env->l->jkLog(env, env->l, JK_LOG_ERROR,
  @@ -139,7 +140,8 @@
       e->currentRequest = NULL;
       //    w->init= jk2_worker_ajp14_init;
       //    w->destroy=jk2_worker_ajp14_destroy;
  -
  +    epId=atoi( result->localName );
  +    
       result->getAttribute= jk2_endpoint_getAttribute;
       result->object = e;
       e->mbean=result;
  @@ -147,7 +149,18 @@
       workerEnv=env->getByName( env, "workerEnv" );
       
       /* XXX alloc it inside the shm */
  -    stats = (jk_stat_t *)pool->calloc( env, pool, sizeof( jk_stat_t ) );
  +    if( workerEnv->epStat != NULL && workerEnv->childId >= 0 ) {
  +        stats= (jk_stat_t *) (workerEnv->epStat->data + sizeof( jk_stat_t ) * epId);
  +        workerEnv->epStat->structSize=sizeof( jk_stat_t );
  +        workerEnv->epStat->structCnt=epId + 1;
  +        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                      "SHM stats %d %p %p %s %s childId=%d\n", epId, 
workerEnv->epStat->data, stats,
  +                      result->localName, result->name, workerEnv->childId);
  +    } else {
  +        stats = (jk_stat_t *)pool->calloc( env, pool, sizeof( jk_stat_t ) );
  +        env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                      "Local stats %d %p %d\n", epId, workerEnv->epStat, 
workerEnv->childId );
  +    }
       
       e->stats=stats;
       
  
  
  

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