httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chris Darroch <chr...@pearsoncmg.com>
Subject [PATCH 2/6] misleading scoreboard comments
Date Thu, 04 May 2006 17:33:07 GMT
Hi --

   These comments were added in r89115 as the first step toward
converting the scoreboard from arrays to linked lists.  The structure
elements added in that revision were then backed out in r89554, but
the comments remained.  They're rather misleading because obviously
worker_score is not dependent on mod_status being loaded.  This was
the original discussion that led to r89115:

http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=98952079728558&w=2
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=99680564224536&w=2

   The SB_WORKING and SB_IDLE_DIE definitions were added in
r88741 for use with a life_status field in short_score; short_score
was changed to worker_score and life_status was dropped in the
previously described r89115.  These definitions are therefore
no longer used.

   I also did a tiny bit of whitespace cleanup; just couldn't help
myself.

Chris.

=====================================================================
--- include/scoreboard.h.orig	2006-05-02 09:55:00.648692443 -0400
+++ include/scoreboard.h	2006-05-03 10:33:47.343766694 -0400
@@ -87,18 +87,8 @@
     SB_SHARED = 2
 } ap_scoreboard_e;
 
-#define SB_WORKING  0  /* The server is busy and the child is useful. */
-#define SB_IDLE_DIE 1  /* The server is idle and the child is superfluous. */
-                       /*   The child should check for this and exit gracefully. */
-
 /* stuff which is worker specific */
-/***********************WARNING***************************************/
-/* These are things that are used by mod_status. Do not put anything */
-/*   in here that you cannot live without. This structure will not   */
-/*   be available if mod_status is not loaded.                       */
-/*********************************************************************/
 typedef struct worker_score worker_score;
-
 struct worker_score {
     int thread_num;
 #if APR_HAS_THREADS
@@ -142,7 +132,7 @@
 
 /* stuff which the parent generally writes and the children rarely read */
 typedef struct process_score process_score;
-struct process_score{
+struct process_score {
     pid_t pid;
     ap_generation_t generation;	/* generation of this child */
     ap_scoreboard_e sb_type;
@@ -153,7 +143,7 @@
 
 /* stuff which is lb specific */
 typedef struct lb_score lb_score;
-struct lb_score{
+struct lb_score {
     /* TODO: make a real stuct from this */
     unsigned char data[1024];
 };

Mime
View raw message