httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/prefork prefork.c
Date Fri, 09 Feb 2001 16:11:51 GMT
stoddard    01/02/09 08:11:51

  Modified:    include  scoreboard.h
               server   scoreboard.c
               server/mpm/beos beos.c
               server/mpm/dexter dexter.c
               server/mpm/mpmt_beos mpmt_beos.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/perchild perchild.c
               server/mpm/prefork prefork.c
  Log:
  Replace reinit_scoreboard with ap_create_scoreboard.
  
  Revision  Changes    Path
  1.11      +0 -1      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- scoreboard.h	2001/02/09 04:19:42	1.10
  +++ scoreboard.h	2001/02/09 16:11:43	1.11
  @@ -225,7 +225,6 @@
   
   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_scoreboard(void *d);
   
   AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
  
  
  
  1.10      +0 -9      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- scoreboard.c	2001/02/08 07:44:19	1.9
  +++ scoreboard.c	2001/02/09 16:11:44	1.10
  @@ -188,15 +188,6 @@
       apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, apr_pool_cleanup_null);
   }
   
  -/* ToDo:
  - * reinit_scoreboard should be eliminated when all MPMs migrate to
  - * ap_create_scoreboard()
  - */
  -void reinit_scoreboard(apr_pool_t *p)
  -{
  -    ap_create_scoreboard(p, SB_SHARED);
  -}
  -
   /* Routines called to deal with the scoreboard image
    * --- note that we do *not* need write locks, since update_child_status
    * only updates a *single* record in place, and only one process writes to
  
  
  
  1.39      +1 -1      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- beos.c	2001/02/08 07:44:28	1.38
  +++ beos.c	2001/02/09 16:11:45	1.39
  @@ -677,7 +677,7 @@
        */
       
       if (!is_graceful)
  -        reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
   
       set_signals();
       /* Sanity cehcks to avoid thrashing... */
  
  
  
  1.145     +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.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- dexter.c	2001/02/08 07:44:28	1.144
  +++ dexter.c	2001/02/09 16:11:46	1.145
  @@ -1019,7 +1019,7 @@
       }
   
       if (!is_graceful) {
  -        reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
       }
       /* Initialize the child table */
       if (!is_graceful) {
  
  
  
  1.65      +1 -1      httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mpmt_beos.c	2001/02/08 07:44:29	1.64
  +++ mpmt_beos.c	2001/02/09 16:11:47	1.65
  @@ -700,7 +700,7 @@
       }
   
       if (!is_graceful) {
  -	reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
       }
   
       set_signals();
  
  
  
  1.143     +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.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- mpmt_pthread.c	2001/02/08 07:44:30	1.142
  +++ mpmt_pthread.c	2001/02/09 16:11:48	1.143
  @@ -1026,7 +1026,7 @@
   
   
       if (!is_graceful) {
  -	reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
       }
   
       set_signals();
  
  
  
  1.42      +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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- perchild.c	2001/02/08 07:44:30	1.41
  +++ perchild.c	2001/02/09 16:11:49	1.42
  @@ -1179,7 +1179,7 @@
       }
   
       if (!is_graceful) {
  -        reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
       }
       /* Initialize the child table */
       if (!is_graceful) {
  
  
  
  1.158     +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.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- prefork.c	2001/02/08 07:44:30	1.157
  +++ prefork.c	2001/02/09 16:11:50	1.158
  @@ -1088,7 +1088,7 @@
   
       SAFE_ACCEPT(accept_mutex_init(pconf));
       if (!is_graceful) {
  -	reinit_scoreboard(pconf);
  +        ap_create_scoreboard(pconf, SB_SHARED);
       }
   #ifdef SCOREBOARD_FILE
       else {
  
  
  

Mime
View raw message