diff options
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/port.c | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/poll/unix/port.c b/poll/unix/port.c index 2feb2cccc..a54d66ccd 100644 --- a/poll/unix/port.c +++ b/poll/unix/port.c @@ -15,6 +15,7 @@ */ #include "apr_arch_poll_private.h" +#include "apr_atomic.h" #ifdef POLLSET_USES_PORT @@ -82,6 +83,8 @@ struct apr_pollset_t /* A ring of pollfd_t where rings that have been _remove'd but might still be inside a _poll */ APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring; + /* number of threads in poll */ + volatile apr_uint32_t waiting; }; static apr_status_t backend_cleanup(void *p_) @@ -164,6 +167,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset, /* Add room for wakeup descriptor */ size++; } + (*pollset)->waiting = 0; (*pollset)->nelts = 0; (*pollset)->nalloc = size; (*pollset)->flags = flags; @@ -230,16 +234,22 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset, fd = descriptor->desc.f->filedes; } - res = port_associate(pollset->port_fd, PORT_SOURCE_FD, fd, - get_event(descriptor->reqevents), (void *)elem); + if (apr_atomic_read32(&pollset->waiting)) { + res = port_associate(pollset->port_fd, PORT_SOURCE_FD, fd, + get_event(descriptor->reqevents), (void *)elem); - if (res < 0) { - rv = APR_ENOMEM; - APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link); - } + if (res < 0) { + rv = APR_ENOMEM; + APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link); + } + else { + pollset->nelts++; + APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link); + } + } else { pollset->nelts++; - APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link); + APR_RING_INSERT_TAIL(&(pollset->add_ring), elem, pfd_elem_t, link); } pollset_unlock_rings(); @@ -254,6 +264,7 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset, pfd_elem_t *ep; apr_status_t rv = APR_SUCCESS; int res; + int err; pollset_lock_rings(); @@ -267,6 +278,7 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset, res = port_dissociate(pollset->port_fd, PORT_SOURCE_FD, fd); if (res < 0) { + err = errno; rv = APR_NOTFOUND; } @@ -280,6 +292,9 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset, APR_RING_REMOVE(ep, link); APR_RING_INSERT_TAIL(&(pollset->dead_ring), ep, pfd_elem_t, link); + if (ENOENT == err) { + rv = APR_SUCCESS; + } break; } } @@ -331,6 +346,8 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, pollset_lock_rings(); + apr_atomic_inc32(&pollset->waiting); + while (!APR_RING_EMPTY(&(pollset->add_ring), pfd_elem_t, link)) { ep = APR_RING_FIRST(&(pollset->add_ring)); APR_RING_REMOVE(ep, link); @@ -354,6 +371,9 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset, ret = port_getn(pollset->port_fd, pollset->port_set, pollset->nalloc, &nget, tvptr); + /* decrease the waiting ASAP to reduce the window for calling + port_associate within apr_pollset_add() */ + apr_atomic_dec32(&pollset->waiting); (*num) = nget; if (ret == -1) { @@ -539,6 +559,7 @@ APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb, if (rv) { return rv; } + rv = apr_pollcb_add(pollcb, pollfd); } } |