修改网络监听退出流程

c/tools/log/log.c

@@ -98,9 +98,9 @@ void log_manager_stop(log_manager *self)
     pthread_mutex_lock(&self->mtx);
     self->stop = 1;                /* 置退出标志 */
     pthread_cond_broadcast(&self->cond); /* 唤醒所有等待线程 */
-    printf("stopping loger\n");
+    printf("SYS:stopping loger\n");
     pthread_mutex_unlock(&self->mtx);
-    printf("done\n");
+    printf("SYS:done\n");
 }
 
 //定期清理函数

c/tools/quit/quit.c

@@ -1,9 +1,40 @@
+#define _GNU_SOURCE 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include<unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/epoll.h>
 #include "quit.h"
 #include "tem/ctl.h"
 
+int quit_server(netm *self)
+{
+    if(self ==NULL)
+        return -1;
+    if(self->epoll_fd != -1)
+    {
+        epoll_ctl(self->epoll_fd,EPOLL_CTL_DEL,self->http_fd,NULL);
+        epoll_ctl(self->epoll_fd,EPOLL_CTL_DEL,self->fifo_fd[0],NULL);
+        self->epoll_fd = -1;
+    }
+    //关闭epoll监听
+    if(self->http_fd != -1)
+    {
+        close(self->http_fd);
+        self->http_fd =-1;
+    }
+    //关闭socket监听
+    if(self->fifo_fd[0] != -1)
+    {
+        close(self->fifo_fd[0]);
+        self->fifo_fd[0] = -1;
+    }
+    //关闭管道监听
+}
+
 void quit_all(int status,void *self_p)
 {
     alres *resouce =(alres*)self_p;
@@ -13,6 +44,7 @@ void quit_all(int status,void *self_p)
     logs *netlog = (logs*)malloc(sizeof(logs));
     netlog->next = NULL;
     memcpy(netlog->log,"shuting down networkserver",27);
+    quit_server(resouce->network);
     resouce->loger->in_log(netlog,resouce->loger);
     free(resouce->network);
     //释放网络资源

c/tools/quit/quit.h

@@ -14,6 +14,7 @@ typedef struct all_resources
 
 
 void quit_all(int status,void *self_p);
+int quit_server(netm *self);
 
 
 #endif