Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 17 Sep 2001 20:12:23 -0000
Message-ID: <20010917201223.15557.qmail@icarus.apache.org>
From: wrowe@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/memory/unix apr_pools.c

wrowe       01/09/17 13:12:23

  Modified:    memory/unix apr_pools.c
  Log:
    Whoops - we want that hproc just a little while longer.
  
  Revision  Changes    Path
  1.111     +8 -6      apr/memory/unix/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- apr_pools.c	2001/09/17 20:00:07	1.110
  +++ apr_pools.c	2001/09/17 20:12:23	1.111
  @@ -1464,10 +1464,18 @@
   	    apr_proc_kill(p->pid, SIGKILL);
   	}
       }
  +    /* Now wait for all the signaled processes to die */
  +    for (p = procs; p; p = p->next) {
  +	if (p->kill_how != kill_never) {
  +	    (void) apr_proc_wait(p->pid, APR_WAIT);
  +	}
  +    }
   #ifdef WIN32
       /* 
        * XXX: Do we need an APR function to clean-up a proc_t?
        * Well ... yeah ... but we can't since it's scope is ill defined.
  +     * We can't dismiss the handle until the apr_proc_wait above is
  +     * finished with the proc_t.
        */
       {
           for (p = procs; p; p = p->next) {
  @@ -1479,11 +1487,5 @@
       }
   #endif /* WIN32 */
   
  -    /* Now wait for all the signaled processes to die */
  -    for (p = procs; p; p = p->next) {
  -	if (p->kill_how != kill_never) {
  -	    (void) apr_proc_wait(p->pid, APR_WAIT);
  -	}
  -    }
   }