From 76bd3ff05443dc703c0fa1f8907301199b2c09c0 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 13 一月 2021 13:01:21 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/wangzhengquan/shmqueue
---
test_net_socket/net_mod_socket.sh | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/test_net_socket/net_mod_socket.sh b/test_net_socket/net_mod_socket.sh
index ea30ac3..cd4c809 100755
--- a/test_net_socket/net_mod_socket.sh
+++ b/test_net_socket/net_mod_socket.sh
@@ -1,51 +1,78 @@
function server() {
-
+
+ # 寮�鍚痓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}"
-# 鎵撳紑璇锋眰搴旂瓟鐨剆erver
- ./dgram_mod_req_rep server 11 & server_pid=$! && echo ${server_pid}
-
-
-# 寮�鍚痓us
- ./dgram_mod_bus server 8 & server_pid=$! && echo ${server_pid}
-
-# 寮�鍚綉缁渟erver
- ./test_net_mod_socket server 5000 & server_pid=$! && echo ${server_pid}
-
+ # 鎵撳紑璇锋眰搴旂瓟娴嬭瘯鐨勬帴鍙楃
+ ./test_net_mod_socket --fun="start_reply" --key=100 & server_pid=$! && echo "pid: ${server_pid}"
}
function client() {
- ./test_net_mod_socket client 5000
+
+ # ./test_net_mod_socket --fun="start_net_client" \
+ # --sendlist="192.168.5.10:5000:11, 192.168.5.22:5000:11, 192.168.20.104:5000:11" \
+ # --publist="192.168.5.10:5000:8, 192.168.5.22:5000:8, 192.168.20.104:5000:8"
+
+
+ ./test_net_mod_socket --fun="start_net_client" \
+ --sendlist="localhost:5000:100" \
+ --publist="localhost:5000"
+
+
+}
+
+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
}
function scp() {
- scp -P 100 -rp ../build basic@192.168.5.22:/data/disk2/test
- scp -rp ../build basic@192.168.20.10:/data3/workspace/wzq
+ scp -P 100 -rp ~/wk/softbus basic@192.168.5.22:/data/disk2/test
+ scp -rp ~/wk/softbus basic@192.168.20.10:/data3/workspace/wzq
}
case ${1} in
"server")
close
+ sleep 2
server
;;
"client")
client
+ ;;
+ "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