You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/02/02 16:52:11 UTC
cvs commit: httpd-2.0/server/mpm/mpmt_pthread mpm_default.h mpmt_pthread.c
trawick 01/02/02 07:52:10
Modified: server/mpm/dexter mpm_default.h
server/mpm/mpmt_pthread mpm_default.h mpmt_pthread.c
Log:
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
Revision Changes Path
1.8 +2 -2 httpd-2.0/server/mpm/dexter/mpm_default.h
Index: mpm_default.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/mpm_default.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mpm_default.h 2001/02/01 21:54:39 1.7
+++ mpm_default.h 2001/02/02 15:52:05 1.8
@@ -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.
1.8 +2 -2 httpd-2.0/server/mpm/mpmt_pthread/mpm_default.h
Index: mpm_default.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpm_default.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mpm_default.h 2001/02/01 21:54:54 1.7
+++ mpm_default.h 2001/02/02 15:52:08 1.8
@@ -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.
1.136 +1 -1 httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mpmt_pthread.c 2001/02/01 21:54:55 1.135
+++ mpmt_pthread.c 2001/02/02 15:52:09 1.136
@@ -389,7 +389,7 @@
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);
Re: cvs commit: httpd-2.0/server/mpm/mpmt_pthread mpm_default.h
mpmt_pthread.c
Posted by rb...@covalent.net.
> Log:
> 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.
Good catch guys. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/server/mpm/mpmt_pthread mpm_default.h
mpmt_pthread.c
Posted by rb...@covalent.net.
> Log:
> 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.
Good catch guys. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------