perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r672234 - in /perl/modperl/branches/threading: lib/ModPerl/ src/modules/perl/ xs/APR/PerlIO/ xs/Apache2/Filter/ xs/Apache2/MPM/
Date Fri, 27 Jun 2008 10:21:36 GMT
Author: torsten
Date: Fri Jun 27 03:21:35 2008
New Revision: 672234

URL: http://svn.apache.org/viewvc?rev=672234&view=rev
Log:
remove trailing \n from MP_TRACE output because modperl_trace appends a \n by itself

Modified:
    perl/modperl/branches/threading/lib/ModPerl/Code.pm
    perl/modperl/branches/threading/src/modules/perl/mod_perl.c
    perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c
    perl/modperl/branches/threading/src/modules/perl/modperl_callback.c
    perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c
    perl/modperl/branches/threading/src/modules/perl/modperl_config.c
    perl/modperl/branches/threading/src/modules/perl/modperl_debug.c
    perl/modperl/branches/threading/src/modules/perl/modperl_filter.c
    perl/modperl/branches/threading/src/modules/perl/modperl_global.c
    perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
    perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
    perl/modperl/branches/threading/src/modules/perl/modperl_io.c
    perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c
    perl/modperl/branches/threading/src/modules/perl/modperl_module.c
    perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
    perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c
    perl/modperl/branches/threading/src/modules/perl/modperl_time.h
    perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c
    perl/modperl/branches/threading/src/modules/perl/modperl_tipool.h
    perl/modperl/branches/threading/src/modules/perl/modperl_util.c
    perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c
    perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h
    perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h

Modified: perl/modperl/branches/threading/lib/ModPerl/Code.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/ModPerl/Code.pm?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/ModPerl/Code.pm (original)
+++ perl/modperl/branches/threading/lib/ModPerl/Code.pm Fri Jun 27 03:21:35 2008
@@ -380,7 +380,7 @@
                            "$h_name is disabled for server ",
                            parms->server->server_hostname, NULL);
     }
-    MP_TRACE_d(MP_FUNC, "push \@%s, %s\\n", parms->cmd->name, arg);
+    MP_TRACE_d(MP_FUNC, "push \@%s, %s", parms->cmd->name, arg);
     return $cmd_push(&($av), arg, parms->pool);
 }
 EOF

Modified: perl/modperl/branches/threading/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/mod_perl.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/mod_perl.c Fri Jun 27 03:21:35 2008
@@ -61,7 +61,7 @@
 
     handles = modperl_xs_dl_handles_get(aTHX);
 
-    MP_TRACE_i(MP_FUNC, "destroying interpreter=0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "destroying interpreter=0x%lx",
                (unsigned long)perl);
 
     modperl_perl_destruct(perl);
@@ -217,11 +217,11 @@
         const char *desc = modperl_server_desc(s, p);
         if (base_server == s) {
             MP_TRACE_i(MP_FUNC,
-                       "starting the parent perl for the base server\n", desc);
+                       "starting the parent perl for the base server", desc);
         }
         else {
             MP_TRACE_i(MP_FUNC,
-                       "starting the parent perl for vhost %s\n", desc);
+                       "starting the parent perl for vhost %s", desc);
         }
     }
 #endif
@@ -292,7 +292,7 @@
 
     set_taint_var(perl);
 
-    MP_TRACE_i(MP_FUNC, "constructed interpreter=0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "constructed interpreter=0x%lx",
                (unsigned long)perl);
 
 #ifdef MP_USE_GTOP
@@ -351,7 +351,7 @@
     const char *vhost = modperl_server_desc(s, p);
 
     if (!scfg) {
-        MP_TRACE_i(MP_FUNC, "server %s has no mod_perl config\n", vhost);
+        MP_TRACE_i(MP_FUNC, "server %s has no mod_perl config", vhost);
         return OK;
     }
 
@@ -359,11 +359,11 @@
         base_server = modperl_global_get_server_rec();
     }
 
