Placing the thread-limit and server-limit values, those which define the

size of internal structures in the scoreboard, actually into the
scoreboard allow third-party applications to access those structures.

Submitted by:	Adam Sussman <myddryn@vishnu.vidya.com>
Reviewed by:	Aaron Bannert

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

diff --git a/CHANGES b/CHANGES
index b9f7feaf2d6b2cc038bf3699abee800b001e827e..8f74b24a363ac975ff905b6d2509fc1170c13edd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.33-dev
 
+  *) Add the server-limit and thread-limit values to the scoreboard
+     for the sake of third-party applications.
+     [Adam Sussman <myddryn@vishnu.vidya.com>]
+
   *) Fix segfault when proxy recieves an invalid HTTP response [Ian Holsman]
 
   *) OS/390: Get make install to properly copy DSO modules.

diff --git a/include/scoreboard.h b/include/scoreboard.h
index bbb3b2f016b93297d2471bc8dab444ade65791c9..0b83715eaccc466ce4615bd411bf820010350750 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -159,6 +159,8 @@ struct worker_score {
 };
 
 typedef struct {
+    int             server_limit;
+    int             thread_limit;
     ap_scoreboard_e sb_type;
     ap_generation_t running_generation;        /* the generation of children which
                                          * should still be serving requests. */

diff --git a/server/scoreboard.c b/server/scoreboard.c
index f10651dae107fbec6d0a548ca8f078bd46aae75e..5fafa952fbb61f5efaae9a49d96398c7f1ac804a 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -158,6 +158,8 @@ void ap_init_scoreboard(void *shared_score)
         more_storage += thread_limit * sizeof(worker_score);
     }
     ap_assert(more_storage == (char*)shared_score + scoreboard_size);
+    ap_scoreboard_image->global->server_limit = server_limit;
+    ap_scoreboard_image->global->thread_limit = thread_limit;
 }
 
 /**