tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Fri, 17 Dec 2004 08:28:20 GMT
mturk       2004/12/17 00:28:20

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Query mpm to obtain the real default cache size.
  
  Revision  Changes    Path
  1.111     +13 -5     jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- mod_jk.c	17 Dec 2004 03:14:56 -0000	1.110
  +++ mod_jk.c	17 Dec 2004 08:28:20 -0000	1.111
  @@ -38,6 +38,7 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "util_script.h"
  +#include "ap_mpm.h"
   
   #ifdef AS400
   #include "ap_charset.h"
  @@ -1851,9 +1852,9 @@
                       JK_TRACE_EXIT(xconf->log);
                       return r->status;
                   }
  -                jk_log(xconf->log, JK_LOG_INFO, "Service returned error=%d"
  +                jk_log(xconf->log, JK_LOG_DEBUG, "Service finished"
                          " with status=%d for worker=%s\n",
  -                       rc, r->status, worker_name);
  +                       r->status, worker_name);
                   JK_TRACE_EXIT(xconf->log);
                   return OK;      /* NOT r->status, even if it has changed. */
               }
  @@ -2179,9 +2180,18 @@
   static void jk_child_init(apr_pool_t * pconf, server_rec * s)
   {
       jk_server_conf_t *conf;
  +    int mpm_threads = 1;
  +
       conf = ap_get_module_config(s->module_config, &jk_module);
  +
       JK_TRACE_ENTER(conf->log);
   
  +    /* Set default connection cache size for worker mpm */
  +#if APR_HAS_THREADS
  +    ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads);
  +#endif
  +    if (mpm_threads > 0)
  +        jk_set_worker_def_cache_size(mpm_threads);
       jk_log(conf->log, JK_LOG_DEBUG, "Initialized %s\n", JK_EXPOSED_VERSION);
       JK_TRACE_EXIT(conf->log);
   }
  @@ -2224,9 +2234,7 @@
       worker_env.server_name = (char *)ap_get_server_version();
       if (wc_open(init_map, &worker_env, conf->log)) {
           ap_add_version_component(pconf, JK_EXPOSED_VERSION);
  -        return;
       }
  -    return;
   }
   
   static int jk_post_config(apr_pool_t * pconf,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message