dougm 01/03/13 20:22:51
Modified: src/modules/perl mod_perl.c modperl_util.c modperl_util.h
Log:
add modperl_server_desc() function
add more trace details when initializing the interpreter pool
Revision Changes Path
1.30 +25 -6 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_perl.c 2001/03/09 23:46:34 1.29
+++ mod_perl.c 2001/03/14 04:22:51 1.30
@@ -93,7 +93,7 @@
*/
if (MpSrvPARENT(scfg) || MpSrvCLONE(scfg)) {
MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
- s->server_hostname);
+ modperl_server_desc(s, p));
modperl_interp_init(s, p, perl);
}
@@ -118,20 +118,39 @@
#ifdef USE_ITHREADS
static void modperl_init_clones(server_rec *s, apr_pool_t *p)
{
+#ifdef MP_TRACE
+ modperl_srv_config_t *base_scfg = modperl_srv_config_get(s);
+ char *base_name = modperl_server_desc(s, p);
+#endif /* MP_TRACE */
+
for (; s; s=s->next) {
MP_dSCFG(s);
+#ifdef MP_TRACE
+ char *name = modperl_server_desc(s, p);
+#endif /* MP_TRACE */
+
if (scfg->mip->tipool->idle) {
- MP_TRACE_i(MP_FUNC, "%s interp already cloned\n",
- s->server_hostname);
+#ifdef MP_TRACE
+ if (scfg->mip == base_scfg->mip) {
+ MP_TRACE_i(MP_FUNC,
+ "%s interp pool inherited from %s\n",
+ name, base_name);
+ }
+ else {
+ MP_TRACE_i(MP_FUNC,
+ "%s interp pool already initialized\n",
+ name);
+ }
+#endif /* MP_TRACE */
}
else {
- MP_TRACE_i(MP_FUNC, "cloning interp for %s\n",
- s->server_hostname);
+ MP_TRACE_i(MP_FUNC, "initializing interp pool for %s\n",
+ name);
modperl_tipool_init(scfg->mip->tipool);
}
}
}
-#endif
+#endif /* USE_ITHREADS */
void modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s)
1.5 +5 -0 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_util.c 2001/03/13 05:09:02 1.4
+++ modperl_util.c 2001/03/14 04:22:51 1.5
@@ -81,3 +81,8 @@
return status;
}
+
+char *modperl_server_desc(server_rec *s, apr_pool_t *p)
+{
+ return apr_psprintf(p, "%s:%u", s->server_hostname, s->port);
+}
1.5 +2 -0 modperl-2.0/src/modules/perl/modperl_util.h
Index: modperl_util.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_util.h 2001/03/09 23:46:36 1.4
+++ modperl_util.h 2001/03/14 04:22:51 1.5
@@ -20,4 +20,6 @@
int modperl_require_module(pTHX_ const char *pv);
+char *modperl_server_desc(server_rec *s, apr_pool_t *p);
+
#endif /* MODPERL_UTIL_H */
