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/net_mod_socket.sh |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/test_net_socket/net_mod_socket.sh b/test_net_socket/net_mod_socket.sh
index 0b6bd5b..cd4c809 100755
--- a/test_net_socket/net_mod_socket.sh
+++ b/test_net_socket/net_mod_socket.sh
@@ -1,13 +1,12 @@
 function server() {
 	
-# 寮�鍚痓us 
- ./test_net_mod_socket --fun="start_bus_server" --key=8  & server_pid=$! &&  echo "pid: ${server_pid}"
-# 寮�鍚綉缁滆浆鍙戜唬鐞�
+	# 寮�鍚痓us 
+ ./test_net_mod_socket --fun="start_bus_server"  & server_pid=$! &&  echo "pid: ${server_pid}"
+	# 寮�鍚綉缁滆浆鍙戜唬鐞�
 	./test_net_mod_socket  --fun="start_net_proxy" --port=5000 & server_pid=$! && echo "pid: ${server_pid}" 
 
-
-# 鎵撳紑璇锋眰搴旂瓟娴嬭瘯鐨勬帴鍙楃
-	./test_net_mod_socket --fun="start_reply" --key=11 & server_pid=$! &&  echo "pid: ${server_pid}" 
+	# 鎵撳紑璇锋眰搴旂瓟娴嬭瘯鐨勬帴鍙楃
+	./test_net_mod_socket --fun="start_reply" --key=100 & server_pid=$! &&  echo "pid: ${server_pid}" 
 }
 
 function client() {
@@ -18,20 +17,26 @@
 
 
 	./test_net_mod_socket --fun="start_net_client" \
-	 --sendlist="localhost:5000:11" \
-	 --publist="localhost:5000:8"  
+	 --sendlist="localhost:5000:100" \
+	 --publist="localhost:5000"  
 
 	 
 }
 
-function mclient() {
-	./test_net_mod_socket --fun="start_net_mclient" \
-	 --sendlist="localhost:5000:11"
+function msend() {
+	./test_net_mod_socket --fun="test_net_sendandrecv_threads" \
+	 --sendlist="localhost:5000:100, localhost:5000:100"
+	 
+}
+
+function mpub() {
+	./test_net_mod_socket --fun="test_net_pub_threads" \
+	 --publist="localhost:5000, localhost:5000"
 	 
 }
 
 function close() {
-	ps -ef | grep -e "dgram_mod_req_rep" -e "net_mod_socket"  -e "dgram_mod_bus" | awk  '{print $2}' | xargs -i kill -9 {}
+	ps -ef | grep -e "test_net_mod_socket" -e "net_mod_socket"| awk  '{print $2}' | xargs -i kill -9 {}
 	ipcrm -a
 }
 
@@ -44,27 +49,30 @@
 case ${1} in
   "server")
 	close
+	sleep 2
   server
   ;;
   "client")
  	client
   ;;
-  "mclient")
-	close
-	server 
-	mclient
+  "msend")
+	msend
+  ;;
+  "mpub")
+	mpub
   ;;
   "close")
  	close
   ;;
   "")
 	close
+	sleep 2
 	server 
 	client
   ;;
 
   *)
-  echo "error input"
+  echo "argument input error"
   exit 1
   ;;
 esac

--
Gitblit v1.8.0