apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: apr/test testoc.c
Date Wed, 16 May 2001 20:56:08 GMT
stoddard    01/05/16 13:56:06

  Modified:    include  apr_thread_proc.h
               misc/unix otherchild.c
               test     testoc.c
  Log:
  Remove apr_proc_probe_writable_fds
  
  Revision  Changes    Path
  1.64      +0 -7      apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_thread_proc.h,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- apr_thread_proc.h	2001/05/04 17:35:44	1.63
  +++ apr_thread_proc.h	2001/05/16 20:55:49	1.64
  @@ -554,13 +554,6 @@
    */
   APR_DECLARE(void) apr_proc_other_child_check(void); 
   
  -/**
  - * Ensure all the registered write_fds are still writable, otherwise 
  - * invoke the maintenance functions as appropriate.
  - * @deffunc void apr_proc_probe_writable_fds()
  - */
  -APR_DECLARE(void) apr_proc_probe_writable_fds(void);
  -
   #endif /* APR_HAS_OTHER_CHILD */
   
   /** 
  
  
  
  1.23      +0 -50     apr/misc/unix/otherchild.c
  
  Index: otherchild.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/otherchild.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- otherchild.c	2001/05/16 19:14:50	1.22
  +++ otherchild.c	2001/05/16 20:55:55	1.23
  @@ -130,56 +130,6 @@
       other_child_cleanup(data);
   }
   
  -/* test to ensure that the write_fds are all still writable, otherwise
  - * invoke the maintenance functions as appropriate */
  -void apr_proc_probe_writable_fds(void)
  -{
  -    fd_set writable_fds;
  -    int fd_max;
  -    apr_other_child_rec_t *ocr, *nocr; 
  -    struct timeval tv; 
  -    int rc;
  -
  -    if (other_children == NULL)
  -        return;
  -
  -    fd_max = 0;
  -    FD_ZERO(&writable_fds);
  -    do {
  -        for (ocr = other_children; ocr; ocr = ocr->next) {
  -            if (ocr->write_fd == -1)
  -                continue;
  -            FD_SET(ocr->write_fd, &writable_fds);
  -            if (ocr->write_fd > fd_max) {
  -                fd_max = ocr->write_fd;
  -            }
  -        }
  -        if (fd_max == 0)
  -            return;
  -
  -        tv.tv_sec = 0;
  -        tv.tv_usec = 0;
  -        rc = select(fd_max + 1, NULL, &writable_fds, NULL, &tv);
  -    } while (rc == -1 && errno == EINTR);
  -
  -    if (rc == -1) {
  -        /* XXX: uhh this could be really bad, we could have a bad file
  -         * descriptor due to a bug in one of the maintenance routines */
  -        return;
  -    }
  -    if (rc == 0)
  -        return;
  -
  -    for (ocr = other_children; ocr; ocr = nocr) {
  -        nocr = ocr->next;
  -        if (ocr->write_fd == -1)
  -            continue;
  -        if (FD_ISSET(ocr->write_fd, &writable_fds))
  -            continue;
  -        (*ocr->maintenance) (APR_OC_REASON_UNWRITABLE, ocr->data, -1);
  -    }
  -}
  -
   APR_DECLARE(apr_status_t) apr_proc_other_child_read(apr_proc_t *pid, int status)
   {
       apr_other_child_rec_t *ocr, *nocr;
  
  
  
  1.20      +0 -1      apr/test/testoc.c
  
  Index: testoc.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testoc.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- testoc.c	2001/02/25 20:39:39	1.19
  +++ testoc.c	2001/05/16 20:56:01	1.20
  @@ -147,7 +147,6 @@
       
       /* allow time for things to settle... */
       apr_sleep(3 * APR_USEC_PER_SEC);
  -    apr_proc_probe_writable_fds();
       
       fprintf(stdout, "[PARENT] Checking on children..........\n");
       apr_proc_other_child_check();
  
  
  

Mime
View raw message