httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Mon, 10 Dec 2001 20:17:36 GMT
trawick     01/12/10 12:17:36

  Modified:    .        CHANGES
               server/mpm/worker worker.c
  Log:
  get worker MPM to respect the LockFile setting
  
  Revision  Changes    Path
  1.473     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.472
  retrieving revision 1.473
  diff -u -r1.472 -r1.473
  --- CHANGES	2001/12/08 01:38:04	1.472
  +++ CHANGES	2001/12/10 20:17:35	1.473
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.30-dev
   
  +  *) The worker MPM now respects the LockFile setting, needed to
  +     avoid locking problems with NFS.  [Jeff Trawick]
  +
     *) Fix segfault when worker MPM receives SIGHUP.
        [Ian Holsman, Aaron Bannert, Justin Erenkrantz]
   
  
  
  
  1.45      +6 -7      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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- worker.c	2001/12/08 01:38:05	1.44
  +++ worker.c	2001/12/10 20:17:36	1.45
  @@ -191,7 +191,6 @@
   
   /* Locks for accept serialization */
   static apr_proc_mutex_t *accept_mutex;
  -static const char *lock_fname;
   
   #ifdef NO_SERIALIZED_ACCEPT
   #define SAFE_ACCEPT(stmt) APR_SUCCESS
  @@ -829,7 +828,7 @@
       /*stuff to do before we switch id's, so we have permissions.*/
       reopen_scoreboard(pchild);
   
  -    rv = SAFE_ACCEPT(apr_proc_mutex_child_init(&accept_mutex, lock_fname,
  +    rv = SAFE_ACCEPT(apr_proc_mutex_child_init(&accept_mutex, ap_lock_fname,
                                                  pchild));
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
  @@ -1294,10 +1293,10 @@
       ap_log_pid(pconf, ap_pid_fname);
   
       /* Initialize cross-process accept lock */
  -    lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
  -                             ap_server_root_relative(_pconf, lock_fname),
  -                             ap_my_pid);
  -    rv = apr_proc_mutex_create_np(&accept_mutex, lock_fname, 
  +    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
  +                                 ap_server_root_relative(_pconf, ap_lock_fname),
  +                                 ap_my_pid);
  +    rv = apr_proc_mutex_create_np(&accept_mutex, ap_lock_fname, 
                                     ap_accept_lock_mech, _pconf);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
  @@ -1501,7 +1500,7 @@
       ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
       ap_pid_fname = DEFAULT_PIDLOG;
       ap_scoreboard_fname = DEFAULT_SCOREBOARD;
  -    lock_fname = DEFAULT_LOCKFILE;
  +    ap_lock_fname = DEFAULT_LOCKFILE;
       ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
       ap_extended_status = 0;
   
  
  
  

Mime
View raw message