Cleanup

Author: ktakashi

ext/socket/selector-epoll.c

@@ -49,12 +49,6 @@ static void add_socket_ctx(unix_context_t *ctx, SgObject slot)
   epoll_ctl(ctx->fd, EPOLL_CTL_ADD, socket->socket, &ev);
 }
 
-static void add_socket(SgSocketSelector *selector, SgObject slot)
-{
-  /* unix_context_t *ctx = (unix_context_t *)selector->context; */
-  /* add_socket_ctx(ctx, slot); */
-}
-
 static void remove_socket_ctx(unix_context_t *ctx, SgSocket *socket)
 {
   /* BUG on kernel < 2.6.9 */
@@ -64,13 +58,6 @@ static void remove_socket_ctx(unix_context_t *ctx, SgSocket *socket)
   epoll_ctl(ctx->fd, EPOLL_CTL_DEL, socket->socket, &ev);
 }
 
-static void remove_socket(SgSocketSelector *selector, SgSocket *socket)
-{
-  /* unix_context_t *ctx = (unix_context_t *)selector->context; */
-  /* remove_socket_ctx(ctx, socket); */
-}
-
-
 static SgObject wait_selector(unix_context_t *ctx, int nsock,
 			      SgObject sockets, struct timespec *sp,
 			      int *err)

ext/socket/selector-kqueue.c

@@ -41,18 +41,6 @@ static int make_selector()
   return kqueue();
 }
 
-static void add_socket(SgSocketSelector *selector, SgObject slot)
-{
-  /* do nothing :) */
-}
-
-
-static void remove_socket(SgSocketSelector *selector, SgSocket *socket)
-{
-  /* do nothing */
-}
-
-
 static SgObject wait_selector(unix_context_t *ctx, int nsock,
 			      SgObject sockets, struct timespec *sp,
 			      int *err)

ext/socket/selector-win.c

@@ -60,16 +60,6 @@ static void system_error(int code)
 		 Sg_GetLastErrorMessageWithErrorCode(code));
 }
 
-static void remove_socket(SgSocketSelector *selector, SgSocket *socket)
-{
-  /* do nothing */
-}
-
-static void add_socket(SgSocketSelector *selector, SgObject slot)
-{
-  /* do nothing */
-}
-
 static void * make_selector_context()
 {
   win_context_t *ctx = SG_NEW(win_context_t);

ext/socket/socket-selector.incl

@@ -81,8 +81,6 @@ static struct timespec *selector_timespec(SgObject timeout, struct timespec *tm)
   return NULL;                /* dummy */
 }
 
-static void remove_socket(SgSocketSelector *selector, SgSocket *socket);
-
 SgObject Sg_SocketSelectorClear(SgSocketSelector *selector)
 {
   SgObject cp;
@@ -91,9 +89,6 @@ SgObject Sg_SocketSelectorClear(SgSocketSelector *selector)
   }
   Sg_LockMutex(&selector->lock);
 
-  SG_FOR_EACH(cp, selector->sockets) {
-    remove_socket(selector, SG_SOCKET(SG_CAAR(cp)));
-  }
   strip_sockets(selector, SG_NIL);	/* strip closed ones */
   cp = selector->sockets;
   selector->sockets = SG_NIL;
@@ -102,8 +97,6 @@ SgObject Sg_SocketSelectorClear(SgSocketSelector *selector)
   return cp;
 }
 
-static void add_socket(SgSocketSelector *selector, SgObject slot);
-
 SgObject Sg_SocketSelectorAdd(SgSocketSelector *selector,
 			      SgSocket *socket,
 			      SgObject timeout,
@@ -130,7 +123,6 @@ SgObject Sg_SocketSelectorAdd(SgSocketSelector *selector,
     }
     Sg_LockMutex(&selector->lock);
     slot = Sg_Cons(socket, Sg_Cons(to, data));
-    add_socket(selector, slot);
     selector->sockets = Sg_Cons(slot, selector->sockets);
     strip_sockets(selector, SG_NIL);
     if (selector->waiting && !selector->retry) {