[svn:mod_parrot] r597 - mod_parrot/trunk/src

Author: jhorwitz
Date: Sat Jan 24 13:34:41 2009
New Revision: 597

Modified:
   mod_parrot/trunk/src/mod_parrot.c

Log:
add hook activity tracing


Modified: mod_parrot/trunk/src/mod_parrot.c
==============================================================================
--- mod_parrot/trunk/src/mod_parrot.c	(original)
+++ mod_parrot/trunk/src/mod_parrot.c	Sat Jan 24 13:34:41 2009
@@ -293,6 +293,8 @@
 {
     modparrot_context *ctxp;
 
+    MP_TRACE_h(r->server, "in modparrot_request_phase_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(r->server, r->connection->pool))) {
         MPLOG_ERROR(r->server, "context initialization failed");
@@ -312,6 +314,8 @@
 {
     modparrot_context *ctxp;
 
+    MP_TRACE_h(c->base_server, "in modparrot_pre_connection_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(c->base_server, c->pool))) {
         MPLOG_ERROR(c->base_server, "context initialization failed");
@@ -367,6 +371,7 @@
         modparrot_module_info *minfo; \
         Parrot_PMC sub; \
         int status; \
+        MP_TRACE_h(r->server, "in modparrot_meta_%s", #hname); \
         /* initialize context */ \
         if (!(ctxp = init_ctx(r->server, r->connection->pool))) { \
             MPLOG_ERROR(r->server, "context initialization failed"); \
@@ -397,6 +402,7 @@
         dircfg = (modparrot_module_config *)ap_get_module_config( \
             r->per_dir_config, modp); \
         /* call meta handler */ \
+        MP_TRACE_h(r->server, "calling %s for %s", #hname, minfo->namespace); \
         if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace, \
             #hname , &status)) { \
             MPLOG_ERRORF(r->server, \
@@ -429,6 +435,8 @@
     Parrot_PMC sub;
     int status;
 
+    MP_TRACE_h(c->base_server, "in modparrot_meta_pre_connection_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(c->base_server, c->pool))) {
         MPLOG_ERROR(c->base_server, "context initialization failed");
@@ -448,6 +456,7 @@
     /* get HLL config */
     minfo = (modparrot_module_info *)modp->dynamic_load_handle;
     /* call meta handler */
+    MP_TRACE_h(c->base_server, "calling pre_connection_handler for %s", minfo->namespace); 
     if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace,
        "pre_connection_handler", &status)) {
         MPLOG_ERRORF(c->base_server,
@@ -463,6 +472,8 @@
 {
     modparrot_context *ctxp;
 
+    MP_TRACE_h(c->base_server, "in modparrot_process_connection_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(c->base_server, c->pool))) {
         MPLOG_ERROR(c->base_server, "context initialization failed");
@@ -488,6 +499,8 @@
     Parrot_PMC sub;
     int status;
 
+    MP_TRACE_h(c->base_server, "in modparrot_meta_process_connection_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(c->base_server, c->pool))) {
         MPLOG_ERROR(c->base_server, "context initialization failed");
@@ -506,6 +519,7 @@
     /* get HLL config */
     minfo = (modparrot_module_info *)modp->dynamic_load_handle;
     /* call meta handler */
+    MP_TRACE_h(c->base_server, "calling process_connection_handler for %s", minfo->namespace); 
     if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace,
        "process_connection_handler", &status)) {
         MPLOG_ERRORF(c->base_server,
@@ -522,6 +536,8 @@
 {
     modparrot_context *ctxp;
 
+    MP_TRACE_h(s, "in modparrot_child_init_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(s, NULL))) {
         MPLOG_ERROR(s, "context initialization failed");
@@ -556,6 +572,8 @@
     Parrot_PMC sub;
     int status;
 
+    MP_TRACE_h(s, "in modparrot_meta_child_init_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(s, NULL))) {
         MPLOG_ERROR(s, "context initialization failed");
@@ -575,6 +593,7 @@
     /* get HLL config */
     minfo = (modparrot_module_info *)modp->dynamic_load_handle;
     /* call meta handler */
+    MP_TRACE_h(s, "calling child_init_handler for %s", minfo->namespace);
     if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace,
        "child_init_handler", &status)) {
         MPLOG_ERRORF(s, "no child_init metahandler found for module '%s'",
@@ -589,6 +608,8 @@
 {
     modparrot_context *ctxp;
 
+    MP_TRACE_h(s, "in modparrot_post_config_handler");
+
     /* add our version component */
     ap_add_version_component(pconf, "mod_parrot/" MODPARROT_VERSION);
 
@@ -618,6 +639,8 @@
     Parrot_PMC sub;
     int status;
 
+    MP_TRACE_h(s, "in modparrot_meta_post_config_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(s, ptemp))) {
         MPLOG_ERROR(s, "context initialization failed");
@@ -639,6 +662,7 @@
     /* get HLL config */
     minfo = (modparrot_module_info *)modp->dynamic_load_handle;
     /* call meta handler */
+    MP_TRACE_h(s, "calling post_config_handler for %s", minfo->namespace);
     if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace,
        "post_config_handler", &status)) {
         MPLOG_ERRORF(s, "no post_config metahandler found for module '%s'",
@@ -658,6 +682,7 @@
     Parrot_Interp parent_interp;
     server_rec *vs;
 
+    MP_TRACE_h(s, "in modparrot_open_logs_handler");
     /* get apache configs */
     mpcfg = ap_get_module_config(s->module_config, &parrot_module);
 
@@ -735,6 +760,8 @@
     Parrot_PMC sub;
     int status;
 
+    MP_TRACE_h(s, "in modparrot_meta_open_logs_handler");
+
     /* initialize context */
     if (!(ctxp = init_ctx(s, ptemp))) {
         MPLOG_ERROR(s, "context initialization failed");
@@ -756,6 +783,7 @@
     /* get HLL config */
     minfo = (modparrot_module_info *)modp->dynamic_load_handle;
     /* call meta handler */
+    MP_TRACE_h(s, "calling open_logs_handler for %s", minfo->namespace);
     if (!modparrot_call_meta_handler(ctxp->interp, minfo->namespace,
        "open_logs_handler", &status)) {
         MPLOG_ERRORF(s, "no open_logs metahandler found for module '%s'",
@@ -769,6 +797,8 @@
 
 static void register_hooks(apr_pool_t *p)
 {
+    MP_TRACE_h(base_server, "in register_hooks");
+
     /* this allows <IfDefine MODPARROT> blocks */
     *(char **)apr_array_push(ap_server_config_defines) =
         (char *)apr_pstrdup(p, "MODPARROT");