-    MP_TRACE_i(MP_FUNC, "Init vhost %s: s=0x%lx, base_s=0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "Init vhost %s: s=0x%lx, base_s=0x%lx",
                vhost, s, base_server);
 
     if (base_server == s) {
-        MP_TRACE_i(MP_FUNC, "base server is not vhost, skipping %s\n",
+        MP_TRACE_i(MP_FUNC, "base server is not vhost, skipping %s",
                    vhost);
         return OK;
     }
@@ -379,14 +379,14 @@
 #ifdef USE_ITHREADS
 
     if (scfg->mip) {
-        MP_TRACE_i(MP_FUNC, "server %s already initialized\n", vhost);
+        MP_TRACE_i(MP_FUNC, "server %s already initialized", vhost);
         return OK;
     }
 
     /* the base server could have mod_perl callbacks disabled, but it
      * still needs perl to drive the vhosts */
     if (!MpSrvENABLE(scfg) && s->is_virtual) {
-        MP_TRACE_i(MP_FUNC, "mod_perl disabled for server %s\n", vhost);
+        MP_TRACE_i(MP_FUNC, "mod_perl disabled for server %s", vhost);
         scfg->mip = NULL;
         return OK;
     }
@@ -402,7 +402,7 @@
     if (MpSrvPARENT(scfg)) {
         perl = modperl_startup(s, p);
         MP_TRACE_i(MP_FUNC,
-                   "created parent interpreter for VirtualHost %s\n",
+                   "created parent interpreter for VirtualHost %s",
                    modperl_server_desc(s, p));
     }
     else {
@@ -428,7 +428,7 @@
          * need to point to the base mip here if this vhost
          * doesn't have its own
          */
-        MP_TRACE_i(MP_FUNC, "%s mip inherited from %s\n",
+        MP_TRACE_i(MP_FUNC, "%s mip inherited from %s",
                    vhost, modperl_server_desc(base_server, p));
         scfg->mip = base_scfg->mip;
     }
@@ -493,7 +493,7 @@
 #endif /* MP_TRACE */
 
     if (!modperl_threaded_mpm()) {
-        MP_TRACE_i(MP_FUNC, "no clones created for non-threaded mpm\n");
+        MP_TRACE_i(MP_FUNC, "no clones created for non-threaded mpm");
         return;
     }
 
@@ -502,7 +502,7 @@
 #ifdef MP_TRACE
         char *name = modperl_server_desc(s, p);
 
-        MP_TRACE_i(MP_FUNC, "PerlInterpScope set to %s for %s\n",
+        MP_TRACE_i(MP_FUNC, "PerlInterpScope set to %s for %s",
                    modperl_interp_scope_desc(scfg->interp_scope), name);
 #else
         char *name = NULL;
@@ -512,18 +512,18 @@
 #ifdef MP_TRACE
             if (scfg->mip == base_scfg->mip) {
                 MP_TRACE_i(MP_FUNC,
-                           "%s interp pool inherited from %s\n",
+                           "%s interp pool inherited from %s",
                            name, base_name);
             }
             else {
                 MP_TRACE_i(MP_FUNC,
-                           "%s interp pool already initialized\n",
+                           "%s interp pool already initialized",
                            name);
             }
 #endif /* MP_TRACE */
         }
         else {
-            MP_TRACE_i(MP_FUNC, "initializing interp pool for %s\n",
+            MP_TRACE_i(MP_FUNC, "initializing interp pool for %s",
                        name);
             modperl_tipool_init(scfg->mip->tipool);
         }
@@ -535,7 +535,7 @@
 {
     ap_mpm_query(AP_MPMQ_IS_THREADED, &MP_threaded_mpm);
 
-    MP_TRACE_g(MP_FUNC, "mod_perl globals are configured\n");
+    MP_TRACE_g(MP_FUNC, "mod_perl globals are configured");
 
     modperl_global_init_pconf(pconf, pconf);
     modperl_global_init_server_rec(pconf, s);
@@ -555,7 +555,7 @@
     int argc = 0;
     char **argv = NULL, **env = NULL;
 
-    MP_TRACE_i(MP_FUNC, "mod_perl sys init\n");
+    MP_TRACE_i(MP_FUNC, "mod_perl sys init");
 
     /* not every OS uses those vars in PERL_SYS_INIT3 macro */
     argc = argc; argv = argv; env = env;
@@ -596,7 +596,7 @@
 
     MP_PERL_FREE_THREAD_KEY_WORKAROUND;
 
-    MP_TRACE_i(MP_FUNC, "mod_perl sys term\n");
+    MP_TRACE_i(MP_FUNC, "mod_perl sys term");
 
     modperl_env_unload();
 
@@ -1081,7 +1081,7 @@
 
 #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
@@ -1117,7 +1117,7 @@
     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/threading/src/modules/perl/modperl_bucket.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c Fri Jun 27 03:21:35 2008
@@ -53,12 +53,12 @@
     dTHXa(svbucket->perl);
 
     if (!apr_bucket_shared_destroy(svbucket)) {
-        MP_TRACE_f(MP_FUNC, "bucket refcnt=%d\n",
+        MP_TRACE_f(MP_FUNC, "bucket refcnt=%d",
                    ((apr_bucket_refcount *)svbucket)->refcount);
         return;
     }
 
-    MP_TRACE_f(MP_FUNC, "sv=0x%lx, refcnt=%d\n",
+    MP_TRACE_f(MP_FUNC, "sv=0x%lx, refcnt=%d",
                (unsigned long)svbucket->sv, SvREFCNT(svbucket->sv));
 
     SvREFCNT_dec(svbucket->sv);
@@ -139,7 +139,7 @@
         (void)SvREFCNT_inc(svbucket->sv);
     }
 
-    MP_TRACE_f(MP_FUNC, "sv=0x%lx, refcnt=%d\n",
+    MP_TRACE_f(MP_FUNC, "sv=0x%lx, refcnt=%d",
                (unsigned long)svbucket->sv, SvREFCNT(svbucket->sv));
 
     bucket->type = &modperl_bucket_sv_type;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_callback.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_callback.c Fri Jun 27 03:21:35 2008
@@ -88,7 +88,7 @@
                 name = handler->name;
             }
 
-            MP_TRACE_h(MP_FUNC, "[%s] lookup of %s failed\n",
+            MP_TRACE_h(MP_FUNC, "[%s] lookup of %s failed",
                        modperl_server_desc(s, p), name);
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                          "lookup of '%s' failed", name);
@@ -162,7 +162,7 @@
     AV *av_args = Nullav;
 
     if (!MpSrvENABLE(scfg)) {
-        MP_TRACE_h(MP_FUNC, "PerlOff for server %s:%u\n",
+        MP_TRACE_h(MP_FUNC, "PerlOff for server %s:%u",
                    s->server_hostname, s->port);
         return DECLINED;
     }
@@ -178,7 +178,7 @@
                                           type, idx, FALSE, &desc);
 
     if (!(avp && (av = *avp))) {
-        MP_TRACE_h(MP_FUNC, "no %s handlers configured (%s)\n",
+        MP_TRACE_h(MP_FUNC, "no %s handlers configured (%s)",
                    desc, r ? r->uri : "");
         return DECLINED;
     }
@@ -186,7 +186,7 @@
 #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
@@ -248,13 +248,13 @@
 
     modperl_callback_current_callback_set(desc);
 
-    MP_TRACE_h(MP_FUNC, "running %d %s handlers\n", av->nelts, desc);
+    MP_TRACE_h(MP_FUNC, "running %d %s handlers", av->nelts, desc);
     handlers = (modperl_handler_t **)av->elts;
 
     for (i=0; i<av->nelts; i++) {
         status = modperl_callback(aTHX_ handlers[i], p, r, s, av_args);
 
-        MP_TRACE_h(MP_FUNC, "callback '%s' returned %d\n",
+        MP_TRACE_h(MP_FUNC, "callback '%s' returned %d",
                    modperl_handler_name(handlers[i]), status);
 
         /* follow Apache's lead and let OK terminate the phase for
@@ -292,7 +292,7 @@
 #ifdef MP_TRACE
                 if (i+1 != av->nelts) {
                     MP_TRACE_h(MP_FUNC, "error status %d leaves %d "
-                               "uncalled %s handlers\n",
+                               "uncalled %s handlers",
                                status, av->nelts-i-1, desc);
                 }
 #endif
@@ -309,7 +309,7 @@
 #ifdef MP_TRACE
                 if (i+1 != av->nelts) {
                     MP_TRACE_h(MP_FUNC, "OK ends the %s stack, "
-                               "leaving %d uncalled %s handlers\n",
+                               "leaving %d uncalled %s handlers",
                                desc, av->nelts-i-1, desc);
                 }
 #endif
@@ -320,7 +320,7 @@
 #ifdef MP_TRACE
                 if (i+1 != av->nelts) {
                     MP_TRACE_h(MP_FUNC, "error status %d leaves %d "
-                               "uncalled %s handlers\n",
+                               "uncalled %s handlers",
                                status, av->nelts-i-1, desc);
                 }
 #endif
@@ -352,7 +352,7 @@
 
 #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/threading/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c Fri Jun 27 03:21:35 2008
@@ -47,13 +47,13 @@
 
     if (!*handlers) {
         *handlers = modperl_handler_array_new(p);
-        MP_TRACE_d(MP_FUNC, "created handler stack\n");
+        MP_TRACE_d(MP_FUNC, "created handler stack");
     }
 
     /* XXX parse_handler if Perl is running */
 
     modperl_handler_array_push(*handlers, h);
-    MP_TRACE_d(MP_FUNC, "pushed handler: %s\n", h->name);
+    MP_TRACE_d(MP_FUNC, "pushed handler: %s", h->name);
 
     return NULL;
 }
@@ -71,22 +71,22 @@
         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) {
         *handlers = modperl_handler_array_new(p);
-        MP_TRACE_d(MP_FUNC, "created handler stack\n");
+        MP_TRACE_d(MP_FUNC, "created handler stack");
     }
 
     modperl_handler_array_push(*handlers, h);
-    MP_TRACE_d(MP_FUNC, "pushed httpd filter handler: %s\n", h->name);
+    MP_TRACE_d(MP_FUNC, "pushed httpd filter handler: %s", h->name);
 
     return NULL;
 }
@@ -105,18 +105,18 @@
 
     if (!*handlers) {
         *handlers = modperl_handler_array_new(p);
-        MP_TRACE_d(MP_FUNC, "created handler stack\n");
+        MP_TRACE_d(MP_FUNC, "created handler stack");
     }
 
     modperl_handler_array_push(*handlers, h);
-    MP_TRACE_d(MP_FUNC, "pushed httpd filter handler: %s\n", h->name);
+    MP_TRACE_d(MP_FUNC, "pushed httpd filter handler: %s", h->name);
 
     return NULL;
 }
 
 
 #define MP_CMD_SRV_TRACE \
-    MP_TRACE_d(MP_FUNC, "%s %s\n", parms->cmd->name, arg)
+    MP_TRACE_d(MP_FUNC, "%s %s", parms->cmd->name, arg)
 
 #define MP_CMD_SRV_CHECK \
 MP_CMD_SRV_TRACE; \
@@ -154,7 +154,7 @@
     if (modperl_vhost_is_running(s)) {
         return modperl_cmd_too_late(parms);
     }
-    MP_TRACE_d(MP_FUNC, "arg = %s\n", arg);
+    MP_TRACE_d(MP_FUNC, "arg = %s", arg);
 
     if (!strncasecmp(arg, "+inherit", 8)) {
         modperl_cmd_options(parms, mconfig, "+InheritSwitches");
@@ -182,7 +182,7 @@
     if (modperl_is_running()) {
         char *error = NULL;
 
-        MP_TRACE_d(MP_FUNC, "load PerlModule %s\n", arg);
+        MP_TRACE_d(MP_FUNC, "load PerlModule %s", arg);
 
         MP_PERL_CONTEXT_STORE_OVERRIDE(scfg->mip->parent->perl);
         if (!modperl_require_module(aTHX_ arg, FALSE)) {
@@ -197,7 +197,7 @@
         return error;
     }
     else {
-        MP_TRACE_d(MP_FUNC, "push PerlModule %s\n", arg);
+        MP_TRACE_d(MP_FUNC, "push PerlModule %s", arg);
         *(const char **)apr_array_push(scfg->PerlModule) = arg;
         return NULL;
     }
@@ -220,7 +220,7 @@
     if (modperl_is_running()) {
         char *error = NULL;
 
-        MP_TRACE_d(MP_FUNC, "load PerlRequire %s\n", arg);
+        MP_TRACE_d(MP_FUNC, "load PerlRequire %s", arg);
 
         MP_PERL_CONTEXT_STORE_OVERRIDE(scfg->mip->parent->perl);
         if (!modperl_require_file(aTHX_ arg, FALSE)) {
@@ -235,7 +235,7 @@
         return error;
     }
     else {
-        MP_TRACE_d(MP_FUNC, "push PerlRequire %s\n", arg);
+        MP_TRACE_d(MP_FUNC, "push PerlRequire %s", arg);
         *(const char **)apr_array_push(scfg->PerlRequire) = arg;
         return NULL;
     }
@@ -259,7 +259,7 @@
     MP_dSCFG(parms->server);
 
     modperl_require_file_t *require = apr_pcalloc(p, sizeof(*require));
-    MP_TRACE_d(MP_FUNC, "push PerlPostConfigRequire for %s\n", arg);
+    MP_TRACE_d(MP_FUNC, "push PerlPostConfigRequire for %s", arg);
     require->file = arg;
     require->dcfg = dcfg;
 
@@ -293,7 +293,7 @@
 {
     varfunc(dcfg->configvars, dcfg->setvars, arg1, arg2);
 
-    MP_TRACE_d(MP_FUNC, "%s DIR: arg1 = %s, arg2 = %s\n",
+    MP_TRACE_d(MP_FUNC, "%s DIR: arg1 = %s, arg2 = %s",
                parms->cmd->name, arg1, arg2);
 
     /* make available via Apache2->server->dir_config */
@@ -301,7 +301,7 @@
         MP_dSCFG(parms->server);
         varfunc(scfg->configvars, scfg->setvars, arg1, arg2);
 
-        MP_TRACE_d(MP_FUNC, "%s SRV: arg1 = %s, arg2 = %s\n",
+        MP_TRACE_d(MP_FUNC, "%s SRV: arg1 = %s, arg2 = %s",
                    parms->cmd->name, arg1, arg2);
     }
 
@@ -333,7 +333,7 @@
     modperl_str_toupper((char *)arg1);
 #endif
 
-    MP_TRACE_d(MP_FUNC, "arg1 = %s, arg2 = %s\n", arg1, arg2);
+    MP_TRACE_d(MP_FUNC, "arg1 = %s, arg2 = %s", arg1, arg2);
 
     if (!parms->path) {
         /* will be propagated to environ */
@@ -373,10 +373,10 @@
             modperl_env_hv_store(aTHX_ arg, val);
             MP_PERL_CONTEXT_RESTORE;
         }
-        MP_TRACE_d(MP_FUNC, "arg = %s, val = %s\n", arg, val);
+        MP_TRACE_d(MP_FUNC, "arg = %s, val = %s", arg, val);
     }
     else {
-        MP_TRACE_d(MP_FUNC, "arg = %s: not found via getenv()\n", arg);
+        MP_TRACE_d(MP_FUNC, "arg = %s: not found via getenv()", arg);
     }
 
     return NULL;
@@ -391,7 +391,7 @@
     apr_pool_t *p = parms->temp_pool;
     const char *error;
 
-    MP_TRACE_d(MP_FUNC, "arg = %s\n", arg);
+    MP_TRACE_d(MP_FUNC, "arg = %s", arg);
     if ((error = modperl_options_set(p, opts, arg)) && !is_per_dir) {
         /* maybe a per-directory option outside of a container */
         if (modperl_options_set(p, dcfg->flags, arg) == NULL) {
@@ -661,7 +661,7 @@
 {
     const char *errmsg;
 
-    MP_TRACE_d(MP_FUNC, "PerlLoadModule %s\n", arg);
+    MP_TRACE_d(MP_FUNC, "PerlLoadModule %s", arg);
 
     /* we must init earlier than normal */
     modperl_run();
@@ -823,7 +823,7 @@
     MP_dSCFG(parms->server); \
     int item = atoi(arg); \
     scfg->interp_pool_cfg->xitem = item; \
-    MP_TRACE_d(MP_FUNC, "%s %d\n", parms->cmd->name, item); \
+    MP_TRACE_d(MP_FUNC, "%s %d", parms->cmd->name, item); \
     return NULL; \
 }
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_config.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_config.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_config.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_config.c Fri Jun 27 03:21:35 2008
@@ -22,7 +22,7 @@
 
     dcfg->location = dir;
 
-    MP_TRACE_d(MP_FUNC, "dir %s\n", dir);
+    MP_TRACE_d(MP_FUNC, "dir %s", dir);
 
 #ifdef USE_ITHREADS
     /* defaults to per-server scope */
@@ -110,7 +110,7 @@
         *add  = (modperl_config_dir_t *)addv,
         *mrg  = modperl_config_dir_new(p);
 
-    MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
+    MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx",
                (unsigned long)basev, (unsigned long)addv,
                (unsigned long)mrg);
 
@@ -143,7 +143,7 @@
     modperl_config_req_t *rcfg =
         (modperl_config_req_t *)apr_pcalloc(r->pool, sizeof(*rcfg));
 
-    MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)rcfg);
+    MP_TRACE_d(MP_FUNC, "0x%lx", (unsigned long)rcfg);
 
     return rcfg;
 }
@@ -153,7 +153,7 @@
     modperl_config_con_t *ccfg =
         (modperl_config_con_t *)apr_pcalloc(c->pool, sizeof(*ccfg));
 
-    MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)ccfg);
+    MP_TRACE_d(MP_FUNC, "0x%lx", (unsigned long)ccfg);
 
     return ccfg;
 }
@@ -188,7 +188,7 @@
      * correctly connected to the real thing */
     modperl_config_srv_argv_push(s->process->argv[0]);
 
-    MP_TRACE_d(MP_FUNC, "new scfg: 0x%lx\n", (unsigned long)scfg);
+    MP_TRACE_d(MP_FUNC, "new scfg: 0x%lx", (unsigned long)scfg);
 
     return scfg;
 }
@@ -205,7 +205,7 @@
 
     dcfg->SetEnv = apr_table_make(p, 2);
 
-    MP_TRACE_d(MP_FUNC, "new dcfg: 0x%lx\n", (unsigned long)dcfg);
+    MP_TRACE_d(MP_FUNC, "new dcfg: 0x%lx", (unsigned long)dcfg);
 
     return dcfg;
 }
@@ -253,7 +253,7 @@
         modperl_init_globals(s, p);
     }
 
