httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/prefork prefork.c
Date Wed, 07 Feb 2001 20:49:25 GMT
rbb         01/02/07 12:49:25

  Modified:    .        CHANGES
               include  scoreboard.h
               server   scoreboard.c
               server/mpm/dexter dexter.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/perchild perchild.c
               server/mpm/prefork prefork.c
  Log:
  Get the Unix MPMs restarting again.  If we are going to register a cleanup
  for ap_cleanup_scoreboard, then we have to kill that cleanup with the same
  function.  This also makes ap_cleanup_scoreboard a non-static function, and
  makes ap_cleanup_shared_mem a static function.
  
  Revision  Changes    Path
  1.80      +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -d -b -w -u -r1.79 -r1.80
  --- CHANGES	2001/02/07 19:07:46	1.79
  +++ CHANGES	2001/02/07 20:49:23	1.80
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0b1
   
  +  *) Get the Unix MPM's to do a graceful restart again.  If we are going
  +     to register a cleanup with ap_cleanup_scoreboard, then we have to
  +     kill the cleanup with the same function,  and that function can't be
  +     static.  [Ryan Bloom]
  +
     *) Install all required header files.  Without these, it was not
        possible to compile some modules outside of the server.
        [Ryan Bloom]
  
  
  
  1.8       +1 -1      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -b -w -u -r1.7 -r1.8
  --- scoreboard.h	2001/02/06 23:33:29	1.7
  +++ scoreboard.h	2001/02/07 20:49:23	1.8
  @@ -231,7 +231,7 @@
   AP_DECLARE(int) ap_exists_scoreboard_image(void);
   AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
   void reinit_scoreboard(apr_pool_t *p);
  -apr_status_t ap_cleanup_shared_mem(void *d);
  +AP_DECLARE(apr_status_t) ap_cleanup_scoreboard(void *d);
   
   AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
   
  
  
  
  1.7       +2 -2      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -b -w -u -r1.6 -r1.7
  --- scoreboard.c	2001/02/06 20:41:04	1.6
  +++ scoreboard.c	2001/02/07 20:49:24	1.7
  @@ -93,7 +93,7 @@
    * segment, etc.). Leave it as is now because it is being used
    * by various MPMs. 
    */
  -apr_status_t ap_cleanup_shared_mem(void *d)
  +static apr_status_t ap_cleanup_shared_mem(void *d)
   {
   #if APR_HAS_SHARED_MEMORY
       apr_shm_free(scoreboard_shm, ap_scoreboard_image);
  @@ -142,7 +142,7 @@
   /* ap_cleanup_scoreboard
    * 
    */
  -static apr_status_t ap_cleanup_scoreboard(void *d) {
  +apr_status_t ap_cleanup_scoreboard(void *d) {
       if (ap_scoreboard_image == NULL)
           return APR_SUCCESS;
       if (ap_scoreboard_image->global.sb_type == SB_SHARED) {
  
  
  
  1.143     +1 -1      httpd-2.0/server/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/dexter.c,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -d -b -w -u -r1.142 -r1.143
  --- dexter.c	2001/02/07 13:17:26	1.142
  +++ dexter.c	2001/02/07 20:49:24	1.143
  @@ -258,7 +258,7 @@
       restart_pending = 1;
       is_graceful = graceful;
       if (is_graceful) {
  -        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);
  +        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);
       }
   }
   
  
  
  
  1.141     +1 -1      httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -d -b -w -u -r1.140 -r1.141
  --- mpmt_pthread.c	2001/02/07 13:17:29	1.140
  +++ mpmt_pthread.c	2001/02/07 20:49:24	1.141
  @@ -251,7 +251,7 @@
       restart_pending = 1;
       is_graceful = graceful;
       if (is_graceful) {
  -        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);
  +        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);
       }
   }
   
  
  
  
  1.40      +1 -1      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -d -b -w -u -r1.39 -r1.40
  --- perchild.c	2001/02/07 13:17:31	1.39
  +++ perchild.c	2001/02/07 20:49:24	1.40
  @@ -296,7 +296,7 @@
       restart_pending = 1;
       is_graceful = graceful;
       if (is_graceful) {
  -        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);
  +        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);
       }
   }
   
  
  
  
  1.155     +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.154
  retrieving revision 1.155
  diff -u -d -b -w -u -r1.154 -r1.155
  --- prefork.c	2001/02/06 20:41:06	1.154
  +++ prefork.c	2001/02/07 20:49:25	1.155
  @@ -399,7 +399,7 @@
       }
       restart_pending = 1;
       if ((is_graceful = (sig == SIGWINCH))) {
  -        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);
  +        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);
       }
   }
   
  
  
  

Mime
View raw message