Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 16 Jul 2001 02:29:34 -0000
Message-ID: <20010716022934.39027.qmail@apache.org>
From: rbb@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/prefork prefork.c

rbb         01/07/15 19:29:33

  Modified:    include  scoreboard.h
               server   scoreboard.c
               server/mpm/prefork prefork.c
  Log:
  Remove a couple fields from the scoreboard that aren't currently used.
  If we need these, they should be added when we begin to use them.
  
  Revision  Changes    Path
  1.25      +0 -4      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -d -b -w -u -r1.24 -r1.25
  --- scoreboard.h	2001/07/12 03:20:39	1.24
  +++ scoreboard.h	2001/07/16 02:29:33	1.25
  @@ -176,10 +176,6 @@
       pid_t pid;
       ap_generation_t generation;	/* generation of this child */
       ap_scoreboard_e sb_type;
  -    unsigned short process_status;    /* Either SB_WORKING or SB_IDLE_DIE */
  -    int worker_threads;
  -    worker_score *worker_head;
  -    process_score *next;
   };
   
   typedef struct {
  
  
  
  1.27      +0 -1      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -d -b -w -u -r1.26 -r1.27
  --- scoreboard.c	2001/07/12 03:20:50	1.26
  +++ scoreboard.c	2001/07/16 02:29:33	1.27
  @@ -283,7 +283,6 @@
   	&& old_status == SERVER_STARTING) {
           ws->thread_num = child_num * HARD_SERVER_LIMIT + thread_num;
           ps->generation = ap_my_generation;
  -        ps->worker_threads = ap_threads_per_child;
       }
   
       if (ap_extended_status) {
  
  
  
  1.190     +0 -6      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.189
  retrieving revision 1.190
  diff -u -d -b -w -u -r1.189 -r1.190
  --- prefork.c	2001/07/10 18:56:55	1.189
  +++ prefork.c	2001/07/16 02:29:33	1.190
  @@ -844,7 +844,6 @@
   	apr_signal(SIGQUIT, SIG_DFL);
   #endif
   	apr_signal(SIGTERM, just_die);
  -        ap_scoreboard_image->parent[slot].process_status = SB_WORKING;
   	child_main(slot);
       }
   
  @@ -896,7 +895,6 @@
            * pod is used for signalling graceful restart.
            */
           apr_signal(SIGWINCH, SIG_IGN);
  -        ap_scoreboard_image->parent[slot].process_status = SB_WORKING;
   	child_main(slot);
       }
   
  @@ -1263,10 +1261,6 @@
       ap_scoreboard_image->global.running_generation = ap_my_generation;
       update_scoreboard_global();
       
  -    for (index = 0; index < ap_daemons_limit; ++index) {
  -        ap_scoreboard_image->parent[index].process_status = SB_IDLE_DIE;
  -    }
  -
       if (is_graceful) {
   	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,
   		    "Graceful restart requested, doing restart");