Was certain I had committed this. Position the scoreboard members such

  that the size and members can be derrived by the most stable elements,
  followed by derived elements.  [Harrie Hazewinkel]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89326 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 9cc35dca36f3ac739f257d7db2bbd72cc5ca1210..8869d60cc9a71c7f69911421a115a0e66c29fab9 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -74,12 +74,13 @@
 
 /*
  * 20010224 (2.0.13-dev) MODULE_MAGIC_COOKIE reset to "AP20"
+ * 20010523 (2.0.19-dev) bump for scoreboard structure reordering
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20010224
+#define MODULE_MAGIC_NUMBER_MAJOR 20010523
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR  /* backward compat */

diff --git a/include/scoreboard.h b/include/scoreboard.h
index d060c9b1e0e52a923c082ff333841b7dad14f8ed..48f45aaf6df46b65669c3882515d9c4b93eb5eb8 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -184,9 +184,9 @@ struct process_score{
 };
 
 typedef struct {
-    worker_score servers[HARD_SERVER_LIMIT][HARD_THREAD_LIMIT];
-    process_score parent[HARD_SERVER_LIMIT];
     global_score global;
+    process_score parent[HARD_SERVER_LIMIT];
+    worker_score servers[HARD_SERVER_LIMIT][HARD_THREAD_LIMIT];
 } scoreboard;
 
 #define KEY_LENGTH 16