httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe Jr." <wr...@rowe-clan.net>
Subject Re: svn commit: r952724 - /httpd/httpd/trunk/server/log.c
Date Tue, 08 Jun 2010 18:19:38 GMT
-1 veto.  This is not the appropriate test for a threaded MPM.

We have ap_mpm_query for this very purpose, please don't continue
to propagate this broken meme!!!

On 6/8/2010 11:26 AM, rjung@apache.org wrote:
> Author: rjung
> Date: Tue Jun  8 16:26:39 2010
> New Revision: 952724
> 
> URL: http://svn.apache.org/viewvc?rev=952724&view=rev
> Log:
> Add descriptive prefix to pid and tid in the error log.
> Only log the tid, if the MPM is threaded.
> 
> Suggested by jorton.
> 
> Modified:
>     httpd/httpd/trunk/server/log.c
> 
> Modified: httpd/httpd/trunk/server/log.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=952724&r1=952723&r2=952724&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/log.c (original)
> +++ httpd/httpd/trunk/server/log.c Tue Jun  8 16:26:39 2010
> @@ -628,12 +628,17 @@ static void log_error_core(const char *f
>                              "[%s] ", priorities[level_and_mask].t_name);
>  
>          len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
> -                            "[%" APR_PID_T_FMT, getpid());
> +                            "[pid %" APR_PID_T_FMT, getpid());
>  #if APR_HAS_THREADS
>          {
> -            apr_os_thread_t tid = apr_os_thread_current();
> -            len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
> -                                ":%pT", &tid);
> +            int result;
> +
> +            if (ap_mpm_query(AP_MPMQ_IS_THREADED, &result) == 0
> +                && result == AP_MPMQ_STATIC) {
> +                apr_os_thread_t tid = apr_os_thread_current();
> +                len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
> +                                    ":tid %pT", &tid);
> +            }
>          }
>  #endif
>          errstr[len++] = ']';
> 
> 
> 


Mime
View raw message