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

sock: call poll_group_acquire() and poll_group_release() directly

Browse Source
This commit is contained in:
Bert Belder 2018-05-02 03:49:59 +02:00
parent c07cc8f7cc
commit 5bcde85f8b
No known key found for this signature in database
GPG Key ID: 7A77887B2E2ED461
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/port.c
View File

@ -359,16 +359,6 @@ ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket) {
return sock_info; return sock_info;
} }
poll_group_t* ep_port_acquire_poll_group(ep_port_t* port_info) {
return poll_group_acquire(port_info);
}
void ep_port_release_poll_group(ep_port_t* port_info,
poll_group_t* poll_group) {
unused_var(port_info);
poll_group_release(poll_group);
}
void ep_port_request_socket_update(ep_port_t* port_info, void ep_port_request_socket_update(ep_port_t* port_info,
ep_sock_t* sock_info) { ep_sock_t* sock_info) {
if (queue_enqueued(&sock_info->queue_node)) if (queue_enqueued(&sock_info->queue_node))

4
src/port.h
View File

@ -39,10 +39,6 @@ WEPOLL_INTERNAL int ep_port_ctl(ep_port_t* port_info,
SOCKET sock, SOCKET sock,
struct epoll_event* ev); struct epoll_event* ev);
WEPOLL_INTERNAL poll_group_t* ep_port_acquire_poll_group(ep_port_t* port_info);
WEPOLL_INTERNAL void ep_port_release_poll_group(ep_port_t* port_info,
poll_group_t* poll_group);
WEPOLL_INTERNAL int ep_port_register_socket_handle(ep_port_t* port_info, WEPOLL_INTERNAL int ep_port_register_socket_handle(ep_port_t* port_info,
ep_sock_t* sock_info, ep_sock_t* sock_info,
SOCKET socket); SOCKET socket);

6
src/sock.c
View File

@ -183,7 +183,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
if (base_socket == INVALID_SOCKET) if (base_socket == INVALID_SOCKET)
return NULL; return NULL;
poll_group = ep_port_acquire_poll_group(port_info); poll_group = poll_group_acquire(port_info);
if (poll_group == NULL) if (poll_group == NULL)
return NULL; return NULL;
@ -208,7 +208,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
err2: err2:
_ep_sock_free(sock_private); _ep_sock_free(sock_private);
err1: err1:
ep_port_release_poll_group(port_info, poll_group); poll_group_release(poll_group);
return NULL; return NULL;
} }
@ -234,7 +234,7 @@ static void _ep_sock_delete(ep_port_t* port_info,
if (force || sock_private->poll_status == _POLL_IDLE) { if (force || sock_private->poll_status == _POLL_IDLE) {
/* Free the sock_info now. */ /* Free the sock_info now. */
ep_port_remove_deleted_socket(port_info, sock_info); ep_port_remove_deleted_socket(port_info, sock_info);
ep_port_release_poll_group(port_info, sock_private->poll_group); poll_group_release(sock_private->poll_group);
_ep_sock_free(sock_private); _ep_sock_free(sock_private);
} else { } else {
/* Free the socket later. */ /* Free the socket later. */