From b90ba316b54db321d3e8aaac7df93b46d80b9d9c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 15:47:41 +0800
Subject: [PATCH] 三个没有回收的信号

---
 test_net_socket/test_net_mod_socket.c |   67 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index dbebba5..f777773 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -33,9 +33,33 @@
 
 void * client;
 
+void *proxy_server_handler(void *sockt) {
+  pthread_detach(pthread_self());
+  
+  char action[512];
+  while ( true) {
+    printf("Input action: Close?\n");
+    if(scanf("%s",action) < 1) {
+      printf("Invalide action\n");
+      continue;
+    }
+
+    if(strcmp(action, "close") == 0) {
+      net_mod_server_socket_close(sockt);
+      break;
+    } else {
+      printf("Invalide action\n");
+    }
+  }  
+}
+
 void start_net_proxy(int port) {
+  pthread_t tid;
   printf("Start net proxy\n");
 	void *serverSocket  = net_mod_server_socket_open(port);
+
+   // 鍒涘缓涓�涓嚎绋�,鍙互鍏抽棴server
+  pthread_create(&tid, NULL, proxy_server_handler, serverSocket);
 	if(net_mod_server_socket_start(serverSocket) != 0) {
 		err_exit(errno, "net_mod_server_socket_start");
 	}
@@ -55,9 +79,35 @@
 }
 
 
+void *bus_handler(void *sockt) {
+  pthread_detach(pthread_self());
+  
+  char action[512];
+  while ( true) {
+    printf("Input action: Close?\n");
+    if(scanf("%s",action) < 1) {
+      printf("Invalide action\n");
+      continue;
+    }
+
+    if(strcmp(action, "close") == 0) {
+      bus_server_socket_wrapper_close(sockt);
+      break;
+    } else {
+      printf("Invalide action\n");
+    }
+  }
+  
+}
+
+
+
 void start_bus_server() {
   printf("Start bus server\n");
   void * server_socket = bus_server_socket_wrapper_open();
+  pthread_t tid;
+  // 鍒涘缓涓�涓嚎绋�,鍙互鍏抽棴bus
+  // pthread_create(&tid, NULL, bus_handler, server_socket);
   if(bus_server_socket_wrapper_start_bus(server_socket) != 0) {
     printf("start bus failed\n");
     exit(1);
@@ -177,11 +227,6 @@
 
   
 }
-
-
- 
-
-
 
 void *_run_sendandrecv_(void *arg) {
   Targ *targ = (Targ *)arg;
@@ -349,6 +394,10 @@
 
  // port = atoi(argv[2]);
 	 
+  if(opt.fun == NULL) {
+    usage(argv[0]);
+    exit(1);
+  }
 
 	if (strcmp("start_net_proxy", opt.fun) == 0 ) {
     if(opt.port == 0) {
@@ -359,10 +408,7 @@
     
   }
   else if (strcmp("start_bus_server", opt.fun) == 0) {
-    if(opt.key == 0) {
-      usage(argv[0]);
-      exit(1);
-    }
+     
     start_bus_server();
   }
   else if (strcmp("start_reply", opt.fun) == 0) {
@@ -410,6 +456,9 @@
 
   }
 
+  printf("==========end========\n");
+  shm_mm_wrapper_destroy();
+
 }
 
 

--
Gitblit v1.8.0