httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Sat, 16 Mar 2002 18:42:46 GMT
wrowe       02/03/16 10:42:46

  Modified:    modules/generators mod_status.c
               server   mpm_common.c
               server/mpm/prefork prefork.c
               server/mpm/worker worker.c
  Log:
    Simplify s/APR_OS_PROC_T_FMT/APR_PID_T_FMT/, apr_os_foo entities aren't
    for external consumption.
  
  Revision  Changes    Path
  1.62      +3 -3      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_status.c	15 Mar 2002 15:30:22 -0000	1.61
  +++ mod_status.c	16 Mar 2002 18:42:46 -0000	1.62
  @@ -512,7 +512,7 @@
                       int indx = (i * thread_limit) + j;
   
                       if (stat_buffer[indx] != '.') {
  -                        ap_rprintf(r, "   %" APR_OS_PROC_T_FMT
  +                        ap_rprintf(r, "   %" APR_PID_T_FMT
                                      " in state: %c ", pid_buffer[i],
                                      stat_buffer[indx]);
   
  @@ -581,7 +581,7 @@
                       else
                           ap_rprintf(r,
                                      "<b>Server %d-%d</b> (%"
  -                                   APR_OS_PROC_T_FMT "): %d|%lu|%lu [",
  +                                   APR_PID_T_FMT "): %d|%lu|%lu [",
                                      i, (int) ps_record.generation,
                                      ps_record.pid,
                                      (int)conn_lres, my_lres, lres);
  @@ -664,7 +664,7 @@
                       else
                           ap_rprintf(r,
                                      "<tr><td><b>%d-%d</b></td><td>%"
  -                                   APR_OS_PROC_T_FMT
  +                                   APR_PID_T_FMT
                                      "</td><td>%d/%lu/%lu",
                                      i, (int)ps_record.generation,
                                      ps_record.pid, (int)conn_lres,
  
  
  
  1.86      +1 -1      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- mpm_common.c	16 Mar 2002 18:26:58 -0000	1.85
  +++ mpm_common.c	16 Mar 2002 18:42:46 -0000	1.86
  @@ -262,7 +262,7 @@
           if (status == APEXIT_CHILDFATAL) {
               ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO,
                            0, ap_server_conf,
  -                         "Child %" APR_OS_PROC_T_FMT
  +                         "Child %" APR_PID_T_FMT
                            " returned a Fatal error..." APR_EOL_STR
                            "Apache is exiting!",
                            pid->pid);
  
  
  
  1.249     +1 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.248
  retrieving revision 1.249
  diff -u -r1.248 -r1.249
  --- prefork.c	15 Mar 2002 00:50:31 -0000	1.248
  +++ prefork.c	16 Mar 2002 18:42:46 -0000	1.249
  @@ -942,7 +942,7 @@
       }
   
       /* Initialize cross-process accept lock */
  -    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
  +    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_PID_T_FMT,
                                    ap_server_root_relative(_pconf, ap_lock_fname),
                                    ap_my_pid);
   
  
  
  
  1.87      +1 -1      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- worker.c	15 Mar 2002 00:50:31 -0000	1.86
  +++ worker.c	16 Mar 2002 18:42:46 -0000	1.87
  @@ -1394,7 +1394,7 @@
       }
       
       /* Initialize cross-process accept lock */
  -    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
  +    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_PID_T_FMT,
                                    ap_server_root_relative(_pconf, ap_lock_fname),
                                    ap_my_pid);
   
  
  
  

Mime
View raw message