-    MP_TRACE_d(MP_FUNC, "p=0x%lx, s=0x%lx, virtual=%d\n",
+    MP_TRACE_d(MP_FUNC, "p=0x%lx, s=0x%lx, virtual=%d",
                p, s, s->is_virtual);
 
 #ifdef USE_ITHREADS
@@ -286,7 +286,7 @@
         *add  = (modperl_config_srv_t *)addv,
         *mrg  = modperl_config_srv_new(p, add->server);
 
-    MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
+    MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx",
                (unsigned long)basev, (unsigned long)addv,
                (unsigned long)mrg);
 
@@ -417,7 +417,7 @@
     entries = (char **)scfg->PerlModule->elts;
     for (i = 0; i < scfg->PerlModule->nelts; i++){
         if (modperl_require_module(aTHX_ entries[i], TRUE)){
-            MP_TRACE_d(MP_FUNC, "loaded Perl module %s for server %s\n",
+            MP_TRACE_d(MP_FUNC, "loaded Perl module %s for server %s",
                        entries[i], modperl_server_desc(s,p));
         }
         else {
@@ -442,7 +442,7 @@
     entries = (char **)scfg->PerlRequire->elts;
     for (i = 0; i < scfg->PerlRequire->nelts; i++){
         if (modperl_require_file(aTHX_ entries[i], TRUE)){
-            MP_TRACE_d(MP_FUNC, "loaded Perl file: %s for server %s\n",
+            MP_TRACE_d(MP_FUNC, "loaded Perl file: %s for server %s",
                        entries[i], modperl_server_desc(s,p));
         }
         else {
@@ -475,7 +475,7 @@
         MP_PERL_CONTEXT_RESTORE;
 
         if (retval) {
-            MP_TRACE_d(MP_FUNC, "loaded Perl file: %s for server %s\n",
+            MP_TRACE_d(MP_FUNC, "loaded Perl file: %s for server %s",
                        requires[i]->file, modperl_server_desc(s, p));
         }
         else {

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_debug.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_debug.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_debug.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_debug.c Fri Jun 27 03:21:35 2008
@@ -71,7 +71,7 @@
         MP_TRACE_g(MP_FUNC, "| %s => 0x%lx", key, val);
     }
 
-    MP_TRACE_g(MP_FUNC, "|-------- PL_modglobal --------\n");
+    MP_TRACE_g(MP_FUNC, "|-------- PL_modglobal --------");
 
 }
 #endif

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_filter.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_filter.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_filter.c Fri Jun 27 03:21:35 2008
@@ -105,7 +105,7 @@
     APR_BRIGADE_INSERT_TAIL(filter->bb_out, b);
     ((modperl_filter_ctx_t *)filter->f->ctx)->sent_eos = 1;
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "write out: EOS bucket\n", MP_FILTER_NAME(filter->f));
+               "write out: EOS bucket", MP_FILTER_NAME(filter->f));
     return APR_SUCCESS;
 }
 
@@ -115,7 +115,7 @@
     apr_bucket *b = apr_bucket_flush_create(ba);
     APR_BRIGADE_INSERT_TAIL(filter->bb_out, b);
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "write out: FLUSH bucket\n", MP_FILTER_NAME(filter->f));
+               "write out: FLUSH bucket", MP_FILTER_NAME(filter->f));
     return APR_SUCCESS;
 }
 
@@ -128,7 +128,7 @@
     APR_BRIGADE_INSERT_TAIL(bb, b);
     ((modperl_filter_ctx_t *)f->ctx)->sent_eos = 1;
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "write out: EOS bucket in separate bb\n", MP_FILTER_NAME(f));
+               "write out: EOS bucket in separate bb", MP_FILTER_NAME(f));
     return ap_pass_brigade(f->next, bb);
 }
 
@@ -140,7 +140,7 @@
     apr_bucket *b = apr_bucket_flush_create(ba);
     APR_BRIGADE_INSERT_TAIL(bb, b);
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "write out: FLUSH bucket in separate bb\n", MP_FILTER_NAME(f));
+               "write out: FLUSH bucket in separate bb", MP_FILTER_NAME(f));
     return ap_pass_brigade(f, bb);
 }
 
@@ -165,7 +165,7 @@
         const char *body;
         int status;
 
