This might be the most concerning break between apr 1.7.0 and 1.7.1, and hope it was also evaluated for suitability for 1.8.0, because that must remain binary compatible.
The fact that these are all prefaced apr_XXX and not apr__XXX doesn't give me a lot of reassurance that someone isn't borrowing them, might have to be an apr-2.0.0 breaking change. Thoughts? Bill On Wed, Jan 19, 2022 at 5:17 PM <yla...@apache.org> wrote: > > Author: ylavic > Date: Wed Jan 19 23:17:18 2022 > New Revision: 1897222 > > URL: http://svn.apache.org/viewvc?rev=1897222&view=rev > Log: > Revert r1896510. > > Per https://lists.apache.org/thread/rt6ggcztj7w1vwrmhz27q5fz27pr57w9 > > > Modified: > apr/apr/branches/1.7.x/ (props changed) > apr/apr/branches/1.7.x/file_io/win32/pipe.c > apr/apr/branches/1.7.x/file_io/win32/readwrite.c > apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h > apr/apr/branches/1.7.x/include/arch/win32/apr_arch_file_io.h > apr/apr/branches/1.7.x/network_io/os2/sockopt.c > apr/apr/branches/1.7.x/poll/os2/pollset.c > apr/apr/branches/1.7.x/poll/unix/epoll.c > apr/apr/branches/1.7.x/poll/unix/kqueue.c > apr/apr/branches/1.7.x/poll/unix/poll.c > apr/apr/branches/1.7.x/poll/unix/pollcb.c > apr/apr/branches/1.7.x/poll/unix/pollset.c > apr/apr/branches/1.7.x/poll/unix/port.c > apr/apr/branches/1.7.x/poll/unix/select.c > apr/apr/branches/1.7.x/poll/unix/wakeup.c > > Propchange: apr/apr/branches/1.7.x/ > ------------------------------------------------------------------------------ > Reverse-merged /apr/apr/trunk:r1895106,1895111,1895175,1895181,1895465 > > Modified: apr/apr/branches/1.7.x/file_io/win32/pipe.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/file_io/win32/pipe.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/file_io/win32/pipe.c (original) > +++ apr/apr/branches/1.7.x/file_io/win32/pipe.c Wed Jan 19 23:17:18 2022 > @@ -43,7 +43,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_ > thepipe->timeout = timeout; > return APR_SUCCESS; > } > - if (thepipe->ftype != APR_FILETYPE_PIPE) { > + if (!thepipe->pipe) { > return APR_ENOTIMPL; > } > if (timeout && !(thepipe->pOverlapped)) { > @@ -108,7 +108,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_ > (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t)); > (*in)->pool = pool_in; > (*in)->fname = NULL; > - (*in)->ftype = APR_FILETYPE_PIPE; > + (*in)->pipe = 1; > (*in)->timeout = -1; > (*in)->ungetchar = -1; > (*in)->eof_hit = 0; > @@ -123,7 +123,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_ > (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t)); > (*out)->pool = pool_out; > (*out)->fname = NULL; > - (*out)->ftype = APR_FILETYPE_PIPE; > + (*out)->pipe = 1; > (*out)->timeout = -1; > (*out)->ungetchar = -1; > (*out)->eof_hit = 0; > @@ -250,7 +250,7 @@ APR_DECLARE(apr_status_t) apr_os_pipe_pu > { > (*file) = apr_pcalloc(pool, sizeof(apr_file_t)); > (*file)->pool = pool; > - (*file)->ftype = APR_FILETYPE_PIPE; > + (*file)->pipe = 1; > (*file)->timeout = -1; > (*file)->ungetchar = -1; > (*file)->filehand = *thefile; > @@ -364,28 +364,32 @@ static apr_status_t create_socket_pipe(S > rv = apr_get_netos_error(); > goto cleanup; > } > - /* Verify the connection by reading/waiting for the identification */ > - bm = 0; > - if (ioctlsocket(*rd, FIONBIO, &bm) == SOCKET_ERROR) { > - rv = apr_get_netos_error(); > - goto cleanup; > + /* Verify the connection by reading the send identification. > + */ > + do { > + if (nc++) > + Sleep(1); > + nrd = recv(*rd, (char *)iid, sizeof(iid), 0); > + rv = nrd == SOCKET_ERROR ? apr_get_netos_error() : APR_SUCCESS; > + } while (APR_STATUS_IS_EAGAIN(rv)); > + > + if (nrd == sizeof(iid)) { > + if (memcmp(uid, iid, sizeof(uid)) == 0) { > + /* Wow, we recived what we send. > + * Put read side of the pipe to the blocking > + * mode and return. > + */ > + bm = 0; > + if (ioctlsocket(*rd, FIONBIO, &bm) == SOCKET_ERROR) { > + rv = apr_get_netos_error(); > + goto cleanup; > + } > + break; > + } > } > - nrd = recv(*rd, (char *)iid, sizeof(iid), 0); > - if (nrd == SOCKET_ERROR) { > - rv = apr_get_netos_error(); > + else if (nrd == SOCKET_ERROR) { > goto cleanup; > } > - if (nrd == (int)sizeof(uid) && memcmp(iid, uid, sizeof(uid)) == 0) { > - /* Got the right identifier, put the poll()able read side of > - * the pipe in nonblocking mode and return. > - */ > - bm = 1; > - if (ioctlsocket(*rd, FIONBIO, &bm) == SOCKET_ERROR) { > - rv = apr_get_netos_error(); > - goto cleanup; > - } > - break; > - } > closesocket(*rd); > } > /* We don't need the listening socket any more */ > @@ -394,7 +398,6 @@ static apr_status_t create_socket_pipe(S > > cleanup: > /* Don't leak resources */ > - closesocket(ls); > if (*rd != INVALID_SOCKET) > closesocket(*rd); > if (*wr != INVALID_SOCKET) > @@ -402,6 +405,7 @@ cleanup: > > *rd = INVALID_SOCKET; > *wr = INVALID_SOCKET; > + closesocket(ls); > return rv; > } > > @@ -430,21 +434,21 @@ apr_status_t apr_file_socket_pipe_create > (*in) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t)); > (*in)->pool = p; > (*in)->fname = NULL; > - (*in)->ftype = APR_FILETYPE_SOCKET; > - (*in)->timeout = 0; /* read end of the pipe is non-blocking */ > + (*in)->pipe = 1; > + (*in)->timeout = -1; > (*in)->ungetchar = -1; > (*in)->eof_hit = 0; > (*in)->filePtr = 0; > (*in)->bufpos = 0; > (*in)->dataRead = 0; > (*in)->direction = 0; > - (*in)->pOverlapped = NULL; > + (*in)->pOverlapped = (OVERLAPPED*)apr_pcalloc(p, sizeof(OVERLAPPED)); > (*in)->filehand = (HANDLE)rd; > > (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t)); > (*out)->pool = p; > (*out)->fname = NULL; > - (*out)->ftype = APR_FILETYPE_SOCKET; > + (*out)->pipe = 1; > (*out)->timeout = -1; > (*out)->ungetchar = -1; > (*out)->eof_hit = 0; > @@ -452,7 +456,7 @@ apr_status_t apr_file_socket_pipe_create > (*out)->bufpos = 0; > (*out)->dataRead = 0; > (*out)->direction = 0; > - (*out)->pOverlapped = NULL; > + (*out)->pOverlapped = (OVERLAPPED*)apr_pcalloc(p, sizeof(OVERLAPPED)); > (*out)->filehand = (HANDLE)wr; > > apr_pool_cleanup_register(p, (void *)(*in), socket_pipe_cleanup, > @@ -466,7 +470,7 @@ apr_status_t apr_file_socket_pipe_create > apr_status_t apr_file_socket_pipe_close(apr_file_t *file) > { > apr_status_t stat; > - if (file->ftype != APR_FILETYPE_SOCKET) > + if (!file->pipe) > return apr_file_close(file); > if ((stat = socket_pipe_cleanup(file)) == APR_SUCCESS) { > apr_pool_cleanup_kill(file->pool, file, socket_pipe_cleanup); > > Modified: apr/apr/branches/1.7.x/file_io/win32/readwrite.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/file_io/win32/readwrite.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/file_io/win32/readwrite.c (original) > +++ apr/apr/branches/1.7.x/file_io/win32/readwrite.c Wed Jan 19 23:17:18 2022 > @@ -20,12 +20,10 @@ > #include "apr_strings.h" > #include "apr_lib.h" > #include "apr_errno.h" > -#include "apr_arch_networkio.h" > +#include <malloc.h> > #include "apr_arch_atime.h" > #include "apr_arch_misc.h" > > -#include <malloc.h> > - > /* > * read_with_timeout() > * Uses async i/o to emulate unix non-blocking i/o with timeouts. > @@ -42,7 +40,7 @@ static apr_status_t read_with_timeout(ap > /* Peek at the pipe. If there is no data available, return > APR_EAGAIN. > * If data is available, go ahead and read it. > */ > - if (file->ftype == APR_FILETYPE_PIPE) { > + if (file->pipe) { > DWORD bytes; > if (!PeekNamedPipe(file->filehand, NULL, 0, NULL, &bytes, NULL)) > { > rv = apr_get_os_error(); > @@ -70,28 +68,13 @@ static apr_status_t read_with_timeout(ap > } > } > > - if (file->pOverlapped && file->ftype == APR_FILETYPE_FILE) { > + if (file->pOverlapped && !file->pipe) { > file->pOverlapped->Offset = (DWORD)file->filePtr; > file->pOverlapped->OffsetHigh = (DWORD)(file->filePtr >> 32); > } > > - if (file->ftype == APR_FILETYPE_SOCKET) { > - WSABUF wsaData; > - DWORD flags = 0; > - > - wsaData.buf = (char*) buf; > - wsaData.len = (u_long)len; > - if (WSARecv((SOCKET)file->filehand, &wsaData, 1, &bytesread, > - &flags, NULL, NULL) == SOCKET_ERROR) { > - rv = apr_get_netos_error(); > - bytesread = 0; > - } > - else { > - rv = APR_SUCCESS; > - } > - } > - else if (ReadFile(file->filehand, buf, len, > - &bytesread, file->pOverlapped)) { > + if (ReadFile(file->filehand, buf, len, > + &bytesread, file->pOverlapped)) { > rv = APR_SUCCESS; > } > else { > @@ -150,7 +133,7 @@ static apr_status_t read_with_timeout(ap > if (rv == APR_SUCCESS && bytesread == 0) > rv = APR_EOF; > > - if (rv == APR_SUCCESS && file->pOverlapped && file->ftype == > APR_FILETYPE_FILE) { > + if (rv == APR_SUCCESS && file->pOverlapped && !file->pipe) { > file->filePtr += bytesread; > } > *nbytes = bytesread; > @@ -263,7 +246,7 @@ APR_DECLARE(apr_status_t) apr_file_read( > APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void > *buf, apr_size_t *nbytes) > { > apr_status_t rv; > - DWORD bwrote = 0; > + DWORD bwrote; > > /* If the file is open for xthread support, allocate and > * initialize the overlapped and io completion event (hEvent). > @@ -315,29 +298,9 @@ APR_DECLARE(apr_status_t) apr_file_write > if (thefile->flags & APR_FOPEN_XTHREAD) { > apr_thread_mutex_unlock(thefile->mutex); > } > - } > - else if (thefile->ftype == APR_FILETYPE_SOCKET) { > - WSABUF wsaData; > - DWORD flags = 0; > - > - wsaData.buf = (char*) buf; > - wsaData.len = (u_long)*nbytes; > - if (WSASend((SOCKET)thefile->filehand, &wsaData, 1, &bwrote, > - flags, NULL, NULL) == SOCKET_ERROR) { > - rv = apr_get_netos_error(); > - bwrote = 0; > - } > - else { > - rv = APR_SUCCESS; > - } > - *nbytes = bwrote; > - } > - else { > - if (thefile->ftype != APR_FILETYPE_FILE) { > - rv = WriteFile(thefile->filehand, buf, (DWORD)*nbytes, &bwrote, > - thefile->pOverlapped); > - } > - else { > + return rv; > + } else { > + if (!thefile->pipe) { > apr_off_t offset = 0; > apr_status_t rc; > if (thefile->append) { > @@ -369,6 +332,10 @@ APR_DECLARE(apr_status_t) apr_file_write > apr_thread_mutex_unlock(thefile->mutex); > } > } > + else { > + rv = WriteFile(thefile->filehand, buf, (DWORD)*nbytes, &bwrote, > + thefile->pOverlapped); > + } > if (rv) { > *nbytes = bwrote; > rv = APR_SUCCESS; > @@ -415,7 +382,7 @@ APR_DECLARE(apr_status_t) apr_file_write > } > } > } > - if (rv == APR_SUCCESS && thefile->pOverlapped && thefile->ftype == > APR_FILETYPE_FILE) { > + if (rv == APR_SUCCESS && thefile->pOverlapped && !thefile->pipe) { > thefile->filePtr += *nbytes; > } > } > > Modified: apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h > (original) > +++ apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h Wed Jan > 19 23:17:18 2022 > @@ -123,7 +123,6 @@ struct apr_pollset_t > /* Pipe descriptors used for wakeup */ > apr_file_t *wakeup_pipe[2]; > apr_pollfd_t wakeup_pfd; > - volatile apr_uint32_t wakeup_set; > apr_pollset_private_t *p; > const apr_pollset_provider_t *provider; > }; > @@ -152,7 +151,6 @@ struct apr_pollcb_t { > /* Pipe descriptors used for wakeup */ > apr_file_t *wakeup_pipe[2]; > apr_pollfd_t wakeup_pfd; > - volatile apr_uint32_t wakeup_set; > int fd; > apr_pollcb_pset pollset; > apr_pollfd_t **copyset; > @@ -184,6 +182,6 @@ struct apr_pollcb_provider_t { > apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, > apr_file_t **wakeup_pipe); > apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe); > -void apr_poll_drain_wakeup_pipe(volatile apr_uint32_t *wakeup_set, > apr_file_t **wakeup_pipe); > +void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe); > > #endif /* APR_ARCH_POLL_PRIVATE_H */ > > Modified: apr/apr/branches/1.7.x/include/arch/win32/apr_arch_file_io.h > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/arch/win32/apr_arch_file_io.h?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/include/arch/win32/apr_arch_file_io.h (original) > +++ apr/apr/branches/1.7.x/include/arch/win32/apr_arch_file_io.h Wed Jan 19 > 23:17:18 2022 > @@ -159,16 +159,10 @@ apr_status_t more_finfo(apr_finfo_t *fin > /* for apr_poll.c */ > #define filedes filehand > > -typedef enum { > - APR_FILETYPE_FILE = 0, > - APR_FILETYPE_PIPE, > - APR_FILETYPE_SOCKET > -} apr_filetype_e; > - > struct apr_file_t { > apr_pool_t *pool; > HANDLE filehand; > - apr_filetype_e ftype; /* Is this a pipe, a socket or a file? */ > + BOOLEAN pipe; /* Is this a pipe of a file? */ > OVERLAPPED *pOverlapped; > apr_interval_time_t timeout; > apr_int32_t flags; > > Modified: apr/apr/branches/1.7.x/network_io/os2/sockopt.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/network_io/os2/sockopt.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/network_io/os2/sockopt.c (original) > +++ apr/apr/branches/1.7.x/network_io/os2/sockopt.c Wed Jan 19 23:17:18 2022 > @@ -32,22 +32,8 @@ > APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, > apr_interval_time_t t) > { > - apr_status_t rv = APR_SUCCESS; > - > - /* If our new timeout is non-negative and our old timeout was > - * negative, then we need to ensure that we are non-blocking. > - * Conversely, if our new timeout is negative and we had > - * non-negative timeout, we must make sure our socket is blocking. > - */ > - if (t == 0 && sock->timeout != 0) { > - rv = apr_socket_opt_set(sock, APR_SO_NONBLOCK, 1); > - } > - else if (t != 0 && sock->timeout == 0) { > - rv = apr_socket_opt_set(sock, APR_SO_NONBLOCK, 0); > - } > - > sock->timeout = t; > - return rv; > + return APR_SUCCESS; > } > > > > Modified: apr/apr/branches/1.7.x/poll/os2/pollset.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/os2/pollset.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/os2/pollset.c (original) > +++ apr/apr/branches/1.7.x/poll/os2/pollset.c Wed Jan 19 23:17:18 2022 > @@ -67,6 +67,7 @@ APR_DECLARE(apr_status_t) apr_pollset_cr > > if (rc == APR_SUCCESS) { > apr_sockaddr_t *listen_address; > + apr_socket_timeout_set((*pollset)->wake_listen, 0); > apr_sockaddr_info_get(&listen_address, "", APR_UNIX, 0, 0, p); > rc = apr_socket_bind((*pollset)->wake_listen, listen_address); > > @@ -79,7 +80,6 @@ APR_DECLARE(apr_status_t) apr_pollset_cr > wake_poll_fd.client_data = NULL; > apr_pollset_add(*pollset, &wake_poll_fd); > apr_socket_addr_get(&(*pollset)->wake_address, APR_LOCAL, > (*pollset)->wake_listen); > - apr_socket_timeout_set((*pollset)->wake_listen, 0); > > rc = apr_socket_create(&(*pollset)->wake_sender, APR_UNIX, > SOCK_DGRAM, 0, p); > } > @@ -263,14 +263,17 @@ APR_DECLARE(apr_status_t) apr_pollset_po > > if (rtnevents) { > if (i == 0 && pollset->wake_listen != NULL) { > - char ch; > - apr_size_t len = 1; > struct apr_sockaddr_t from_addr; > - rv = apr_socket_recvfrom(&from_addr, pollset->wake_listen, > - MSG_DONTWAIT, &ch, &len); > - if (rv == APR_SUCCESS) { > - /* Woken up, senders can fill the pipe again */ > - apr_atomic_set32(&pollset->wakeup_set, 0); > + char buffer[16]; > + apr_size_t buflen; > + for (;;) { > + buflen = sizeof(buffer); > + rv = apr_socket_recvfrom(&from_addr, > pollset->wake_listen, > + MSG_DONTWAIT, buffer, &buflen); > + if (rv != APR_SUCCESS) { > + break; > + } > + /* Woken up, drain the pipe still. */ > rc = APR_EINTR; > } > } > @@ -295,15 +298,12 @@ APR_DECLARE(apr_status_t) apr_pollset_po > > APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset) > { > - if (!pollset->wake_sender) > - return APR_EINIT; > - > - if (apr_atomic_cas32(&pollset->wakeup_set, 1, 0) == 0) { > + if (pollset->wake_sender) { > apr_size_t len = 1; > return apr_socket_sendto(pollset->wake_sender, > pollset->wake_address, 0, "", &len); > } > > - return APR_SUCCESS; > + return APR_EINIT; > } > > > > Modified: apr/apr/branches/1.7.x/poll/unix/epoll.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/epoll.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/epoll.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/epoll.c Wed Jan 19 23:17:18 2022 > @@ -289,7 +289,7 @@ static apr_status_t impl_pollset_poll(ap > if ((pollset->flags & APR_POLLSET_WAKEABLE) && > fdptr->desc_type == APR_POLL_FILE && > fdptr->desc.f == pollset->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollset->wakeup_set, > pollset->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); > rv = APR_EINTR; > } > else { > @@ -460,7 +460,7 @@ static apr_status_t impl_pollcb_poll(apr > if ((pollcb->flags & APR_POLLSET_WAKEABLE) && > pollfd->desc_type == APR_POLL_FILE && > pollfd->desc.f == pollcb->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollcb->wakeup_set, > pollcb->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); > return APR_EINTR; > } > > > Modified: apr/apr/branches/1.7.x/poll/unix/kqueue.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/kqueue.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/kqueue.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/kqueue.c Wed Jan 19 23:17:18 2022 > @@ -286,7 +286,7 @@ static apr_status_t impl_pollset_poll(ap > if ((pollset->flags & APR_POLLSET_WAKEABLE) && > fd->desc_type == APR_POLL_FILE && > fd->desc.f == pollset->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollset->wakeup_set, > pollset->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); > rv = APR_EINTR; > } > else { > @@ -473,7 +473,7 @@ static apr_status_t impl_pollcb_poll(apr > if ((pollcb->flags & APR_POLLSET_WAKEABLE) && > pollfd->desc_type == APR_POLL_FILE && > pollfd->desc.f == pollcb->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollcb->wakeup_set, > pollcb->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); > return APR_EINTR; > } > > > Modified: apr/apr/branches/1.7.x/poll/unix/poll.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/poll.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/poll.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/poll.c Wed Jan 19 23:17:18 2022 > @@ -279,7 +279,7 @@ static apr_status_t impl_pollset_poll(ap > if ((pollset->flags & APR_POLLSET_WAKEABLE) && > pollset->p->query_set[i].desc_type == APR_POLL_FILE && > pollset->p->query_set[i].desc.f == > pollset->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollset->wakeup_set, > pollset->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); > rv = APR_EINTR; > } > else { > @@ -431,7 +431,7 @@ static apr_status_t impl_pollcb_poll(apr > if ((pollcb->flags & APR_POLLSET_WAKEABLE) && > pollfd->desc_type == APR_POLL_FILE && > pollfd->desc.f == pollcb->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollcb->wakeup_set, > pollcb->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); > return APR_EINTR; > } > > > Modified: apr/apr/branches/1.7.x/poll/unix/pollcb.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/pollcb.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/pollcb.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/pollcb.c Wed Jan 19 23:17:18 2022 > @@ -23,7 +23,6 @@ > #include "apr_poll.h" > #include "apr_time.h" > #include "apr_portable.h" > -#include "apr_atomic.h" > #include "apr_arch_file_io.h" > #include "apr_arch_networkio.h" > #include "apr_arch_poll_private.h" > @@ -135,7 +134,6 @@ APR_DECLARE(apr_status_t) apr_pollcb_cre > pollcb->flags = flags; > pollcb->pool = p; > pollcb->provider = provider; > - pollcb->wakeup_set = 0; > > rv = (*provider->create)(pollcb, size, p, flags); > if (rv == APR_ENOTIMPL) { > @@ -214,13 +212,10 @@ APR_DECLARE(apr_status_t) apr_pollcb_pol > > APR_DECLARE(apr_status_t) apr_pollcb_wakeup(apr_pollcb_t *pollcb) > { > - if (!(pollcb->flags & APR_POLLSET_WAKEABLE)) > - return APR_EINIT; > - > - if (apr_atomic_cas32(&pollcb->wakeup_set, 1, 0) == 0) > + if (pollcb->flags & APR_POLLSET_WAKEABLE) > return apr_file_putc(1, pollcb->wakeup_pipe[1]); > - > - return APR_SUCCESS; > + else > + return APR_EINIT; > } > > APR_DECLARE(const char *) apr_pollcb_method_name(apr_pollcb_t *pollcb) > > Modified: apr/apr/branches/1.7.x/poll/unix/pollset.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/pollset.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/pollset.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/pollset.c Wed Jan 19 23:17:18 2022 > @@ -23,7 +23,6 @@ > #include "apr_poll.h" > #include "apr_time.h" > #include "apr_portable.h" > -#include "apr_atomic.h" > #include "apr_arch_file_io.h" > #include "apr_arch_networkio.h" > #include "apr_arch_poll_private.h" > @@ -145,7 +144,6 @@ APR_DECLARE(apr_status_t) apr_pollset_cr > pollset->pool = p; > pollset->flags = flags; > pollset->provider = provider; > - pollset->wakeup_set = 0; > > rv = (*provider->create)(pollset, size, p, flags); > if (rv == APR_ENOTIMPL) { > @@ -222,13 +220,10 @@ APR_DECLARE(apr_status_t) apr_pollset_de > > APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset) > { > - if (!(pollset->flags & APR_POLLSET_WAKEABLE)) > - return APR_EINIT; > - > - if (apr_atomic_cas32(&pollset->wakeup_set, 1, 0) == 0) > + if (pollset->flags & APR_POLLSET_WAKEABLE) > return apr_file_putc(1, pollset->wakeup_pipe[1]); > - > - return APR_SUCCESS; > + else > + return APR_EINIT; > } > > APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset, > > Modified: apr/apr/branches/1.7.x/poll/unix/port.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/port.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/port.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/port.c Wed Jan 19 23:17:18 2022 > @@ -411,7 +411,7 @@ static apr_status_t impl_pollset_poll(ap > if ((pollset->flags & APR_POLLSET_WAKEABLE) && > ep->pfd.desc_type == APR_POLL_FILE && > ep->pfd.desc.f == pollset->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollset->wakeup_set, > pollset->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); > rv = APR_EINTR; > } > else { > @@ -563,7 +563,7 @@ static apr_status_t impl_pollcb_poll(apr > if ((pollcb->flags & APR_POLLSET_WAKEABLE) && > pollfd->desc_type == APR_POLL_FILE && > pollfd->desc.f == pollcb->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollcb->wakeup_set, > pollcb->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe); > return APR_EINTR; > } > > > Modified: apr/apr/branches/1.7.x/poll/unix/select.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/select.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/select.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/select.c Wed Jan 19 23:17:18 2022 > @@ -401,7 +401,7 @@ static apr_status_t impl_pollset_poll(ap > else { > if ((pollset->flags & APR_POLLSET_WAKEABLE) && > pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) { > - apr_poll_drain_wakeup_pipe(&pollset->wakeup_set, > pollset->wakeup_pipe); > + apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe); > rv = APR_EINTR; > continue; > } > > Modified: apr/apr/branches/1.7.x/poll/unix/wakeup.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/wakeup.c?rev=1897222&r1=1897221&r2=1897222&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/poll/unix/wakeup.c (original) > +++ apr/apr/branches/1.7.x/poll/unix/wakeup.c Wed Jan 19 23:17:18 2022 > @@ -18,7 +18,6 @@ > #include "apr_poll.h" > #include "apr_time.h" > #include "apr_portable.h" > -#include "apr_atomic.h" > #include "apr_arch_file_io.h" > #include "apr_arch_networkio.h" > #include "apr_arch_poll_private.h" > @@ -34,7 +33,7 @@ apr_status_t apr_poll_create_wakeup_pipe > apr_status_t rv; > > if ((rv = apr_file_socket_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1], > - pool)) != APR_SUCCESS) > + pool)) != APR_SUCCESS) > return rv; > > pfd->reqevents = APR_POLLIN; > @@ -81,9 +80,9 @@ apr_status_t apr_poll_create_wakeup_pipe > { > apr_status_t rv; > > - /* Read end of the pipe is non-blocking */ > if ((rv = apr_file_pipe_create_ex(&wakeup_pipe[0], &wakeup_pipe[1], > - APR_WRITE_BLOCK, pool))) > + APR_WRITE_BLOCK, > + pool)) != APR_SUCCESS) > return rv; > > pfd->p = pool; > @@ -136,11 +135,18 @@ apr_status_t apr_poll_close_wakeup_pipe( > > /* Read and discard whatever is in the wakeup pipe. > */ > -void apr_poll_drain_wakeup_pipe(volatile apr_uint32_t *wakeup_set, > apr_file_t **wakeup_pipe) > +void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe) > { > - char ch; > + char rb[512]; > + apr_size_t nr = sizeof(rb); > > - (void)apr_file_getc(&ch, wakeup_pipe[0]); > - apr_atomic_set32(wakeup_set, 0); > + while (apr_file_read(wakeup_pipe[0], rb, &nr) == APR_SUCCESS) { > + /* Although we write just one byte to the other end of the pipe > + * during wakeup, multiple threads could call the wakeup. > + * So simply drain out from the input side of the pipe all > + * the data. > + */ > + if (nr != sizeof(rb)) > + break; > + } > } > - > >
