httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Fri, 07 Jun 2002 14:08:05 GMT
jim         2002/06/07 07:08:05

  Modified:    .        CHANGES
               server/mpm/experimental/leader leader.c
               server/mpm/experimental/perchild perchild.c
               server/mpm/experimental/threadpool threadpool.c
               server/mpm/mpmt_os2 mpmt_os2.c
               server/mpm/netware mpm_netware.c
               server/mpm/prefork prefork.c
               server/mpm/worker worker.c
  Log:
  Now that we have the functionality in apr, we can now have 2.0's
  startup message regarding AcceptMutex (what we are using and what
  the default is) "fully" match what is present in 1.3.
  
  Revision  Changes    Path
  1.815     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.814
  retrieving revision 1.815
  diff -u -r1.814 -r1.815
  --- CHANGES	6 Jun 2002 19:07:08 -0000	1.814
  +++ CHANGES	7 Jun 2002 14:08:04 -0000	1.815
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.37
   
  +  *) Make 2.0's "AcceptMutex" startup message now "completely"
  +     match how 1.3 does it. [Jim Jagielski]
  +
     *) Implement a fixed size memory cache using a priority queue
        [Ian Holsman]
   
  
  
  
  1.21      +3 -1      httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- leader.c	30 May 2002 00:21:27 -0000	1.20
  +++ leader.c	7 Jun 2002 14:08:04 -0000	1.21
  @@ -1642,7 +1642,9 @@
                   "Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       restart_pending = shutdown_pending = 0;
   
  
  
  
  1.125     +3 -1      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- perchild.c	17 May 2002 11:11:38 -0000	1.124
  +++ perchild.c	7 Jun 2002 14:08:04 -0000	1.125
  @@ -1326,7 +1326,9 @@
                    "Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       restart_pending = shutdown_pending = 0;
   
  
  
  
  1.11      +3 -1      httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- threadpool.c	6 Jun 2002 23:58:14 -0000	1.10
  +++ threadpool.c	7 Jun 2002 14:08:04 -0000	1.11
  @@ -1862,7 +1862,9 @@
                   "Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       restart_pending = shutdown_pending = 0;
   
  
  
  
  1.22      +3 -1      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
  
  Index: mpmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mpmt_os2.c	17 May 2002 11:11:39 -0000	1.21
  +++ mpmt_os2.c	7 Jun 2002 14:08:04 -0000	1.22
  @@ -317,7 +317,9 @@
   		"Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       if (one_process) {
           ap_scoreboard_image->parent[0].pid = getpid();
  
  
  
  1.54      +3 -1      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mpm_netware.c	31 May 2002 22:16:04 -0000	1.53
  +++ mpm_netware.c	7 Jun 2002 14:08:05 -0000	1.54
  @@ -923,7 +923,9 @@
   		"Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       show_server_data();
   
  
  
  
  1.266     +3 -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.265
  retrieving revision 1.266
  diff -u -r1.265 -r1.266
  --- prefork.c	30 May 2002 00:21:27 -0000	1.265
  +++ prefork.c	7 Jun 2002 14:08:05 -0000	1.266
  @@ -1012,7 +1012,9 @@
   		"Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       restart_pending = shutdown_pending = 0;
   
  
  
  
  1.128     +3 -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.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- worker.c	30 May 2002 00:21:27 -0000	1.127
  +++ worker.c	7 Jun 2002 14:08:05 -0000	1.128
  @@ -1732,7 +1732,9 @@
                   "Server built: %s", ap_get_server_built());
   #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
  -		"AcceptMutex: %s", ap_valid_accept_mutex_string);
  +		"AcceptMutex: %s (default: %s)",
  +		apr_proc_mutex_name(accept_mutex),
  +		apr_proc_mutex_defname());
   #endif
       restart_pending = shutdown_pending = 0;
   
  
  
  

Mime
View raw message