-        MP_TRACE_f(MP_FUNC, "\n\n\tparsing headers: %db [%s]\n", len,
+        MP_TRACE_f(MP_FUNC, "\n\n\tparsing headers: %db [%s]", len,
                    MP_TRACE_STR_TRUNC(wb->pool, buf, len));
 
         status = modperl_cgi_header_parse(r, (char *)buf, &len, &body);
@@ -210,7 +210,7 @@
     }
 
     MP_TRACE_f(MP_FUNC, "\n\n\twrite out: %db [%s]\n"
-               "\t\tfrom %s\n\t\tto %s filter handler\n",
+               "\t\tfrom %s\n\t\tto %s filter handler",
                len,
                MP_TRACE_STR_TRUNC(wb->pool, buf, len),
                ((wb->r && wb->filters == &wb->r->output_filters)
@@ -343,7 +343,7 @@
 
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
                "new: %s %s filter (modperl_filter_t *0x%lx), "
-               "f (ap_filter_t *0x%lx)\n",
+               "f (ap_filter_t *0x%lx)",
                MP_FILTER_NAME(f),
                MP_FILTER_TYPE(filter),
                MP_FILTER_MODE(filter),
@@ -404,7 +404,7 @@
         FREETMPS;LEAVE;
 
         if (init_handler) {
-            MP_TRACE_h(MP_FUNC, "found init handler %s\n",
+            MP_TRACE_h(MP_FUNC, "found init handler %s",
                        modperl_handler_name(init_handler));
 
             if (!init_handler->attrs & MP_FILTER_INIT_HANDLER) {
@@ -440,7 +440,7 @@
 
     MP_dINTERP_SELECT(r, c, s);
 
-    MP_TRACE_h(MP_FUNC, "running filter init handler %s\n",
+    MP_TRACE_h(MP_FUNC, "running filter init handler %s",
                modperl_handler_name(handler));
 
     modperl_handler_make_args(aTHX_ &args,
@@ -465,7 +465,7 @@
     MP_INTERP_PUTBACK(interp);
 
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "return: %d\n", modperl_handler_name(handler), status);
+               "return: %d", modperl_handler_name(handler), status);
 
     return status;
 }
@@ -572,7 +572,7 @@
     MP_INTERP_PUTBACK(interp);
 
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "return: %d\n", modperl_handler_name(handler), status);
+               "return: %d", modperl_handler_name(handler), status);
 
     return status;
 }
@@ -601,7 +601,7 @@
 {
     if (!filter->bb_in || MP_FILTER_EMPTY(filter)) {
         MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-                   "read in: bucket brigade is empty\n",
+                   "read in: bucket brigade is empty",
                    MP_FILTER_NAME(filter->f));
         return 0;
     }
@@ -623,7 +623,7 @@
 
     if (MP_FILTER_IS_EOS(filter)) {
         MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-                   "read in: EOS bucket\n",
+                   "read in: EOS bucket",
                    MP_FILTER_NAME(filter->f));
 
         filter->seen_eos = 1;
@@ -634,7 +634,7 @@
     }
     else if (MP_FILTER_IS_FLUSH(filter)) {
         MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-                   "read in: FLUSH bucket\n",
+                   "read in: FLUSH bucket",
                    MP_FILTER_NAME(filter->f));
         filter->flush = 1;
         return 0;
@@ -669,7 +669,7 @@
     /* modperl_brigade_dump(filter->bb_in, NULL); */
 
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "wanted: %db\n",
+               "wanted: %db",
                MP_FILTER_NAME(filter->f),
                wanted);
 
@@ -677,7 +677,7 @@
         if (filter->remaining >= wanted) {
             MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
                        "eating and returning %d [%s]\n\tof "
-                       "remaining %db\n",
+                       "remaining %db",
                        MP_FILTER_NAME(filter->f),
                        wanted,
                        MP_TRACE_STR_TRUNC(filter->pool, filter->leftover, wanted),
@@ -689,7 +689,7 @@
         }
         else {
             MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-                       "eating remaining %db\n",
+                       "eating remaining %db",
                        MP_FILTER_NAME(filter->f),
                        filter->remaining);
             sv_catpvn(buffer, filter->leftover, filter->remaining);
@@ -714,7 +714,7 @@
         if (filter->rc == APR_SUCCESS) {
             MP_TRACE_f(MP_FUNC,
                        MP_FILTER_NAME_FORMAT
-                       "read in: %s bucket with %db (0x%lx)\n",
+                       "read in: %s bucket with %db (0x%lx)",
                        MP_FILTER_NAME(filter->f),
                        filter->bucket->type->name,
                        buf_len,
@@ -743,7 +743,7 @@
 
     MP_TRACE_f(MP_FUNC,
                MP_FILTER_NAME_FORMAT
-               "return: %db from %d bucket%s [%s]\n\t(%db leftover)\n",
+               "return: %db from %d bucket%s [%s]\n\t(%db leftover)",
                MP_FILTER_NAME(filter->f),
                len, num_buckets, ((num_buckets == 1) ? "" : "s"),
                MP_TRACE_STR_TRUNC(filter->pool, SvPVX(buffer), len),
@@ -764,7 +764,7 @@
         filter->bb_in = apr_brigade_create(filter->pool,
                                            filter->f->c->bucket_alloc);
         MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-                   "retrieving bb: 0x%lx\n",
+                   "retrieving bb: 0x%lx",
                    MP_FILTER_NAME(filter->f),
                    (unsigned long)(filter->bb_in));
         MP_RUN_CROAK(ap_get_brigade(filter->f->next, filter->bb_in,
@@ -870,7 +870,7 @@
     char *copy = apr_pmemdup(filter->pool, buf, *len);
     apr_bucket *bucket = apr_bucket_transient_create(copy, *len, ba);
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
-               "write out: %db [%s]:\n",
+               "write out: %db [%s]:",
                MP_FILTER_NAME(filter->f), *len,
                MP_TRACE_STR_TRUNC(filter->pool, copy, *len));
     APR_BRIGADE_INSERT_TAIL(filter->bb_out, bucket);
@@ -898,7 +898,7 @@
         MP_TRACE_f(MP_FUNC,
                    MP_FILTER_NAME_FORMAT
                    "write_out: EOS was already sent, "
-                   "passing through the brigade\n",
+                   "passing through the brigade",
                    MP_FILTER_NAME(f));
         return ap_pass_brigade(f->next, bb);
     }
@@ -932,7 +932,7 @@
         MP_TRACE_f(MP_FUNC,
                    MP_FILTER_NAME_FORMAT
                    "write out: EOS was already sent, "
-                   "passing through the brigade\n",
+                   "passing through the brigade",
                    MP_FILTER_NAME(f));
         return ap_get_brigade(f->next, bb, input_mode, block, readbytes);
     }
@@ -998,7 +998,7 @@
                 addfunc(handlers[i]->name, NULL, NULL, c);
                 MP_TRACE_f(MP_FUNC,
                            "a non-mod_perl %s handler %s configured "
-                           "(connection)\n", type, handlers[i]->name);
+                           "(connection)", type, handlers[i]->name);
                 continue;
             }
 
@@ -1006,7 +1006,7 @@
              * configured outside the resource container */
             if (!(handlers[i]->attrs & MP_FILTER_CONNECTION_HANDLER)) {
                 MP_TRACE_f(MP_FUNC,
-                           "%s is not a FilterConnection handler, skipping\n",
+                           "%s is not a FilterConnection handler, skipping",
                            handlers[i]->name);
                 continue;
             }
@@ -1033,14 +1033,14 @@
                 }
             }
 
-            MP_TRACE_h(MP_FUNC, "%s handler %s configured (connection)\n",
+            MP_TRACE_h(MP_FUNC, "%s handler %s configured (connection)",
                        type, handlers[i]->name);
         }
 
         return OK;
     }
 
-    MP_TRACE_h(MP_FUNC, "no %s handlers configured (connection)\n", type);
+    MP_TRACE_h(MP_FUNC, "no %s handlers configured (connection)", type);
 
     return DECLINED;
 }
@@ -1068,7 +1068,7 @@
             if ((handlers[i]->attrs & MP_FILTER_HTTPD_HANDLER)) {
                 addfunc(handlers[i]->name, NULL, r, r->connection);
                 MP_TRACE_f(MP_FUNC,
-                           "a non-mod_perl %s handler %s configured (%s)\n",
+                           "a non-mod_perl %s handler %s configured (%s)",
                            type, handlers[i]->name, r->uri);
                 continue;
             }
@@ -1079,7 +1079,7 @@
              */
             if ((handlers[i]->attrs & MP_FILTER_CONNECTION_HANDLER)) {
                 MP_TRACE_f(MP_FUNC,
-                           "%s is not a FilterRequest handler, skipping\n",
+                           "%s is not a FilterRequest handler, skipping",
                            handlers[i]->name);
                 continue;
             }
@@ -1114,7 +1114,7 @@
 
             if (registered) {
                 MP_TRACE_f(MP_FUNC,
-                        "%s %s already registered\n",
+                        "%s %s already registered",
                         handlers[i]->name, type);
                 continue;
             }
@@ -1141,14 +1141,14 @@
                 }
             }
 
-            MP_TRACE_h(MP_FUNC, "%s handler %s configured (%s)\n",
+            MP_TRACE_h(MP_FUNC, "%s handler %s configured (%s)",
                        type, handlers[i]->name, r->uri);
         }
 
         return OK;
     }
 
