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

sock: remove ep_sock_from_overlapped() internal API

Browse Source
This commit is contained in:
Bert Belder 2017-09-26 21:12:28 +02:00
parent 9402a42a4d
commit d99e748ef8
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/port.c
View File

@ -136,10 +136,9 @@ static int _ep_port_feed_events(ep_port_t* port_info,
for (int i = 0; i < iocp_event_count; i++) { for (int i = 0; i < iocp_event_count; i++) {
OVERLAPPED* overlapped = iocp_events[i].lpOverlapped; OVERLAPPED* overlapped = iocp_events[i].lpOverlapped;
ep_sock_t* sock_info = ep_sock_from_overlapped(overlapped);
struct epoll_event* ev = &epoll_events[epoll_event_count]; struct epoll_event* ev = &epoll_events[epoll_event_count];
epoll_event_count += ep_sock_feed_event(port_info, sock_info, ev); epoll_event_count += ep_sock_feed_event(port_info, overlapped, ev);
} }
return epoll_event_count; return epoll_event_count;

13
src/sock.c
View File

@ -230,12 +230,6 @@ void ep_sock_force_delete(ep_port_t* port_info, ep_sock_t* sock_info) {
ep_sock_delete(port_info, sock_info); ep_sock_delete(port_info, sock_info);
} }
ep_sock_t* ep_sock_from_overlapped(OVERLAPPED* overlapped) {
_ep_sock_private_t* sock_private =
container_of(overlapped, _ep_sock_private_t, poll_req.overlapped);
return &sock_private->pub;
}
int ep_sock_set_event(ep_port_t* port_info, int ep_sock_set_event(ep_port_t* port_info,
ep_sock_t* sock_info, ep_sock_t* sock_info,
const struct epoll_event* ev) { const struct epoll_event* ev) {
@ -314,10 +308,11 @@ int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info) {
} }
int ep_sock_feed_event(ep_port_t* port_info, int ep_sock_feed_event(ep_port_t* port_info,
ep_sock_t* sock_info, OVERLAPPED* overlapped,
struct epoll_event* ev) { struct epoll_event* ev) {
_ep_sock_private_t* sock_private = _ep_sock_private(sock_info); _ep_sock_private_t* sock_private =
container_of(overlapped, _ep_sock_private_t, poll_req.overlapped);
ep_sock_t* sock_info = &sock_private->pub;
uint32_t epoll_events; uint32_t epoll_events;
bool drop_socket; bool drop_socket;
int ev_count = 0; int ev_count = 0;

4
src/sock.h
View File

@ -24,15 +24,13 @@ EPOLL_INTERNAL void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info);
EPOLL_INTERNAL void ep_sock_force_delete(ep_port_t* port_info, EPOLL_INTERNAL void ep_sock_force_delete(ep_port_t* port_info,
ep_sock_t* sock_info); ep_sock_t* sock_info);
EPOLL_INTERNAL ep_sock_t* ep_sock_from_overlapped(OVERLAPPED* overlapped);
EPOLL_INTERNAL int ep_sock_set_event(ep_port_t* port_info, EPOLL_INTERNAL int ep_sock_set_event(ep_port_t* port_info,
ep_sock_t* sock_info, ep_sock_t* sock_info,
const struct epoll_event* ev); const struct epoll_event* ev);
EPOLL_INTERNAL int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info); EPOLL_INTERNAL int ep_sock_update(ep_port_t* port_info, ep_sock_t* sock_info);
EPOLL_INTERNAL int ep_sock_feed_event(ep_port_t* port_info, EPOLL_INTERNAL int ep_sock_feed_event(ep_port_t* port_info,
ep_sock_t* sock_info, OVERLAPPED* overlapped,
struct epoll_event* ev); struct epoll_event* ev);
#endif /* EPOLL_SOCK_H_ */ #endif /* EPOLL_SOCK_H_ */