You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/07/10 21:00:06 UTC
cvs commit: httpd-2.0/server scoreboard.c
rbb 01/07/10 12:00:06
Modified: . CHANGES
include scoreboard.h
server scoreboard.c
Log:
Add two functions to allow modules to access random parts of the
scoreboard. This allows modules compiled for one MPM to access the
scoreboard, even if it the server was compiled for another MPM.
Submitted by: Harrie Hazewinkel <ha...@covalent.net>
Revision Changes Path
1.243 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -b -w -u -r1.242 -r1.243
--- CHANGES 2001/07/09 02:55:26 1.242
+++ CHANGES 2001/07/10 18:59:54 1.243
@@ -1,5 +1,10 @@
Changes with Apache 2.0.21-dev
+ *) Add two functions to allow modules to access random parts of the
+ scoreboard. This allows modules compiled for one MPM to access the
+ scoreboard, even if it the server was compiled for another MPM.
+ [Harrie Hazewinkel <ha...@covalent.net>]
+
Changes with Apache 2.0.20
*) Fix problem in content-length filter where the filter would
1.23 +2 -1 httpd-2.0/include/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -b -w -u -r1.22 -r1.23
--- scoreboard.h 2001/06/10 00:37:59 1.22
+++ scoreboard.h 2001/07/10 18:59:59 1.23
@@ -216,7 +216,8 @@
AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid);
int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
void ap_time_process_request(int child_num, int thread_num, int status);
-
+worker_score *ap_get_servers_scoreboard(int x, int y);
+process_score *ap_get_parent_scoreboard(int x);
AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
1.25 +17 -0 httpd-2.0/server/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -b -w -u -r1.24 -r1.25
--- scoreboard.c 2001/05/22 01:31:12 1.24
+++ scoreboard.c 2001/07/10 19:00:03 1.25
@@ -340,3 +340,20 @@
put_scoreboard_info(child_num, thread_num, ws);
}
+worker_score *ap_get_servers_scoreboard(int x, int y)
+{
+ if (((x < 0) || (HARD_SERVER_LIMIT < x)) ||
+ ((y < 0) || (HARD_THREAD_LIMIT < y))) {
+ return(NULL); /* Out of range */
+ }
+ return(&ap_scoreboard_image->servers[x][y]);
+}
+
+process_score *ap_get_parent_scoreboard(int x)
+{
+ if ((x < 0) || (HARD_SERVER_LIMIT < x)) {
+ return(NULL); /* Out of range */
+ }
+ return(&ap_scoreboard_image->parent[x]);
+}
+