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/support ab.c
Date Thu, 11 Jul 2002 05:42:21 GMT
rbb         2002/07/10 22:42:21

  Modified:    modules/experimental mod_ext_filter.c
               modules/proxy proxy_connect.c
               server/mpm/beos beos.c
               server/mpm/experimental/leader leader.c
               server/mpm/experimental/perchild perchild.c
               server/mpm/experimental/threadpool threadpool.c
               server/mpm/mpmt_os2 mpmt_os2_child.c
               server/mpm/prefork prefork.c
               server/mpm/worker worker.c
               support  ab.c
  Log:
  Bring Apache in line with APR's new poll implementation.  This isn't
  optimal, because it still uses the compatibility functions to make it
  work, but it does work.  The next step will be to take the memory for
  the pollsets under Apache's control.
  
  Revision  Changes    Path
  1.33      +3 -3      httpd-2.0/modules/experimental/mod_ext_filter.c
  
  Index: mod_ext_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_ext_filter.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_ext_filter.c	10 Jul 2002 11:58:37 -0000	1.32
  +++ mod_ext_filter.c	11 Jul 2002 05:42:18 -0000	1.33
  @@ -71,6 +71,7 @@
   #include "apr_strings.h"
   #include "apr_hash.h"
   #include "apr_lib.h"
  +#include "apr_poll.h"
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
   
  @@ -627,9 +628,8 @@
   #if APR_FILES_AS_SOCKETS
                   int num_events;
                   
  -                rv = apr_poll(ctx->pollset,
  -                              &num_events,
  -                              f->r->server->timeout);
  +                rv = apr_poll(ctx->pollset, 2,
  +                              &num_events, f->r->server->timeout);
                   if (rv || dc->debug >= DBGLVL_GORY) {
                       ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                     rv, f->r, "apr_poll()");
  
  
  
  1.60      +2 -1      httpd-2.0/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_connect.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- proxy_connect.c	17 May 2002 11:24:16 -0000	1.59
  +++ proxy_connect.c	11 Jul 2002 05:42:19 -0000	1.60
  @@ -61,6 +61,7 @@
   #define CORE_PRIVATE
   
   #include "mod_proxy.h"
  +#include "apr_poll.h"
   
   module AP_MODULE_DECLARE_DATA proxy_connect_module;
   
  @@ -320,7 +321,7 @@
   
       while (1) { /* Infinite loop until error (one side closes the connection) */
   /*	ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: going to sleep
(poll)");*/
  -        if ((rv = apr_poll(pollfd, &pollcnt, -1)) != APR_SUCCESS)
  +        if ((rv = apr_poll(pollfd, 2, &pollcnt, -1)) != APR_SUCCESS)
           {
   	    apr_socket_close(sock);
               ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: CONNECT: error apr_poll()");
  
  
  
  1.98      +2 -1      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- beos.c	4 Jul 2002 15:20:52 -0000	1.97
  +++ beos.c	11 Jul 2002 05:42:19 -0000	1.98
  @@ -87,6 +87,7 @@
   #include "mpm.h"
   #include "mpm_default.h"
   #include "apr_thread_mutex.h"
  +#include "apr_poll.h"
   
   extern int _kset_fd_limit_(int num);
   
  @@ -421,7 +422,7 @@
               apr_int16_t event;
               apr_status_t ret;
   
  -            ret = apr_poll(pollset, &srv, -1);
  +            ret = apr_poll(pollset, num_listening_sockets, &srv, -1);
   
               if (ret != APR_SUCCESS) {
                   if (APR_STATUS_IS_EINTR(ret)) {
  
  
  
  1.23      +2 -1      httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- leader.c	4 Jul 2002 15:20:53 -0000	1.22
  +++ leader.c	11 Jul 2002 05:42:19 -0000	1.23
  @@ -106,6 +106,7 @@
   #include "ap_listen.h"
   #include "scoreboard.h" 
   #include "mpm_default.h"
  +#include "apr_poll.h"
   
   #include <signal.h>
   #include <limits.h>             /* for INT_MAX */
  @@ -888,7 +889,7 @@
                   apr_status_t ret;
                   apr_int16_t event;
   
  -                ret = apr_poll(pollset, &n, -1);
  +                ret = apr_poll(pollset, num_listensocks, &n, -1);
                   if (ret != APR_SUCCESS) {
                       if (APR_STATUS_IS_EINTR(ret)) {
                           continue;
  
  
  
  1.129     +2 -1      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- perchild.c	30 Jun 2002 21:59:50 -0000	1.128
  +++ perchild.c	11 Jul 2002 05:42:20 -0000	1.129
  @@ -95,6 +95,7 @@
   #include "mpm.h"
   #include "scoreboard.h"
   #include "util_filter.h"
  +#include "apr_poll.h"
   
   /* ### should be APR-ized */
   #include <poll.h>
  @@ -748,7 +749,7 @@
   
           while (!workers_may_exit) {
               apr_int16_t event;
  -            srv = apr_poll(pollset, &n, -1);
  +            srv = apr_poll(pollset, num_listensocks, &n, -1);
   
               if (srv != APR_SUCCESS) {
                   if (APR_STATUS_IS_EINTR(srv)) {
  
  
  
  1.13      +2 -1      httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- threadpool.c	4 Jul 2002 15:20:53 -0000	1.12
  +++ threadpool.c	11 Jul 2002 05:42:20 -0000	1.13
  @@ -69,6 +69,7 @@
   #include "apr_file_io.h"
   #include "apr_thread_proc.h"
   #include "apr_signal.h"
  +#include "apr_poll.h"
   #include "apr_thread_mutex.h"
   #include "apr_thread_cond.h"
   #include "apr_proc_mutex.h"
  @@ -913,7 +914,7 @@
                   apr_status_t ret;
                   apr_int16_t event;
   
  -                ret = apr_poll(pollset, &n, -1);
  +                ret = apr_poll(pollset, num_listensocks, &n, -1);
                   if (ret != APR_SUCCESS) {
                       if (APR_STATUS_IS_EINTR(ret)) {
                           continue;
  
  
  
  1.23      +2 -1      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c
  
  Index: mpmt_os2_child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mpmt_os2_child.c	17 May 2002 11:11:39 -0000	1.22
  +++ mpmt_os2_child.c	11 Jul 2002 05:42:20 -0000	1.23
  @@ -73,6 +73,7 @@
   #include "ap_mpm.h"
   #include "ap_listen.h"
   #include "apr_portable.h"
  +#include "apr_poll.h"
   #include "mpm_common.h"
   #include "apr_strings.h"
   #include <os2.h>
  @@ -250,7 +251,7 @@
               rv = APR_FROM_OS_ERROR(rc);
   
               if (rv == APR_SUCCESS) {
  -                rv = apr_poll(pollset, &nsds, -1);
  +                rv = apr_poll(pollset, num_listeners, &nsds, -1);
                   DosReleaseMutexSem(ap_mpm_accept_mutex);
               }
   
  
  
  
  1.269     +2 -1      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.268
  retrieving revision 1.269
  diff -u -r1.268 -r1.269
  --- prefork.c	4 Jul 2002 15:20:54 -0000	1.268
  +++ prefork.c	11 Jul 2002 05:42:20 -0000	1.269
  @@ -89,6 +89,7 @@
   #include "mpm_common.h"
   #include "ap_listen.h"
   #include "ap_mmn.h"
  +#include "apr_poll.h"
   
   #ifdef HAVE_BSTRING_H
   #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
  @@ -631,7 +632,7 @@
                   apr_int16_t event;
                   apr_int32_t n;
   
  -                ret = apr_poll(pollset, &n, -1);
  +                ret = apr_poll(pollset, num_listensocks, &n, -1);
                   if (ret != APR_SUCCESS) {
                       if (APR_STATUS_IS_EINTR(ret)) {
                           continue;
  
  
  
  1.131     +2 -1      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- worker.c	4 Jul 2002 22:41:48 -0000	1.130
  +++ worker.c	11 Jul 2002 05:42:20 -0000	1.131
  @@ -71,6 +71,7 @@
   #include "apr_signal.h"
   #include "apr_thread_mutex.h"
   #include "apr_proc_mutex.h"
  +#include "apr_poll.h"
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
   
  @@ -758,7 +759,7 @@
                   apr_status_t ret;
                   apr_int16_t event;
   
  -                ret = apr_poll(pollset, &n, -1);
  +                ret = apr_poll(pollset, num_listensocks, &n, -1);
                   if (ret != APR_SUCCESS) {
                       if (APR_STATUS_IS_EINTR(ret)) {
                           continue;
  
  
  
  1.109     +4 -3      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- ab.c	8 Jul 2002 19:39:01 -0000	1.108
  +++ ab.c	11 Jul 2002 05:42:20 -0000	1.109
  @@ -166,6 +166,7 @@
   #include "apr_lib.h"
   #include "apr_portable.h"
   #include "ap_release.h"
  +#include "apr_poll.h"
   
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
  @@ -1648,7 +1649,7 @@
               status = APR_SUCCESS;
           else
   #endif
  -	status = apr_poll(readbits, &n, aprtimeout);
  +	status = apr_poll(readbits, concurrency, &n, aprtimeout);
   	if (status != APR_SUCCESS)
   	    apr_err("apr_poll", status);
   
  
  
  

Mime
View raw message