-    MP_TRACE_h(MP_FUNC, "no %s handlers configured (%s)\n",
+    MP_TRACE_h(MP_FUNC, "no %s handlers configured (%s)",
                type, r->uri);
 
     return DECLINED;
@@ -1255,7 +1255,7 @@
             }
         }
 
-        MP_TRACE_h(MP_FUNC, "%s handler %s configured (connection)\n",
+        MP_TRACE_h(MP_FUNC, "%s handler %s configured (connection)",
                    type, name);
 
         return;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_global.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_global.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_global.c Fri Jun 27 03:21:35 2008
@@ -77,7 +77,7 @@
 {
     modperl_global_t *global = (modperl_global_t *)data;
 
-    MP_TRACE_g(MP_FUNC, "destroy lock for %s\n", global->name);
+    MP_TRACE_g(MP_FUNC, "destroy lock for %s", global->name);
     MUTEX_DESTROY(&global->glock);
 
     return APR_SUCCESS;
@@ -100,13 +100,13 @@
                               apr_pool_cleanup_null);
 #endif
 
-    MP_TRACE_g(MP_FUNC, "init %s\n", name);
+    MP_TRACE_g(MP_FUNC, "init %s", name);
 }
 
 void modperl_global_lock(modperl_global_t *global)
 {
 #if MP_THREADED
-    MP_TRACE_g(MP_FUNC, "locking %s\n", global->name);
+    MP_TRACE_g(MP_FUNC, "locking %s", global->name);
     MUTEX_LOCK(&global->glock);
 #endif
 }
@@ -114,7 +114,7 @@
 void modperl_global_unlock(modperl_global_t *global)
 {
 #if MP_THREADED
-    MP_TRACE_g(MP_FUNC, "unlocking %s\n", global->name);
+    MP_TRACE_g(MP_FUNC, "unlocking %s", global->name);
     MUTEX_UNLOCK(&global->glock);
 #endif
 }

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_handler.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_handler.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_handler.c Fri Jun 27 03:21:35 2008
@@ -38,7 +38,7 @@
 
     handler->cv = NULL;
     handler->name = name;
-    MP_TRACE_h(MP_FUNC, "new handler %s\n", handler->name);
+    MP_TRACE_h(MP_FUNC, "new handler %s", handler->name);
 
     return handler;
 }
@@ -172,7 +172,7 @@
     handler->cv   = cv;
     handler->name = NULL;
 
-    MP_TRACE_h(MP_FUNC, "new cached cv anon handler\n");
+    MP_TRACE_h(MP_FUNC, "new cached cv anon handler");
 #endif
 
     return handler;
@@ -220,7 +220,7 @@
 
         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",
@@ -240,7 +240,7 @@
 modperl_handler_t *modperl_handler_dup(apr_pool_t *p,
                                        modperl_handler_t *h)
 {
-    MP_TRACE_h(MP_FUNC, "dup handler %s\n", modperl_handler_name(h));
+    MP_TRACE_h(MP_FUNC, "dup handler %s", modperl_handler_name(h));
     return modperl_handler_new(p, h->name);
 }
 
