coffee/wepoll
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version 1.0.2

Browse Source
This commit is contained in:
Bert Belder 2017-12-03 18:19:07 +01:00
commit 44db6994a6
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -73,8 +73,8 @@ int epoll_close(HANDLE ephnd);
``` ```
* Close an epoll port. * Close an epoll port.
* do not attempt to close the epoll port with Windows' `close`, * Do not attempt to close the epoll port with `close()`,
`CloseHandle` or `closesocket` functions. `CloseHandle()` or `closesocket()`.
### epoll_ctl ### epoll_ctl
@ -88,6 +88,11 @@ int epoll_ctl(HANDLE ephnd,
* Control which socket events are monitored by an epoll port. * Control which socket events are monitored by an epoll port.
* `ephnd` must be a HANDLE created by `epoll_create` or `epoll_create1`. * `ephnd` must be a HANDLE created by `epoll_create` or `epoll_create1`.
* `op` must be one of `EPOLL_CTL_ADD`, `EPOLL_CTL_MOD`, `EPOLL_CTL_DEL`. * `op` must be one of `EPOLL_CTL_ADD`, `EPOLL_CTL_MOD`, `EPOLL_CTL_DEL`.
* It is recommended to always explicitly remove a socket from its epoll
set using `EPOLL_CTL_MOD` *before* closing it. As on Linux, sockets
are automatically removed from the epoll set when they are closed, but
wepoll may not be able to detect this until the next call to
`epoll_wait()`.
* TODO: expand * TODO: expand
* [man page](http://man7.org/linux/man-pages/man2/epoll_ctl.2.html) * [man page](http://man7.org/linux/man-pages/man2/epoll_ctl.2.html)

31
wepoll.c
View File

@ -2225,12 +2225,9 @@ typedef struct _ep_sock_private {
} _ep_sock_private_t; } _ep_sock_private_t;
static DWORD _epoll_events_to_afd_events(uint32_t epoll_events) { static DWORD _epoll_events_to_afd_events(uint32_t epoll_events) {
DWORD afd_events; /* Always monitor for AFD_POLL_LOCAL_CLOSE, which is triggered when the
* socket is closed with closesocket() or CloseHandle(). */
/* These events should always be monitored. */ DWORD afd_events = AFD_POLL_LOCAL_CLOSE;
assert(epoll_events & EPOLLERR);
assert(epoll_events & EPOLLHUP);
afd_events = AFD_POLL_ABORT | AFD_POLL_CONNECT_FAIL | AFD_POLL_LOCAL_CLOSE;
if (epoll_events & (EPOLLIN | EPOLLRDNORM)) if (epoll_events & (EPOLLIN | EPOLLRDNORM))
afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT; afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT;
@ -2240,6 +2237,10 @@ static DWORD _epoll_events_to_afd_events(uint32_t epoll_events) {
afd_events |= AFD_POLL_SEND | AFD_POLL_CONNECT; afd_events |= AFD_POLL_SEND | AFD_POLL_CONNECT;
if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP)) if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP))
afd_events |= AFD_POLL_DISCONNECT; afd_events |= AFD_POLL_DISCONNECT;
if (epoll_events & EPOLLHUP)
afd_events |= AFD_POLL_ABORT;
if (epoll_events & EPOLLERR)
afd_events |= AFD_POLL_CONNECT_FAIL;
return afd_events; return afd_events;
} }
@ -2424,7 +2425,9 @@ int ep_sock_set_event(ep_port_t* port_info,
const struct epoll_event* ev) { const struct epoll_event* ev) {
_ep_sock_private_t* sock_private = _ep_sock_private(sock_info); _ep_sock_private_t* sock_private = _ep_sock_private(sock_info);
/* EPOLLERR and EPOLLHUP are always reported, even when no sollicited. */ /* EPOLLERR and EPOLLHUP are always reported, even when not requested by the
* caller. However they are disabled after a event has been reported for a
* socket for which the EPOLLONESHOT flag as set. */
uint32_t events = ev->events | EPOLLERR | EPOLLHUP; uint32_t events = ev->events | EPOLLERR | EPOLLHUP;
sock_private->user_events = events; sock_private->user_events = events;
@ -2439,7 +2442,7 @@ int ep_sock_set_event(ep_port_t* port_info,
int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) { int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) {
_ep_sock_private_t* sock_private = _ep_sock_private(sock_info); _ep_sock_private_t* sock_private = _ep_sock_private(sock_info);
SOCKET driver_socket = poll_group_get_socket(sock_private->poll_group); SOCKET driver_socket = poll_group_get_socket(sock_private->poll_group);
bool broken = false; bool socket_closed = false;
assert(ep_port_is_socket_update_pending(port_info, sock_info)); assert(ep_port_is_socket_update_pending(port_info, sock_info));
@ -2472,7 +2475,7 @@ int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) {
driver_socket) < 0) { driver_socket) < 0) {
if (GetLastError() == ERROR_INVALID_HANDLE) if (GetLastError() == ERROR_INVALID_HANDLE)
/* The socket is broken. It will be dropped from the epoll set. */ /* The socket is broken. It will be dropped from the epoll set. */
broken = true; socket_closed = true;
else else
/* Another error occurred, which is propagated to the caller. */ /* Another error occurred, which is propagated to the caller. */
return -1; return -1;
@ -2490,7 +2493,7 @@ int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) {
ep_port_clear_socket_update(port_info, sock_info); ep_port_clear_socket_update(port_info, sock_info);
/* If we saw an ERROR_INVALID_HANDLE error, drop the socket. */ /* If we saw an ERROR_INVALID_HANDLE error, drop the socket. */
if (broken) if (socket_closed)
ep_sock_delete(port_info, sock_info); ep_sock_delete(port_info, sock_info);
return 0; return 0;
@ -2503,7 +2506,7 @@ int ep_sock_feed_event(ep_port_t* port_info,
container_of(overlapped, _ep_sock_private_t, poll_req.overlapped); container_of(overlapped, _ep_sock_private_t, poll_req.overlapped);
ep_sock_t* sock_info = &sock_private->pub; ep_sock_t* sock_info = &sock_private->pub;
uint32_t epoll_events; uint32_t epoll_events;
bool drop_socket; bool socket_closed;
int ev_count = 0; int ev_count = 0;
sock_private->poll_status = _POLL_IDLE; sock_private->poll_status = _POLL_IDLE;
@ -2516,7 +2519,7 @@ int ep_sock_feed_event(ep_port_t* port_info,
return 0; return 0;
} }
_poll_req_complete(&sock_private->poll_req, &epoll_events, &drop_socket); _poll_req_complete(&sock_private->poll_req, &epoll_events, &socket_closed);
/* Filter events that the user didn't ask for. */ /* Filter events that the user didn't ask for. */
epoll_events &= sock_private->user_events; epoll_events &= sock_private->user_events;
@ -2533,10 +2536,10 @@ int ep_sock_feed_event(ep_port_t* port_info,
ev_count = 1; ev_count = 1;
} }
if (drop_socket) if (socket_closed)
/* Drop the socket from the epoll set. */ /* Drop the socket from the epoll set. */
ep_sock_delete(port_info, sock_info); ep_sock_delete(port_info, sock_info);
else if (sock_private->user_events != 0) else
/* Put the socket back onto the attention list so a new poll request will /* Put the socket back onto the attention list so a new poll request will
* be submitted. */ * be submitted. */
ep_port_request_socket_update(port_info, sock_info); ep_port_request_socket_update(port_info, sock_info);