Refactor reactor->write

Author: matyhtf

src/network/ReactorThread.c

@@ -1337,6 +1337,9 @@ static int swReactorThread_loop_tcp(swThreadParam *param)
 
     reactor->ptr = serv;
     reactor->id = reactor_id;
+    reactor->thread = 1;
+    reactor->sockets = serv->connection_list;
+    reactor->max_socket = serv->max_connection;
 
     reactor->onFinish = NULL;
     reactor->onTimeout = NULL;

src/reactor/ReactorKqueue.c

@@ -127,6 +127,10 @@ static int swReactorKqueue_add(swReactor *reactor, int fd, int fdtype)
 			return SW_ERR;
 		}
 	}
+    if (swReactor_add(reactor, fd, fdtype) < 0)
+    {
+        return SW_ERR;
+    }
 
 	memcpy(&e.udata, &fd_, sizeof(swFd));
 	swTrace("[THREAD #%ld]EP=%d|FD=%d\n", pthread_self(), this->epfd, fd);
@@ -212,6 +216,10 @@ static int swReactorKqueue_del(swReactor *reactor, int fd)
 		swWarn("kqueue remove fd[=%d] failed. Error: %s[%d]", fd, strerror(errno), errno);
 		return SW_ERR;
 	}
+    if (swReactor_del(reactor, fd) < 0)
+    {
+        return SW_ERR;
+    }
 	reactor->event_num = reactor->event_num <= 0 ? 0 : reactor->event_num - 1;
 	return SW_OK;
 }

src/reactor/ReactorPoll.c

@@ -109,6 +109,10 @@ static int swReactorPoll_add(swReactor *reactor, int fd, int fdtype)
     {
         object->events[cur].events |= POLLHUP;
     }
+    if (swReactor_add(reactor, fd, fdtype) < 0)
+    {
+        return SW_ERR;
+    }
     reactor->event_num++;
     return SW_OK;
 }
@@ -149,6 +153,11 @@ static int swReactorPoll_del(swReactor *reactor, int fd)
 
 	swTrace("fd=%d", fd);
 
+	if (swReactor_del(reactor, fd) < 0)
+    {
+        return SW_ERR;
+    }
+
 	for (i = 0; i < reactor->event_num; i++)
 	{
 		//找到了

src/reactor/ReactorSelect.c

@@ -91,6 +91,10 @@ int swReactorSelect_add(swReactor *reactor, int fd, int fdtype)
 		swWarn("max fd value is FD_SETSIZE(%d).\n", FD_SETSIZE);
 		return SW_ERR;
 	}
+    if (swReactor_add(reactor, fd, fdtype) < 0)
+    {
+        return SW_ERR;
+    }
 	swReactorSelect *object = reactor->object;
 	swFdList_node *ev = sw_malloc(sizeof(swFdList_node));
 	ev->fd = fd;
@@ -116,6 +120,11 @@ int swReactorSelect_del(swReactor *reactor, int fd)
     swFdList_node ev, *s_ev = NULL;
     ev.fd = fd;
 
+    if (swReactor_del(reactor, fd) < 0)
+    {
+        return SW_ERR;
+    }
+
     LL_SEARCH(object->fds, s_ev, &ev, swReactorSelect_cmp);
     if (s_ev == NULL)
     {