@@ -275,12 +275,12 @@
     for (i=0; i<base_a->nelts; i++) {
         for (j=0; j<add_a->nelts; j++) {
             if (modperl_handler_equal(base_h[i], add_h[j])) {
-                MP_TRACE_d(MP_FUNC, "both base and new config contain %s\n",
+                MP_TRACE_d(MP_FUNC, "both base and new config contain %s",
                            add_h[j]->name);
             }
             else {
                 modperl_handler_array_push(mrg_a, add_h[j]);
-                MP_TRACE_d(MP_FUNC, "base does not contain %s\n",
+                MP_TRACE_d(MP_FUNC, "base does not contain %s",
                            add_h[j]->name);
             }
         }
@@ -529,7 +529,7 @@
         return TRUE;
     }
 
-    MP_TRACE_h(MP_FUNC, "unable to push_handler 0x%lx\n",
+    MP_TRACE_h(MP_FUNC, "unable to push_handler 0x%lx",
                (unsigned long)sv);
 
     return FALSE;
@@ -568,7 +568,7 @@
             }
 
             if (!modperl_mgv_resolve(aTHX_ handler, p, handler->name, TRUE)) {
-                MP_TRACE_h(MP_FUNC, "failed to resolve handler %s\n",
+                MP_TRACE_h(MP_FUNC, "failed to resolve handler %s",
                            handler->name);
             }
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_interp.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_interp.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_interp.c Fri Jun 27 03:21:35 2008
@@ -120,7 +120,7 @@
 #endif
     }
 
-    MP_TRACE_i(MP_FUNC, "0x%lx / perl: 0x%lx / parent perl: 0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "0x%lx / perl: 0x%lx / parent perl: 0x%lx",
                (unsigned long)interp, (unsigned long)interp->perl,
                (unsigned long)perl);
 
@@ -134,11 +134,11 @@
 
     PERL_SET_CONTEXT(interp->perl);
 
-    MP_TRACE_i(MP_FUNC, "interp == 0x%lx / perl: 0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "interp == 0x%lx / perl: 0x%lx",
                (unsigned long)interp, (unsigned long)interp->perl);
 
     if (MpInterpIN_USE(interp)) {
-        MP_TRACE_i(MP_FUNC, "*error - still in use!*\n");
+        MP_TRACE_i(MP_FUNC, "*error - still in use!*");
     }
 
     handles = modperl_xs_dl_handles_get(aTHX);
@@ -166,16 +166,16 @@
     head = modperl_tipool_pop(mip->tipool);
     interp = (modperl_interp_t *)head->data;
 
-    MP_TRACE_i(MP_FUNC, "head == 0x%lx, parent == 0x%lx\n",
+    MP_TRACE_i(MP_FUNC, "head == 0x%lx, parent == 0x%lx",
                (unsigned long)head, (unsigned long)mip->parent);
 
-    MP_TRACE_i(MP_FUNC, "selected 0x%lx (perl==0x%lx)\n",
+    MP_TRACE_i(MP_FUNC, "selected 0x%lx (perl==0x%lx)",
                (unsigned long)interp,
                (unsigned long)interp->perl);
 
 #ifdef MP_TRACE
     interp->tid = MP_TIDF;
-    MP_TRACE_i(MP_FUNC, "thread == 0x%lx\n", interp->tid);
+    MP_TRACE_i(MP_FUNC, "thread == 0x%lx", interp->tid);
 #endif
 
     MpInterpIN_USE_On(interp);
@@ -196,7 +196,7 @@
         /* multiple mips might share the same parent
          * make sure its only destroyed once
          */
-        MP_TRACE_i(MP_FUNC, "parent == 0x%lx\n",
+        MP_TRACE_i(MP_FUNC, "parent == 0x%lx",
                    (unsigned long)mip->parent);
 
         modperl_interp_destroy(mip->parent);
@@ -208,7 +208,7 @@
 static void *interp_pool_grow(modperl_tipool_t *tipool, void *data)
 {
     modperl_interp_pool_t *mip = (modperl_interp_pool_t *)data;
-    MP_TRACE_i(MP_FUNC, "adding new interpreter to the pool\n");
+    MP_TRACE_i(MP_FUNC, "adding new interpreter to the pool");
     return (void *)modperl_interp_new(mip, mip->parent->perl);
 }
 
@@ -223,7 +223,7 @@
 {
     while (listp) {
         modperl_interp_t *interp = (modperl_interp_t *)listp->data;
-        MP_TRACE_i(MP_FUNC, "listp==0x%lx, interp==0x%lx, requests=%d\n",
+        MP_TRACE_i(MP_FUNC, "listp==0x%lx, interp==0x%lx, requests=%d",
                  (unsigned long)listp, (unsigned long)interp,
                  interp->num_requests);
         listp = listp->next;
@@ -247,7 +247,7 @@
     modperl_interp_pool_t *mip =
         (modperl_interp_pool_t *)apr_pcalloc(p, sizeof(*mip));
 
-    MP_TRACE_i(MP_FUNC, "server=%s\n", modperl_server_desc(s, p));
+    MP_TRACE_i(MP_FUNC, "server=%s", modperl_server_desc(s, p));
 
     if (modperl_threaded_mpm()) {
         mip->tipool = modperl_tipool_new(p, scfg->interp_pool_cfg,
@@ -271,7 +271,7 @@
 #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,11 +286,11 @@
     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;
-        MP_TRACE_i(MP_FUNC, "interp=0x%lx, refcnt=%d -- interp still in use\n",
+        MP_TRACE_i(MP_FUNC, "interp=0x%lx, refcnt=%d -- interp still in use",
                    (unsigned long)interp, interp->refcnt);
         return APR_SUCCESS;
     }
@@ -302,7 +302,7 @@
 
     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;
@@ -350,7 +350,7 @@
 
     if (is_startup) {
         if (scfg) {
-            MP_TRACE_i(MP_FUNC, "using parent interpreter at startup\n");
+            MP_TRACE_i(MP_FUNC, "using parent interpreter at startup");
 
             if (!scfg->mip) {
                 /* we get here if directive handlers are invoked
@@ -366,11 +366,11 @@
                 interp = modperl_interp_get(s);
                 modperl_interp_pool_set(p, interp);
 
-                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)interp, (unsigned long)p);
             }
             else {
-                MP_TRACE_i(MP_FUNC, "found interp 0x%lx in pconf pool 0x%lx\n",
+                MP_TRACE_i(MP_FUNC, "found interp 0x%lx in pconf pool 0x%lx",
                            (unsigned long)interp, (unsigned long)p);
             }
         }
@@ -397,7 +397,7 @@
         request_rec *r;
         apr_pool_userdata_get((void **)&r, "MODPERL_R", p);
         ap_assert(r);
-        MP_TRACE_i(MP_FUNC, "found userdata MODPERL_R in pool %#lx as %lx\n",
+        MP_TRACE_i(MP_FUNC, "found userdata MODPERL_R in pool %#lx as %lx",
                    (unsigned long)r->pool, (unsigned long)r);
         return modperl_interp_select(r, NULL, s);
     }
@@ -416,7 +416,7 @@
 
     if (!modperl_threaded_mpm()) {
         MP_TRACE_i(MP_FUNC,
-                   "using parent 0x%lx for non-threaded mpm (%s:%d)\n",
+                   "using parent 0x%lx for non-threaded mpm (%s:%d)",
                    (unsigned long)scfg->mip->parent,
                    s->server_hostname, s->port);
         /* XXX: if no VirtualHosts w/ PerlOptions +Parent we can skip this */
@@ -433,7 +433,7 @@
         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);
@@ -458,7 +458,7 @@
     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);
 
     /*
@@ -471,7 +471,7 @@
         dcfg->interp_scope :
         (r ? scfg->interp_scope : MP_INTERP_SCOPE_CONNECTION);
 
-    MP_TRACE_i(MP_FUNC, "scope is per-%s\n",
+    MP_TRACE_i(MP_FUNC, "scope is per-%s",
                modperl_interp_scope_desc(scope));
 
     if (scope != MP_INTERP_SCOPE_HANDLER) {
@@ -514,7 +514,7 @@
         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/threading/src/modules/perl/modperl_io.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_io.c Fri Jun 27 03:21:35 2008
@@ -33,7 +33,7 @@
 
     SvREFCNT_dec(obj); /* since sv_magic did SvREFCNT_inc */
 
-    MP_TRACE_r(MP_FUNC, "tie *%s(0x%lx) => %s, REFCNT=%d\n",
+    MP_TRACE_r(MP_FUNC, "tie *%s(0x%lx) => %s, REFCNT=%d",
                GvNAME(handle), (unsigned long)handle, classname,
                SvREFCNT(TIEHANDLE_SV(handle)));
 }
@@ -83,7 +83,7 @@
         char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
 
         if (!strEQ(package, classname)) {
-            MP_TRACE_r(MP_FUNC, "%s tied to %s\n", GvNAME(handle), package);
+            MP_TRACE_r(MP_FUNC, "%s tied to %s", GvNAME(handle), package);
             return TRUE;
         }
     }
@@ -95,7 +95,7 @@
 {
 #ifdef MP_TRACE
     if (mg_find(TIEHANDLE_SV(handle), PERL_MAGIC_tiedscalar)) {
-        MP_TRACE_r(MP_FUNC, "untie *%s(0x%lx), REFCNT=%d\n",
+        MP_TRACE_r(MP_FUNC, "untie *%s(0x%lx), REFCNT=%d",
                    GvNAME(handle), (unsigned long)handle,
                    SvREFCNT(TIEHANDLE_SV(handle)));
     }
@@ -141,7 +141,7 @@
         Perl_croak(aTHX_ "Failed to open STDIN: %" SVf, get_sv("!", TRUE));
     }
 
-    MP_TRACE_o(MP_FUNC, "end\n");
+    MP_TRACE_o(MP_FUNC, "end");
 
     return handle_save;
 }
@@ -184,7 +184,7 @@
         Perl_croak(aTHX_ "Failed to open STDOUT: %" SVf, get_sv("!", TRUE));
     }
 
-    MP_TRACE_o(MP_FUNC, "end\n");
+    MP_TRACE_o(MP_FUNC, "end");
 
     /* XXX: shouldn't we preserve the value STDOUT had before it was
      * overridden? */
@@ -226,7 +226,7 @@
         }
     }
 
-    MP_TRACE_o(MP_FUNC, "end\n");
+    MP_TRACE_o(MP_FUNC, "end");
 }
 
 MP_INLINE void modperl_io_perlio_restore_stdout(pTHX_ GV *handle)
@@ -273,7 +273,7 @@
         }
     }
 
-    MP_TRACE_o(MP_FUNC, "end\n");
+    MP_TRACE_o(MP_FUNC, "end");
 }
 
 /*

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c Fri Jun 27 03:21:35 2008
@@ -64,7 +64,7 @@
 
 #define modperl_mgv_hash(mgv)                   \
     PERL_HASH(mgv->hash, mgv->name, mgv->len)
- /* MP_TRACE_h(MP_FUNC, "%s...hash=%ld\n", mgv->name, mgv->hash) */
+ /* MP_TRACE_h(MP_FUNC, "%s...hash=%ld", mgv->name, mgv->hash) */
 
 modperl_mgv_t *modperl_mgv_compile(pTHX_ apr_pool_t *p,
                                    register const char *name)
@@ -245,24 +245,24 @@
                 if (SvROK(obj) && sv_isobject(obj)) {
                     stash = SvSTASH(SvRV(obj));
                     MpHandlerOBJECT_On(handler);
-                    MP_TRACE_h(MP_FUNC, "handler object %s isa %s\n",
+                    MP_TRACE_h(MP_FUNC, "handler object %s isa %s",
                                package, HvNAME(stash));
                 }
                 else {
-                    MP_TRACE_h(MP_FUNC, "%s is not an object, pv=%s\n",
+                    MP_TRACE_h(MP_FUNC, "%s is not an object, pv=%s",
                                package, SvPV_nolen(obj));
                     return 0;
                 }
             }
             else {
-                MP_TRACE_h(MP_FUNC, "failed to thaw %s\n", package);
+                MP_TRACE_h(MP_FUNC, "failed to thaw %s", package);
                 return 0;
             }
         }
 
         if (!stash) {
             if ((stash = gv_stashpvn(package, package_len, FALSE))) {
-                MP_TRACE_h(MP_FUNC, "handler method %s isa %s\n",
+                MP_TRACE_h(MP_FUNC, "handler method %s isa %s",
                            name, HvNAME(stash));
             }
         }
@@ -282,11 +282,11 @@
     if (!stash && MpHandlerAUTOLOAD(handler)) {
         if (!modperl_perl_module_loaded(aTHX_ name)) { /* not in %INC */
             MP_TRACE_h(MP_FUNC,
-                       "package %s not in %INC, attempting to load it\n",
+                       "package %s not in %INC, attempting to load it",
                        name);
 
             if (modperl_require_module(aTHX_ name, logfailure)) {
-                MP_TRACE_h(MP_FUNC, "loaded %s package\n", name);
+                MP_TRACE_h(MP_FUNC, "loaded %s package", name);
             }
             else {
                 if (logfailure) {
@@ -295,13 +295,13 @@
                 }
                 else {
                     /* the caller handles the error checking */
-                    MP_TRACE_h(MP_FUNC, "failed to load %s package\n", name);
+                    MP_TRACE_h(MP_FUNC, "failed to load %s package", name);
                     return 0;
                 }
             }
         }
         else {
-            MP_TRACE_h(MP_FUNC, "package %s seems to be loaded\n", name);
+            MP_TRACE_h(MP_FUNC, "package %s seems to be loaded", name);
         }
     }
 
@@ -310,7 +310,7 @@
      * module was loaded, preventing from loading the module
      */
     if (!(stash || (stash = gv_stashpv(name, FALSE)))) {
-        MP_TRACE_h(MP_FUNC, "%s's stash is not found\n", name);
+        MP_TRACE_h(MP_FUNC, "%s's stash is not found", name);
         return 0;
     }
 
@@ -338,7 +338,7 @@
         modperl_mgv_append(aTHX_ p, handler->mgv_cv, handler_name);
 
         MpHandlerPARSED_On(handler);
-        MP_TRACE_h(MP_FUNC, "found `%s' in class `%s' as a %s\n",
+        MP_TRACE_h(MP_FUNC, "found `%s' in class `%s' as a %s",
                    handler_name, HvNAME(stash),
                    MpHandlerMETHOD(handler) ? "method" : "function");
         MODPERL_MGV_DEEP_RESOLVE(handler, p);
@@ -356,7 +356,7 @@
 #ifdef MP_TRACE
     /* complain only if the class was actually loaded/created */
     if (stash) {
-        MP_TRACE_h(MP_FUNC, "`%s' not found in class `%s'\n",
+        MP_TRACE_h(MP_FUNC, "`%s' not found in class `%s'",
                    handler_name, name);
     }
 #endif
@@ -415,7 +415,7 @@
         modperl_mgv_as_string(aTHX_ symbol, p, 1);
 
     if (modperl_require_module(aTHX_ package, TRUE)) {
-        MP_TRACE_h(MP_FUNC, "reloaded %s for server %s\n",
+        MP_TRACE_h(MP_FUNC, "reloaded %s for server %s",
                    package, modperl_server_desc(s, p));
         return TRUE;
     }
@@ -457,7 +457,7 @@
                                            s, p);
             }
 #endif
-            MP_TRACE_h(MP_FUNC, "%s already resolved in server %s\n",
+            MP_TRACE_h(MP_FUNC, "%s already resolved in server %s",
                        modperl_handler_name(handler),
                        modperl_server_desc(s, p));
         }

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_module.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_module.c Fri Jun 27 03:21:35 2008
@@ -120,7 +120,7 @@
 
     modperl_svptr_table_delete(aTHX_ cleanup->table, cleanup->ptr);
 
-    MP_TRACE_c(MP_FUNC, "deleting ptr 0x%lx from table 0x%lx\n",
+    MP_TRACE_c(MP_FUNC, "deleting ptr 0x%lx from table 0x%lx",
                (unsigned long)cleanup->ptr,
                (unsigned long)cleanup->table);
 
@@ -193,7 +193,7 @@
 
     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;
@@ -212,7 +212,7 @@
         int count;
         dSP;
 
-        MP_TRACE_c(MP_FUNC, "calling %s->%s\n",
+        MP_TRACE_c(MP_FUNC, "calling %s->%s",
                    SvCLASS(base_obj), modperl_mgv_last_name(method));
 
         ENTER;SAVETMPS;
@@ -247,7 +247,7 @@
     }
 
 #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;
@@ -298,7 +298,7 @@
         return NULL;
     }
 
-    MP_TRACE_c(MP_FUNC, "%s cfg=0x%lx for %s.%s\n",
+    MP_TRACE_c(MP_FUNC, "%s cfg=0x%lx for %s.%s",
                method, (unsigned long)cfg,
                mname, parms->cmd->name);
 
@@ -419,7 +419,7 @@
 
     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
@@ -427,7 +427,7 @@
     }
 
     if (obj) {
-        MP_TRACE_c(MP_FUNC, "found per-dir obj=0x%lx for %s.%s\n",
+        MP_TRACE_c(MP_FUNC, "found per-dir obj=0x%lx for %s.%s",
                    (unsigned long)obj,
                    info->modp->name, cmd->name);
     }
@@ -444,7 +444,7 @@
                                                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
@@ -452,7 +452,7 @@
         }
 
         if (srv_obj) {
-            MP_TRACE_c(MP_FUNC, "found per-srv obj=0x%lx for %s.%s\n",
+            MP_TRACE_c(MP_FUNC, "found per-srv obj=0x%lx for %s.%s",
                        (unsigned long)srv_obj,
                        info->modp->name, cmd->name);
         }
@@ -490,7 +490,7 @@
     }
 
 #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
@@ -790,7 +790,7 @@
     HV *stash = gv_stashpv(modp->name, FALSE);
     GV *gv = gv_fetchmethod_autoload(stash, method, FALSE);
 
-    MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound\n",
+    MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound",
                method, modp->name,
                MP_isGV(gv) ? "" : "not ");
 
@@ -881,7 +881,7 @@
      */
     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);
     }

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl.c Fri Jun 27 03:21:35 2008
@@ -81,7 +81,7 @@
                "ppid=%d, "
 #endif
                "uid=%" Uid_t_f ", euid=%" Uid_t_f ", "
-               "gid=%" Gid_t_f ", egid=%" Gid_t_f "\n",
+               "gid=%" Gid_t_f ", egid=%" Gid_t_f,
                (int)ids->pid,
 #ifdef MP_MAINTAIN_PPID
                (int)ids->ppid,

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c Fri Jun 27 03:21:35 2008
@@ -194,7 +194,7 @@
     av_store(mav, AvFILLp(mav)+1, sv);
 
     /* print scalar @{ $PL_modglobal{$key}{$package} } */
-    MP_TRACE_g(MP_FUNC, "%s::%s av now has %d entries\n",
+    MP_TRACE_g(MP_FUNC, "%s::%s av now has %d entries",
                package, (char*)gkey->name, 1+av_len(mav));
 
     return 1;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_time.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_time.h?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_time.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_time.h Fri Jun 27 03:21:35 2008
@@ -44,7 +44,7 @@
         double stime = \
              (double)(end_time.tms_stime - start_time.tms_stime)/MP_HZ; \
         if (utime || stime) { \
-            MP_TRACE_t(MP_FUNC, "%s %5.2f user %5.2f sys\n", \
+            MP_TRACE_t(MP_FUNC, "%s %5.2f user %5.2f sys", \
                        label, utime, stime); \
         } \
     })

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c Fri Jun 27 03:21:35 2008
@@ -123,7 +123,7 @@
 #ifdef MP_TRACE
     if (!tmp) {
         /* should never happen */
-        MP_TRACE_i(MP_FUNC, "failed to find 0x%lx in list 0x%lx\n",
+        MP_TRACE_i(MP_FUNC, "failed to find 0x%lx in list 0x%lx",
                    (unsigned long)rlist, (unsigned long)list);
     }
 #endif
@@ -189,7 +189,7 @@
         modperl_tipool_add(tipool, item);
     }
 
-    MP_TRACE_i(MP_FUNC, "start=%d, max=%d, min_spare=%d, max_spare=%d\n",
+    MP_TRACE_i(MP_FUNC, "start=%d, max=%d, min_spare=%d, max_spare=%d",
                tipool->cfg->start, tipool->cfg->max,
                tipool->cfg->min_spare, tipool->cfg->max_spare);
 
@@ -211,7 +211,7 @@
     }
 
     if (tipool->busy) {
-        MP_TRACE_i(MP_FUNC, "ERROR: %d items still in use\n",
+        MP_TRACE_i(MP_FUNC, "ERROR: %d items still in use",
                    tipool->in_use);
     }
 
@@ -231,7 +231,7 @@
 
     tipool->size++;
 
-    MP_TRACE_i(MP_FUNC, "added 0x%lx (size=%d)\n",
+    MP_TRACE_i(MP_FUNC, "added 0x%lx (size=%d)",
                (unsigned long)listp, tipool->size);
 }
 
@@ -242,7 +242,7 @@
     tipool->idle = modperl_list_remove(tipool->idle, listp);
 
     tipool->size--;
-    MP_TRACE_i(MP_FUNC, "removed 0x%lx (size=%d)\n",
+    MP_TRACE_i(MP_FUNC, "removed 0x%lx (size=%d)",
                (unsigned long)listp, tipool->size);
 }
 
@@ -255,7 +255,7 @@
     if (tipool->size == tipool->in_use) {
         if (tipool->size < tipool->cfg->max) {
             MP_TRACE_i(MP_FUNC,
-                       "no idle items, size %d < %d max\n",
+                       "no idle items, size %d < %d max",
                        tipool->size, tipool->cfg->max);
             if (tipool->func->tipool_rgrow) {
                 void * item =
@@ -277,7 +277,7 @@
 
     /* XXX: this should never happen */
     if (!head) {
-        MP_TRACE_i(MP_FUNC, "PANIC: no items available, %d of %d in use\n",
+        MP_TRACE_i(MP_FUNC, "PANIC: no items available, %d of %d in use",
                    tipool->in_use, tipool->size);
         abort();
     }
@@ -318,14 +318,14 @@
 
 #ifdef MP_TRACE
     if (!tipool->busy && tipool->func->tipool_dump) {
-        MP_TRACE_i(MP_FUNC, "all items idle:\n");
+        MP_TRACE_i(MP_FUNC, "all items idle:");
         MP_TRACE_i_do((*tipool->func->tipool_dump)(tipool,
                                                    tipool->data,
                                                    tipool->idle));
     }
 #endif
 
-    MP_TRACE_i(MP_FUNC, "0x%lx now available (%d in use, %d running)\n",
+    MP_TRACE_i(MP_FUNC, "0x%lx now available (%d in use, %d running)",
                (unsigned long)listp->data, tipool->in_use, tipool->size);
 
     if (tipool->in_use == (tipool->cfg->max - 1)) {
@@ -341,11 +341,11 @@
 
     if (max_spare) {
         MP_TRACE_i(MP_FUNC,
-                   "shrinking pool: max_spare=%d, only %d of %d in use\n",
+                   "shrinking pool: max_spare=%d, only %d of %d in use",
                    tipool->cfg->max_spare, tipool->in_use, tipool->size);
     }
     else if (max_requests) {
-        MP_TRACE_i(MP_FUNC, "shrinking pool: max requests %d reached\n",
+        MP_TRACE_i(MP_FUNC, "shrinking pool: max requests %d reached",
                    tipool->cfg->max_requests);
     }
 
@@ -370,7 +370,7 @@
                                                   tipool->data);
 
                 MP_TRACE_i(MP_FUNC,
-                           "growing pool: min_spare=%d, %d of %d in use\n",
+                           "growing pool: min_spare=%d, %d of %d in use",
                            tipool->cfg->min_spare, tipool->in_use,
                            tipool->size);
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_tipool.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_tipool.h?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_tipool.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_tipool.h Fri Jun 27 03:21:35 2008
@@ -63,26 +63,26 @@
 #define modperl_tipool_wait(tipool) \
     while (tipool->size == tipool->in_use) { \
         MP_TRACE_i(MP_FUNC, \
-                   "waiting for available tipool item in thread 0x%lx\n", \
+                   "waiting for available tipool item in thread 0x%lx", \
                    MP_TIDF); \
-        MP_TRACE_i(MP_FUNC, "(%d items in use, %d alive)\n", \
+        MP_TRACE_i(MP_FUNC, "(%d items in use, %d alive)", \
                    tipool->in_use, tipool->size); \
         COND_WAIT(&tipool->available, &tipool->tiplock); \
     }
 
 #define modperl_tipool_broadcast(tipool) \
-    MP_TRACE_i(MP_FUNC, "broadcast available tipool item\n"); \
+    MP_TRACE_i(MP_FUNC, "broadcast available tipool item"); \
     COND_SIGNAL(&tipool->available)
 
 #define modperl_tipool_lock(tipool) \
-    MP_TRACE_i(MP_FUNC, "about to lock tipool in thread 0x%lx\n", MP_TIDF); \
+    MP_TRACE_i(MP_FUNC, "about to lock tipool in thread 0x%lx", MP_TIDF); \
     MUTEX_LOCK(&tipool->tiplock); \
-    MP_TRACE_i(MP_FUNC, "acquired tipool lock\n")
+    MP_TRACE_i(MP_FUNC, "acquired tipool lock")
 
 #define modperl_tipool_unlock(tipool) \
-    MP_TRACE_i(MP_FUNC, "about to unlock tipool in thread 0x%lx\n", MP_TIDF); \
+    MP_TRACE_i(MP_FUNC, "about to unlock tipool in thread 0x%lx", MP_TIDF); \
     MUTEX_UNLOCK(&tipool->tiplock); \
-    MP_TRACE_i(MP_FUNC, "released tipool lock\n")
+    MP_TRACE_i(MP_FUNC, "released tipool lock")
 
 #endif /* USE_ITHREADS */
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_util.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_util.c Fri Jun 27 03:21:35 2008
@@ -194,7 +194,7 @@
 {
     SV *sv = newSV(0);
 
-    MP_TRACE_h(MP_FUNC, "sv_setref_pv(%s, 0x%lx)\n",
+    MP_TRACE_h(MP_FUNC, "sv_setref_pv(%s, 0x%lx)",
                classname, (unsigned long)ptr);
     sv_setref_pv(sv, classname, ptr);
 
@@ -266,7 +266,7 @@
 
     if (!librefs) {
         MP_TRACE_r(MP_FUNC,
-                   "Could not get @%s for unloading.\n",
+                   "Could not get @%s for unloading.",
                    dl_librefs);
         return NULL;
     }
@@ -285,13 +285,13 @@
 
         if(!handle_sv) {
             MP_TRACE_r(MP_FUNC,
-                       "Could not fetch $%s[%d]!\n",
+                       "Could not fetch $%s[%d]!",
                        dl_librefs, (int)i);
             continue;
         }
         handle = INT2PTR(void *, SvIV(handle_sv));
 
-        MP_TRACE_r(MP_FUNC, "%s dl handle == 0x%lx\n",
+        MP_TRACE_r(MP_FUNC, "%s dl handle == 0x%lx",
                    SvPVX(module_sv), (unsigned long)handle);
         if (handle) {
             handles[i] = handle;
@@ -315,7 +315,7 @@
     }
 
     for (i=0; handles[i]; i++) {
-        MP_TRACE_r(MP_FUNC, "close 0x%lx\n", (unsigned long)handles[i]);
+        MP_TRACE_r(MP_FUNC, "close 0x%lx", (unsigned long)handles[i]);
         modperl_sys_dlclose(handles[i]);
     }
 
@@ -628,7 +628,7 @@
     rc = apr_file_read(file, SvPVX(sv), &size);
     SLURP_SUCCESS("reading");
 
-    MP_TRACE_o(MP_FUNC, "read %d bytes from '%s'\n", size, r->filename);
+    MP_TRACE_o(MP_FUNC, "read %d bytes from '%s'", size, r->filename);
 
     if (r->finfo.size != size) {
         SvREFCNT_dec(sv);
@@ -840,7 +840,7 @@
         pnotes->pnotes = NULL;
         pnotes->pool = NULL;
 #ifdef USE_ITHREADS
-        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)\n",
+        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)",
                pnotes->interp);
     modperl_interp_unselect(pnotes->interp);
     pnotes->interp = NULL;

Modified: perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c Fri Jun 27 03:21:35 2008
@@ -176,7 +176,7 @@
 
     rc = apr_file_read(st->file, vbuf, &count);
 
-    MP_TRACE_o(MP_FUNC, "%db [%s]\n", (int)count,
+    MP_TRACE_o(MP_FUNC, "%db [%s]", (int)count,
                MP_TRACE_STR_TRUNC(st->pool, (char *)vbuf, (int)count));
 
     if (rc == APR_EOF) {
@@ -195,7 +195,7 @@
     PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR);
     apr_status_t rc;
 
-    MP_TRACE_o(MP_FUNC, "%db [%s]\n", (int)count,
+    MP_TRACE_o(MP_FUNC, "%db [%s]", (int)count,
                MP_TRACE_STR_TRUNC(st->pool, (char *)vbuf, (int)count));
 
     rc = apr_file_write(st->file, vbuf, &count);
@@ -563,7 +563,7 @@
     /* let's try without the dup, it seems to work fine:
 
        fd = PerlLIO_dup(os_file);
-       MP_TRACE_o(MP_FUNC, "fd old: %d, new %d\n", os_file, fd);
+       MP_TRACE_o(MP_FUNC, "fd old: %d, new %d", os_file, fd);
        if (!(retval = PerlIO_fdopen(fd, mode))) {
        ...
        }

Modified: perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h Fri Jun 27 03:21:35 2008
@@ -32,7 +32,7 @@
 
     mpxs_usage_va_1(modperl_filter, "$filter->print(...)");
 
-    MP_TRACE_f(MP_FUNC, "from %s\n",
+    MP_TRACE_f(MP_FUNC, "from %s",
                ((modperl_filter_ctx_t *)modperl_filter->f->ctx)->handler->name);
     if (modperl_filter->mode == MP_OUTPUT_FILTER_MODE) {
         mpxs_write_loop(modperl_output_filter_write,
@@ -57,7 +57,7 @@
 
     mpxs_usage_va_2(modperl_filter, buffer, "$filter->read(buf, [len])");
 
-    MP_TRACE_f(MP_FUNC, "from %s\n",
+    MP_TRACE_f(MP_FUNC, "from %s",
                ((modperl_filter_ctx_t *)modperl_filter->f->ctx)->handler->name);
 
     if (items > 2) {
@@ -93,7 +93,7 @@
 
 #ifdef MP_TRACE
 #define trace_attr()                                                       \
-    MP_TRACE_f(MP_FUNC, "applied %s attribute to %s handler\n", attribute, \
+    MP_TRACE_f(MP_FUNC, "applied %s attribute to %s handler", attribute, \
                HvNAME(stash))
 #else
 #define trace_attr()
@@ -295,7 +295,7 @@
     if (!modperl_filter) {
         f = INT2PTR(ap_filter_t *, SvIV(SvRV(*MARK)));
         MP_TRACE_f(MP_FUNC,
-                   "   %s\n\n\t non-modperl filter removes itself\n",
+                   "   %s\n\n\t non-modperl filter removes itself",
                    f->frec->name);
 
         /* the filter can reside in only one chain. hence we try to
@@ -310,7 +310,7 @@
 
     f = modperl_filter->f;
 
-    MP_TRACE_f(MP_FUNC, "   %s\n\n\tfilter removes itself\n",
+    MP_TRACE_f(MP_FUNC, "   %s\n\n\tfilter removes itself",
                ((modperl_filter_ctx_t *)f->ctx)->handler->name);
 
     if (modperl_filter->mode == MP_INPUT_FILTER_MODE) {

Modified: perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h?rev=672234&r1=672233&r2=672234&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h Fri Jun 27 03:21:35 2008
@@ -38,7 +38,7 @@
     apr_status_t retval = ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_query_info);
 
     if (retval == APR_SUCCESS) {
-        MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as %i\n",
+        MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as %i",
                    mpm_query_info);
 
         newCONSTSUB(PL_defstash, "Apache2::MPM::is_threaded",
@@ -46,13 +46,13 @@
     }
     else {
         /* assign false (0) to sub if ap_mpm_query didn't succeed */
-        MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as 0\n");
+        MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as 0");
 
         newCONSTSUB(PL_defstash, "Apache2::MPM::is_threaded",
                     newSViv(0));
     }
 
-    MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->show() as %s\n",
+    MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->show() as %s",
                ap_show_mpm());
 
     newCONSTSUB(PL_defstash, "Apache2::MPM::show",



Mime
View raw message