httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Mon, 12 Feb 2001 18:48:04 GMT
rbb         01/02/12 10:48:02

  Modified:    .        CHANGES
               server   connection.c
               server/mpm/dexter dexter.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/prefork prefork.c
               server/mpm/spmt_os2 spmt_os2.c
               server/mpm/winnt mpm_winnt.c
  Log:
  Begin to move the code that updates the child status out of the MPMs and
  into the main-line code.  This ensures that all MPMs can easily forget
  about updating their status.
  
  Revision  Changes    Path
  1.89      +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -d -b -w -u -r1.88 -r1.89
  --- CHANGES	2001/02/12 16:50:19	1.88
  +++ CHANGES	2001/02/12 18:47:40	1.89
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0b1
   
  +  *) Begin to move the calls to update_child_status into common code, so
  +     that each individual MPM does not need to update the scoreboard itself.
  +     [Ryan Bloom]
  +
     *) Allow mod_tls to compile under Unix boxes where openssl has been
        installed to the system include files.
        [Gomez Henri <new-httpd@slib.fr>]
  
  
  
  1.75      +3 -0      httpd-2.0/server/connection.c
  
  Index: connection.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/connection.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -d -b -w -u -r1.74 -r1.75
  --- connection.c	2001/02/10 14:04:17	1.74
  +++ connection.c	2001/02/12 18:47:45	1.75
  @@ -269,6 +269,9 @@
       conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));
       apr_status_t rv;
   
  +    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(id), 
  +                                  SERVER_BUSY_READ, (request_rec *) NULL);
  +
       /* Got a connection structure, so initialize what fields we can
        * (the rest are zeroed out by pcalloc).
        */
  
  
  
  1.148     +0 -3      httpd-2.0/server/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/dexter.c,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -u -d -b -w -u -r1.147 -r1.148
  --- dexter.c	2001/02/11 03:27:20	1.147
  +++ dexter.c	2001/02/12 18:47:48	1.148
  @@ -419,9 +419,6 @@
   
       ap_sock_disable_nagle(sock);
   
  -    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(conn_id),
  -                                  SERVER_BUSY_READ, (request_rec *) NULL);
  -
       current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
       if (current_conn) {
           ap_process_connection(current_conn);
  
  
  
  1.148     +0 -3      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.147
  retrieving revision 1.148
  diff -u -d -b -w -u -r1.147 -r1.148
  --- mpmt_pthread.c	2001/02/11 03:27:21	1.147
  +++ mpmt_pthread.c	2001/02/12 18:47:51	1.148
  @@ -414,9 +414,6 @@
   
       ap_sock_disable_nagle(sock);
   
  -    (void) ap_update_child_status(my_child_num, my_thread_num,  
  -				  SERVER_BUSY_READ, (request_rec *) NULL);
  -
       current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
       if (current_conn) {
           ap_process_connection(current_conn);
  
  
  
  1.164     +0 -3      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.163
  retrieving revision 1.164
  diff -u -d -b -w -u -r1.163 -r1.164
  --- prefork.c	2001/02/12 18:22:18	1.163
  +++ prefork.c	2001/02/12 18:47:54	1.164
  @@ -790,9 +790,6 @@
   
   	ap_sock_disable_nagle(csd);
   
  -	(void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(my_child_num), SERVER_BUSY_READ,
  -				   (request_rec *) NULL);
  -
   	current_conn = ap_new_connection(ptrans, ap_server_conf, csd, 
                                            my_child_num);
           if (current_conn) {
  
  
  
  1.84      +0 -3      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -d -b -w -u -r1.83 -r1.84
  --- spmt_os2.c	2001/02/11 00:44:39	1.83
  +++ spmt_os2.c	2001/02/12 18:47:57	1.84
  @@ -691,9 +691,6 @@
   
   	ap_sock_disable_nagle(csd);
   
  -	(void) ap_update_child_status(0, THREAD_GLOBAL(thread_num), SERVER_BUSY_READ,
  -				   (request_rec *) NULL);
  -
   	current_conn = ap_new_connection(ptrans, ap_server_conf, csd,
                                            THREAD_GLOBAL(thread_num));
   
  
  
  
  1.138     +0 -3      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -d -b -w -u -r1.137 -r1.138
  --- mpm_winnt.c	2001/02/10 21:57:45	1.137
  +++ mpm_winnt.c	2001/02/12 18:48:00	1.138
  @@ -1162,9 +1162,6 @@
           sockinfo.type    = SOCK_STREAM;
           apr_os_sock_make(&context->sock, &sockinfo, context->ptrans);
   
  -        ap_update_child_status(0, thread_num,  
  -                               SERVER_BUSY_READ, (request_rec *) NULL);
  -
           c = ap_new_connection(context->ptrans, server_conf, context->sock,
                                 thread_num);
   
  
  
  

Mime
View raw message