reorganize some internal 'externals'

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

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 4fa83a857f4e2a72e8e3bda49641a5937a654cd0..f6d36330a8a0e0770132944f3ba13fb2d3a378d7 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -42,14 +42,6 @@
 #include <mswsock.h>
 #endif 
 
-/* shared with mpm_winnt.c */
-extern DWORD my_pid;
-
-/* used by parent to signal the child to start and exit */
-/* shared with mpm_winnt.c, but should be private to child.c */
-apr_proc_mutex_t *start_mutex;
-HANDLE exit_event;
-
 /*
  * The Windoes MPM uses a queue of completion contexts that it passes
  * between the accept threads and the worker threads. Declare the

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index f9da06dcd3a863ec55bb3123aa423169c756a67f..b2c722ee7dced73504825a41dc0e8c1271e6fb33 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -43,7 +43,9 @@
  * score by moving a handle down the pipe into the child's stdin.
  */
 extern apr_shm_t *ap_scoreboard_shm;
-server_rec *ap_server_conf;
+
+/* ap_my_generation are used by the scoreboard code */
+ap_generation_t volatile ap_my_generation=0;
 
 /* Definitions of WINNT MPM specific config globals */
 static HANDLE shutdown_event;  /* used to signal the parent to shutdown */
@@ -62,30 +64,28 @@ DWORD stack_res_flag;
 static DWORD parent_pid;
 DWORD my_pid;
 
+/* used by parent to signal the child to start and exit */
+apr_proc_mutex_t *start_mutex;
+HANDLE exit_event;
+
 int ap_threads_per_child = 0;
 static int thread_limit = 0;
 static int first_thread_limit = 0;
 int winnt_mpm_state = AP_MPMQ_STARTING;
-/* ap_my_generation are used by the scoreboard code */
-ap_generation_t volatile ap_my_generation=0;
-
 
 /* shared by service.c as global, although
  * perhaps it should be private.
  */
 apr_pool_t *pconf;
 
+/* on several occasions we don't have the global server context
+ * although it's needed for logging, etc.
+ */
+server_rec *ap_server_conf;
 
 /* definitions from child.c */
 void child_main(apr_pool_t *pconf);
 
-/* used by parent to signal the child to start and exit
- * NOTE: these are not sophisticated enough for multiple children
- * so they ultimately should not be shared with child.c
- */
-extern apr_proc_mutex_t *start_mutex;
-extern HANDLE exit_event;
-
 /* Only one of these, the pipe from our parent, ment only for
  * one child worker's consumption (not to be inherited!)
  * XXX: decorate this name for the trunk branch, was left simplified

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 4d185a3dbeade02dbb6ad3dd8848c4bee1f9431c..8cb36d94847c94cd9c80ab1eb9dae0a4d25dcfd7 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -66,6 +66,10 @@ void mpm_nt_eventlog_stderr_flush(void);
 
 /* From mpm_winnt.c: */
 
+extern DWORD my_pid;
+extern apr_proc_mutex_t *start_mutex;
+extern HANDLE exit_event;
+
 extern int winnt_mpm_state;
 extern OSVERSIONINFO osver;
 extern DWORD stack_res_flag;