From 5bcde85f8b74cea90e8572f75f19faed77dfa3b7 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Wed, 2 May 2018 03:49:59 +0200
Subject: [PATCH] sock: call poll_group_acquire() and poll_group_release()
 directly

---
 src/port.c | 10 ----------
 src/port.h |  4 ----
 src/sock.c |  6 +++---
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/port.c b/src/port.c
index 8a20fbf..84ffd09 100644
--- a/src/port.c
+++ b/src/port.c
@@ -359,16 +359,6 @@ ep_sock_t* ep_port_find_socket(ep_port_t* port_info, SOCKET socket) {
   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,
                                    ep_sock_t* sock_info) {
   if (queue_enqueued(&sock_info->queue_node))
diff --git a/src/port.h b/src/port.h
index 78ebdb5..472c2e3 100644
--- a/src/port.h
+++ b/src/port.h
@@ -39,10 +39,6 @@ WEPOLL_INTERNAL int ep_port_ctl(ep_port_t* port_info,
                                 SOCKET sock,
                                 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,
                                                    ep_sock_t* sock_info,
                                                    SOCKET socket);
diff --git a/src/sock.c b/src/sock.c
index dfd40ee..0dca3eb 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -183,7 +183,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
   if (base_socket == INVALID_SOCKET)
     return NULL;
 
-  poll_group = ep_port_acquire_poll_group(port_info);
+  poll_group = poll_group_acquire(port_info);
   if (poll_group == NULL)
     return NULL;
 
@@ -208,7 +208,7 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
 err2:
   _ep_sock_free(sock_private);
 err1:
-  ep_port_release_poll_group(port_info, poll_group);
+  poll_group_release(poll_group);
 
   return NULL;
 }
@@ -234,7 +234,7 @@ static void _ep_sock_delete(ep_port_t* port_info,
   if (force || sock_private->poll_status == _POLL_IDLE) {
     /* Free the sock_info now. */
     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);
   } else {
     /* Free the socket later. */