Author: stevehay
Date: Thu Oct 31 23:46:34 2013
New Revision: 1537767
URL: http://svn.apache.org/r1537767
Log:
Merged revision(s) 672234 from perl/modperl/branches/threading:
remove trailing \n from MP_TRACE output because modperl_trace appends a \n by
itself
........
Modified:
perl/modperl/branches/httpd24threading/ (props changed)
perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_cmd.c
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_handler.c
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_module.c
Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
Merged /perl/modperl/branches/threading:r672234
Modified: perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/mod_perl.c Thu Oct
31 23:46:34 2013
@@ -1088,7 +1088,7 @@ int modperl_response_handler_cgi(request
#ifdef USE_ITHREADS
interp = modperl_interp_select(r, r->connection, r->server);
- MP_TRACE_i(MP_FUNC, "just selected: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "just selected: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
aTHX = interp->perl;
#endif
@@ -1124,7 +1124,7 @@ int modperl_response_handler_cgi(request
FREETMPS;LEAVE;
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
#endif
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_callback.c
Thu Oct 31 23:46:34 2013
@@ -186,7 +186,7 @@ int modperl_callback_run_handlers(int id
#ifdef USE_ITHREADS
if (r || c) {
interp = modperl_interp_select(r, c, s);
- MP_TRACE_i(MP_FUNC, "just selected: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "just selected: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
aTHX = interp->perl;
/* if you ask why PERL_SET_CONTEXT is omitted here the answer is
@@ -352,7 +352,7 @@ int modperl_callback_run_handlers(int id
#ifdef USE_ITHREADS
if (r || c) {
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
}
Modified: perl/modperl/branches/httpd24threading/src/modules/perl/modperl_cmd.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_cmd.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_cmd.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_cmd.c Thu
Oct 31 23:46:34 2013
@@ -71,13 +71,13 @@ char *modperl_cmd_push_filter_handlers(M
MP_TRACE_h(MP_FUNC,
"warning: filter handler %s will be not autoloaded. "
"Unless the module defining this handler is explicitly "
- "preloaded, filter attributes will be ignored.\n");
+ "preloaded, filter attributes will be ignored.");
}
else {
MpHandlerAUTOLOAD_On(h);
MP_TRACE_h(MP_FUNC,
"filter handler %s will be autoloaded (to make "
- "the filter attributes available)\n", h->name);
+ "the filter attributes available)", h->name);
}
if (!*handlers) {
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_handler.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_handler.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_handler.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_handler.c
Thu Oct 31 23:46:34 2013
@@ -221,7 +221,7 @@ int modperl_handler_resolve(pTHX_ modper
MP_TRACE_h(MP_FUNC,
"[%s] handler %s hasn't yet been resolved, "
- "attempting to resolve using %s pool 0x%lx\n",
+ "attempting to resolve using %s pool 0x%lx",
modperl_server_desc(s, p),
modperl_handler_name(handler),
duped ? "current" : "server conf",
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
Thu Oct 31 23:46:34 2013
@@ -271,7 +271,7 @@ void modperl_interp_init(server_rec *s,
#ifdef MP_TRACE
static apr_status_t modperl_interp_pool_cleanup(void *data)
{
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
data, ((modperl_interp_t*)data)->refcnt);
return modperl_interp_unselect(data);
@@ -286,7 +286,7 @@ apr_status_t modperl_interp_unselect(voi
if (interp == mip->parent) return APR_SUCCESS;
ap_assert(interp && MpInterpIN_USE(interp));
- MP_TRACE_i(MP_FUNC, "unselect(interp=0x%lx): refcnt=%d\n",
+ MP_TRACE_i(MP_FUNC, "unselect(interp=0x%lx): refcnt=%d",
(unsigned long)interp, interp->refcnt);
if (interp->refcnt != 0) {
--interp->refcnt;
@@ -302,7 +302,7 @@ apr_status_t modperl_interp_unselect(voi
modperl_tipool_putback_data(mip->tipool, data, interp->num_requests);
- MP_TRACE_i(MP_FUNC, "interp=0x%lx freed, tipool(size=%ld, in_use=%ld)\n",
+ MP_TRACE_i(MP_FUNC, "interp=0x%lx freed, tipool(size=%ld, in_use=%ld)",
(unsigned long)interp, mip->tipool->size, mip->tipool->in_use);
return APR_SUCCESS;
@@ -440,7 +440,7 @@ modperl_interp_t *modperl_interp_select(
ccfg->interp->refcnt++;
MP_TRACE_i(MP_FUNC,
- "found interp 0x%lx in con config, refcnt incremented to
%d\n",
+ "found interp 0x%lx in con config, refcnt incremented to
%d",
(unsigned long)ccfg->interp, ccfg->interp->refcnt);
/* set context (THX) for this thread */
PERL_SET_CONTEXT(ccfg->interp->perl);
@@ -465,7 +465,7 @@ modperl_interp_t *modperl_interp_select(
interp->ccfg = ccfg;
MP_TRACE_i(MP_FUNC,
- "pulled interp 0x%lx from mip, num_requests is %d\n",
+ "pulled interp 0x%lx from mip, num_requests is %d",
(unsigned long)interp, interp->num_requests);
/*
@@ -521,7 +521,7 @@ modperl_interp_t *modperl_interp_select(
interp->refcnt++;
MP_TRACE_i(MP_FUNC,
- "registered unselect cleanup for interp 0x%lx in %s\n",
+ "registered unselect cleanup for interp 0x%lx in %s",
(unsigned long)interp, desc);
}
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_module.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_module.c?rev=1537767&r1=1537766&r2=1537767&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_module.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_module.c
Thu Oct 31 23:46:34 2013
@@ -193,7 +193,7 @@ static void *modperl_module_config_merge
if (!base_obj || (base_obj == add_obj)) {
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
MP_PERL_CONTEXT_RESTORE;
@@ -247,7 +247,7 @@ static void *modperl_module_config_merge
}
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
MP_PERL_CONTEXT_RESTORE;
@@ -419,7 +419,7 @@ static const char *modperl_module_cmd_ta
if (errmsg) {
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
#endif
@@ -444,7 +444,7 @@ static const char *modperl_module_cmd_ta
parms, &srv_obj);
if (errmsg) {
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
#endif
@@ -490,7 +490,7 @@ static const char *modperl_module_cmd_ta
}
#ifdef USE_ITHREADS
- MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+ MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
interp, interp->refcnt);
modperl_interp_unselect(interp);
#endif
@@ -873,7 +873,7 @@ const char *modperl_module_add(apr_pool_
*/
if (!modperl_interp_pool_get(p)) {
/* for vhosts */
- MP_TRACE_i(MP_FUNC, "set interp 0x%lx in pconf pool 0x%lx\n",
+ MP_TRACE_i(MP_FUNC, "set interp 0x%lx in pconf pool 0x%lx",
(unsigned long)scfg->mip->parent, (unsigned long)p);
modperl_interp_pool_set(p, scfg->mip->parent);
}
