Corrections to mistakes that I made in the course of merging everything from threading that wasn't already in httpd24 into this httpd24threading branch. I hope I have it correct now, but it wasn't an easy merge and there may still be mistakes. These all came to light in the course of building the new branch. More may come to light when I actually get it running.

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/httpd24threading@1538005 13f79535-47bb-0310-9956-ffa450edef68

Author: Steve Hay

src/modules/perl/mod_perl.c

@@ -394,7 +394,7 @@ int modperl_init_vhost(server_rec *s, apr_pool_t *p,
     }
 
     PERL_SET_CONTEXT(perl);
-    MP_THX_INTERP_SET(perl, base_scfg->mip->parent);
+    modperl_thx_interp_set(perl, base_scfg->mip->parent);
 
 #endif /* USE_ITHREADS */
 
@@ -470,7 +470,7 @@ void modperl_init(server_rec *base_server, apr_pool_t *p)
     /* after other parent perls were started in vhosts, make sure that
      * the context is set to the base_perl */
     PERL_SET_CONTEXT(base_perl);
-    MP_THX_INTERP_SET(base_perl, base_scfg->mip->parent);
+    modperl_thx_interp_set(base_perl, base_scfg->mip->parent);
 #endif
 
 }

src/modules/perl/modperl_config.h

@@ -62,9 +62,9 @@ void modperl_set_perl_module_config(ap_conf_vector_t *cv, void *cfg);
 
 #if defined(MP_IN_XS) && defined(WIN32)
 #   define modperl_get_module_config(v)         \
-    modperl_get_perl_module_config(v)
+    modperl_get_perl_module_config((v))
 
-#   define modperl_set_module_config((v), c)      \
+#   define modperl_set_module_config(v, c)      \
     modperl_set_perl_module_config((v), (c))
 #else
 #   define modperl_get_module_config(v)         \
@@ -95,7 +95,7 @@ void modperl_set_perl_module_config(ap_conf_vector_t *cv, void *cfg);
 
 #define modperl_config_con_get(c)                               \
     (c ? (modperl_config_con_t *)                               \
-     modperl_get_module_config((C)->conn_config) : NULL)
+     modperl_get_module_config((c)->conn_config) : NULL)
 
 #define MP_dCCFG \
     modperl_config_con_t *ccfg = modperl_config_con_get(c)

src/modules/perl/modperl_env.c

@@ -413,7 +413,6 @@ void modperl_env_request_tie(pTHX_ request_rec *r)
 #ifdef MP_PERL_HV_GMAGICAL_AWARE
     MP_TRACE_e(MP_FUNC, "[0x%lx] tie %%ENV, $r\t (%s%s)",
                modperl_interp_address(aTHX),
-               modperl_pid_tid(r->pool), modperl_interp_address(aTHX),
                modperl_server_desc(r->server, r->pool), r->uri);
     SvGMAGICAL_on((SV*)ENVHV);
 #endif
@@ -426,7 +425,6 @@ void modperl_env_request_untie(pTHX_ request_rec *r)
 #ifdef MP_PERL_HV_GMAGICAL_AWARE
     MP_TRACE_e(MP_FUNC, "[0x%lx] untie %%ENV; # from r\t (%s%s)",
                modperl_interp_address(aTHX),
-               modperl_pid_tid(r->pool), modperl_interp_address(aTHX),
                modperl_server_desc(r->server, r->pool), r->uri);
     SvGMAGICAL_off((SV*)ENVHV);
 #endif

src/modules/perl/modperl_interp.c

@@ -383,7 +383,7 @@ modperl_interp_t *modperl_interp_pool_select(apr_pool_t *p,
         /* set context (THX) for this thread */
         PERL_SET_CONTEXT(interp->perl);
         /* let the perl interpreter point back to its interp */
-        MP_THX_INTERP_SET(interp->perl, interp);
+        modperl_thx_interp_set(interp->perl, interp);
 
         return interp;
     }
@@ -422,7 +422,7 @@ modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
         /* XXX: if no VirtualHosts w/ PerlOptions +Parent we can skip this */
         PERL_SET_CONTEXT(interp->perl);
         /* let the perl interpreter point back to its interp */
-        MP_THX_INTERP_SET(interp->perl, interp);
+        modperl_thx_interp_set(interp->perl, interp);
 
         MP_TRACE_i(MP_FUNC,
                    "using parent 0x%pp (perl=0x%pp) for %s:%d refcnt set to %d",
@@ -442,7 +442,7 @@ modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
                    (unsigned long)ccfg->interp, ccfg->interp->refcnt);
         /* set context (THX) for this thread */
         PERL_SET_CONTEXT(ccfg->interp->perl);
