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

port: make ep_port_(add|del)_socket take ep_sock_t instead of tree_node_t

Browse Source
This commit is contained in:
Bert Belder 2017-09-14 16:05:15 +02:00
parent 0274e9d46b
commit b2c69365e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/epoll-socket.c
View File

@ -187,7 +187,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
tree_node_init(&sock_private->pub.tree_node);
queue_node_init(&sock_private->pub.queue_node);
if (ep_port_add_socket(port_info, &sock_private->pub.tree_node, socket) < 0)
if (ep_port_add_socket(port_info, &sock_private->pub, socket) < 0)
goto err2;
return &sock_private->pub;
@ -213,7 +213,7 @@ void ep_sock_delete(ep_port_t* port_info, ep_sock_t* sock_info) {
sock_private->pending_events = 0;
}
ep_port_del_socket(port_info, &sock_info->tree_node);
ep_port_del_socket(port_info, sock_info);
ep_port_clear_socket_update(port_info, sock_info);
ep_port_release_poll_group(sock_private->poll_group);
sock_private->poll_group = NULL;

8
src/port.c
View File

@ -105,13 +105,13 @@ size_t ep_port_feed_events(ep_port_t* port_info,
}
int ep_port_add_socket(ep_port_t* port_info,
tree_node_t* tree_node,
ep_sock_t* sock_info,
SOCKET socket) {
return tree_add(&port_info->sock_tree, tree_node, socket);
return tree_add(&port_info->sock_tree, &sock_info->tree_node, socket);
}
int ep_port_del_socket(ep_port_t* port_info, tree_node_t* tree_node) {
return tree_del(&port_info->sock_tree, tree_node);
int ep_port_del_socket(ep_port_t* port_info, ep_sock_t* sock_info) {
return tree_del(&port_info->sock_tree, &sock_info->tree_node);
}
ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket) {

4
src/port.h
View File

@ -40,10 +40,10 @@ EPOLL_INTERNAL poll_group_t* ep_port_acquire_poll_group(
EPOLL_INTERNAL void ep_port_release_poll_group(poll_group_t* poll_group);
EPOLL_INTERNAL int ep_port_add_socket(ep_port_t* port_info,
tree_node_t* tree_node,
ep_sock_t* sock_info,
SOCKET socket);
EPOLL_INTERNAL int ep_port_del_socket(ep_port_t* port_info,
tree_node_t* tree_node);
ep_sock_t* sock_info);
EPOLL_INTERNAL ep_sock_t* ep_port_find_socket(ep_port_t* port_info,
SOCKET socket);