diff options
author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-11 05:19:45 +0000 |
---|---|---|
committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-11 05:19:45 +0000 |
commit | 34f1483d9a2ee8fa3e627d99a3c4456354c2d3ac (patch) | |
tree | 72288d0faedb43aff1c83e23e85c3813e5826ce2 /support | |
parent | d2a28b5fcbcd051a2c20d86c3eb817fe4f5aa578 (diff) | |
download | libapr-34f1483d9a2ee8fa3e627d99a3c4456354c2d3ac.tar.gz |
Reimplement apr_poll() on Unix. This improves performance by giving the
user back control over the memory in the pollset.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63601 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
-rwxr-xr-x | support/unix/Makefile.in | 15 | ||||
-rw-r--r-- | support/unix/waitio.c | 101 |
2 files changed, 116 insertions, 0 deletions
diff --git a/support/unix/Makefile.in b/support/unix/Makefile.in new file mode 100755 index 000000000..190cacfc2 --- /dev/null +++ b/support/unix/Makefile.in @@ -0,0 +1,15 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +TARGETS = \ + waitio.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + +INCDIR=../../include +OSDIR=$(INCDIR)/arch/@OSDIR@ +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) + +# DO NOT REMOVE diff --git a/support/unix/waitio.c b/support/unix/waitio.c new file mode 100644 index 000000000..92c1a368d --- /dev/null +++ b/support/unix/waitio.c @@ -0,0 +1,101 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + */ + +#include "fileio.h" +#include "networkio.h" +#include "apr_poll.h" +#include "apr_errno.h" + +/* The only case where we don't use wait_for_io_or_timeout is on + * pre-BONE BeOS, so this check should be sufficient and simpler */ +#if !BEOS_R5 +#define USE_WAIT_FOR_IO +#endif + +#ifdef USE_WAIT_FOR_IO +apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, + int for_read) +{ + apr_interval_time_t timeout; + apr_pollfd_t pollset; + int srv, n; + int type = for_read ? APR_POLLIN : APR_POLLOUT; + + /* TODO - timeout should be less each time through this loop */ + if (f) { + pollset.desc_type = APR_POLL_FILE; + pollset.desc.f = f; + pollset.p = f->pool; + timeout = f->timeout; + } + else { + pollset.desc_type = APR_POLL_SOCKET; + pollset.desc.s = s; + pollset.p = s->cntxt; + timeout = s->timeout; + } + pollset.events = type; + + do { + srv = apr_poll(&pollset, 1, &n, timeout); + + if (n == 1 && pollset.revents & type) { + return APR_SUCCESS; + } + } while (APR_STATUS_IS_EINTR(srv)); + + return srv; +} +#endif + |