-        /* MP_THX_INTERP_SET is not called here because the interp
+        /* modperl_thx_interp_set() is not called here because the interp
          * already belongs to the perl interpreter
          */
         return ccfg->interp;
@@ -458,7 +458,7 @@ modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
     /* set context (THX) for this thread */
     PERL_SET_CONTEXT(interp->perl);
     /* let the perl interpreter point back to its interp */
-    MP_THX_INTERP_SET(interp->perl, interp);
+    modperl_thx_interp_set(interp->perl, interp);
 
     /* make sure ccfg is initialized */
     modperl_config_con_init(c, ccfg);

src/modules/perl/modperl_module.c

@@ -356,13 +356,12 @@ static const char *modperl_module_cmd_take123(cmd_parms *parms,
     modperl_module_info_t *minfo = MP_MODULE_INFO(info->modp);
     modperl_module_cfg_t *srv_cfg;
     int modules_alias = 0;
-
-    MP_dINTERP_POOLa(p, s);
-
     int count;
-    PTR_TBL_t *table = modperl_module_config_table_get(aTHX_ TRUE);
+    PTR_TBL_t *table;
     SV *obj = (SV *)NULL;
-    dSP;
+    MP_dINTERP_POOLa(p, s);
+
+    table = modperl_module_config_table_get(aTHX_ TRUE);
 
     if (s->is_virtual) {
         MP_dSCFG(s);
@@ -438,32 +437,35 @@ static const char *modperl_module_cmd_take123(cmd_parms *parms,
         }
     }
 
-    ENTER;SAVETMPS;
-    PUSHMARK(SP);
-    EXTEND(SP, 2);
+    {
+        dSP;
+        ENTER;SAVETMPS;
+        PUSHMARK(SP);
+        EXTEND(SP, 2);
 
-    PUSHs(obj);
-    PUSHs(modperl_bless_cmd_parms(parms));
+        PUSHs(obj);
+        PUSHs(modperl_bless_cmd_parms(parms));
 
-    if (cmd->args_how != NO_ARGS) {
-        PUSH_STR_ARG(one);
-        PUSH_STR_ARG(two);
-        PUSH_STR_ARG(three);
-    }
+        if (cmd->args_how != NO_ARGS) {
+            PUSH_STR_ARG(one);
+            PUSH_STR_ARG(two);
+            PUSH_STR_ARG(three);
+        }
 
-    PUTBACK;
-    count = call_method(info->func_name, G_EVAL|G_SCALAR);
-    SPAGAIN;
+        PUTBACK;
+        count = call_method(info->func_name, G_EVAL|G_SCALAR);
+        SPAGAIN;
 
-    if (count == 1) {
-        SV *sv = POPs;
-        if (SvPOK(sv) && strEQ(SvPVX(sv), DECLINE_CMD)) {
-            retval = DECLINE_CMD;
+        if (count == 1) {
+            SV *sv = POPs;
+            if (SvPOK(sv) && strEQ(SvPVX(sv), DECLINE_CMD)) {
+                retval = DECLINE_CMD;
+            }
         }
-    }
 
-    PUTBACK;
-    FREETMPS;LEAVE;
+        PUTBACK;
+        FREETMPS;LEAVE;
+    }
 
     if (SvTRUE(ERRSV)) {
         retval = SvPVX(ERRSV);
@@ -777,11 +779,12 @@ const char *modperl_module_add(apr_pool_t *p, server_rec *s,
                                const char *name, SV *mod_cmds)
 {
     MP_dSCFG(s);
-    MP_dINTERPa(NULL, NULL, s);
     const char *errmsg;
-    module *modp = (module *)apr_pcalloc(p, sizeof(*modp));
-    modperl_module_info_t *minfo =
-        (modperl_module_info_t *)apr_pcalloc(p, sizeof(*minfo));
+    module *modp;
+    modperl_module_info_t *minfo;
+    MP_dINTERPa(NULL, NULL, s);
+    modp = (module *)apr_pcalloc(p, sizeof(*modp));
+    minfo = (modperl_module_info_t *)apr_pcalloc(p, sizeof(*minfo));
 
     /* STANDARD20_MODULE_STUFF */
     modp->version       = MODULE_MAGIC_NUMBER_MAJOR;