Fix some bogosity dealing with the mapping from process and thread

numbers to ids and back.

This gets mpmt_pthread working again (it was hanging/looping before this).
I don't know whether or not dexter had the same problem.

Submitted by:	Jeff Trawick and Greg Ames

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

diff --git a/server/mpm/dexter/mpm_default.h b/server/mpm/dexter/mpm_default.h
index 6a980e08a8f97fbed10ddcc02b5025b631ea1e83..2929bbc6c8388ba423a7ee1451eef6ca19689fca 100644 (file)
--- a/server/mpm/dexter/mpm_default.h
+++ b/server/mpm/dexter/mpm_default.h
@@ -59,8 +59,8 @@
 #ifndef APACHE_MPM_DEFAULT_H
 #define APACHE_MPM_DEFAULT_H
 
-#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_SERVER_LIMIT) + HARD_THREAD_LIMIT)
-#define AP_CHILD_THREAD_FROM_ID(i)    (i / HARD_SERVER_LIMIT), (i % HARD_THREAD_LIMIT)
+#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_THREAD_LIMIT) + t)
+#define AP_CHILD_THREAD_FROM_ID(i)    (i / HARD_THREAD_LIMIT), (i % HARD_THREAD_LIMIT)
 
 /* Number of threads to spawn off by default --- also, if fewer than
  * this free when the caretaker checks, it will spawn more.

diff --git a/server/mpm/mpmt_pthread/mpm_default.h b/server/mpm/mpmt_pthread/mpm_default.h
index 3967fd035f85c4e9a71f447912af66fe2f4e043b..02dfb470152311217a34b70a199bdbb5a2eb2513 100644 (file)
--- a/server/mpm/mpmt_pthread/mpm_default.h
+++ b/server/mpm/mpmt_pthread/mpm_default.h
@@ -59,8 +59,8 @@
 #ifndef APACHE_MPM_DEFAULT_H
 #define APACHE_MPM_DEFAULT_H
 
-#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_SERVER_LIMIT) + HARD_THREAD_LIMIT)
-#define AP_CHILD_THREAD_FROM_ID(i)    (i / HARD_SERVER_LIMIT), (i % HARD_THREAD_LIMIT)
+#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_THREAD_LIMIT) + t)
+#define AP_CHILD_THREAD_FROM_ID(i)    (i / HARD_THREAD_LIMIT), (i % HARD_THREAD_LIMIT)
 
 /* Number of servers to spawn off by default --- also, if fewer than
  * this free when the caretaker checks, it will spawn more.

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 2f25ec682ea969ac3c9b2a2cafd460cd5f3d7ef6..6d5032b43792c4a8a61041f5d0da7d8a92669dba 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -389,7 +389,7 @@ int ap_graceful_stop_signalled(void)
 static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num, int my_thread_num)
 {
     conn_rec *current_conn;
-    long conn_id = my_child_num * HARD_THREAD_LIMIT + my_thread_num;
+    long conn_id = AP_ID_FROM_CHILD_THREAD(my_child_num, my_thread_num);
     int csd;
 
     (void) apr_get_os_sock(&csd, sock);