From fd750b33a9814d02691e7681239180048173db65 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 21 十月 2020 18:56:19 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.c | 4
test_nng/test_nng.c | 9 --
test_net_socket/test_net_mod_socket.c | 10 +-
test_nng/softbus_remote.png | 0
src/queue/lock_free_queue.h | 2
test_nng/nng_remote.png | 0
test_net_socket/net_mod_socket.sh | 4
test_nng/test_report.mk | 117 +++++++++++++++++++++++++++++++++++++++
test_nng/test_nng | 0
test_nng/nng_local.png | 0
src/socket/net_mod_server_socket.c | 2
test_nng/softbus_local.png | 0
12 files changed, 130 insertions(+), 18 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 281b7e5..ee11da6 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -160,7 +160,7 @@
template <typename T, typename AT> class Q_TYPE>
LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::~LockFreeQueue()
{
- LoggerFactory::getLogger()->debug("LockFreeQueue desctroy");
+ // LoggerFactory::getLogger()->debug("LockFreeQueue desctroy");
SemUtil::remove(slots);
SemUtil::remove(items);
SemUtil::remove(mutex);
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 8dd7f48..6413fe7 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -134,7 +134,7 @@
}
request_head = NetModSocket::decode_request_head(request_head_bs);
-printf("server received request from host = %s:%d\n", request_head.host, request_head.port);
+// printf("server received request from host = %s:%d\n", request_head.host, request_head.port);
if(request_head.content_length > max_buf) {
diff --git a/src/socket/net_mod_socket.c b/src/socket/net_mod_socket.c
index 375b2e2..9058272 100644
--- a/src/socket/net_mod_socket.c
+++ b/src/socket/net_mod_socket.c
@@ -158,7 +158,7 @@
request_head.content_length = send_size;
- printf("write_request %s:%d\n", request_head.host, request_head.port);
+ // printf("write_request %s:%d\n", request_head.host, request_head.port);
if(write_request(connfd, request_head, send_buf, send_size) != 0) {
LoggerFactory::getLogger()->error("write_request failture %s:%d\n", node->host, node->port);
close_connect(connfd);
@@ -292,7 +292,7 @@
}
response_head = NetModSocket::decode_response_head(response_head_bs);
-printf(">>>> read_response %s\n", response_head.host);
+// printf(">>>> read_response %s\n", response_head.host);
if(response_head.code != 0) {
// 瀵规柟娌℃湁瀵瑰簲鐨刱ey
return 1;
diff --git a/test_net_socket/net_mod_socket.sh b/test_net_socket/net_mod_socket.sh
index ea30ac3..d2683b7 100755
--- a/test_net_socket/net_mod_socket.sh
+++ b/test_net_socket/net_mod_socket.sh
@@ -24,8 +24,8 @@
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 ./softbus basic@192.168.5.22:/data/disk2/test
+ scp -rp ./softbus basic@192.168.20.10:/data3/workspace/wzq
}
case ${1} in
diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index a65cd20..3cb1c56 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -99,12 +99,12 @@
int i,j, n, recv_arr_size;
net_mod_recv_msg_t *recv_arr;
- int node_arr_size = 2;
+ int node_arr_size = 1;
//192.168.20.104
net_node_t node_arr[] = {
- // {"192.168.5.22", port, 11},
- {"192.168.20.10", port, 11},
- {"192.168.20.104", port, 11}
+ //{0, port, 11}
+ {"192.168.20.10", port, 11}
+ // {"192.168.20.104", port, 11}
};
void * client = net_mod_socket_open();
@@ -140,7 +140,7 @@
void mclient(int port) {
- int status, i = 0, processors = 2;
+ int status, i = 0, processors = 1;
void *res[processors];
// Targ *targs = (Targ *)calloc(processors, sizeof(Targ));
Targ targs[processors];
diff --git a/test_nng/nng_local.png b/test_nng/nng_local.png
new file mode 100644
index 0000000..2478e93
--- /dev/null
+++ b/test_nng/nng_local.png
Binary files differ
diff --git a/test_nng/nng_remote.png b/test_nng/nng_remote.png
new file mode 100644
index 0000000..6be4668
--- /dev/null
+++ b/test_nng/nng_remote.png
Binary files differ
diff --git a/test_nng/softbus_local.png b/test_nng/softbus_local.png
new file mode 100644
index 0000000..7826d4a
--- /dev/null
+++ b/test_nng/softbus_local.png
Binary files differ
diff --git a/test_nng/softbus_remote.png b/test_nng/softbus_remote.png
new file mode 100644
index 0000000..49532c0
--- /dev/null
+++ b/test_nng/softbus_remote.png
Binary files differ
diff --git a/test_nng/test_nng b/test_nng/test_nng
index bb85d18..5c443b3 100755
--- a/test_nng/test_nng
+++ b/test_nng/test_nng
Binary files differ
diff --git a/test_nng/test_nng.c b/test_nng/test_nng.c
index 9c95d32..baabad8 100644
--- a/test_nng/test_nng.c
+++ b/test_nng/test_nng.c
@@ -209,16 +209,11 @@
}
-
-
-
int
main(const int argc, const char **argv)
{
- //const char *url = tcp://192.168.20.104:8801
- const char *url = "ipc:///tmp/reqrep.ipc";
-
-
+ const char *url = "tcp://192.168.20.10:5001";
+ //const char *url = "ipc:///tmp/reqrep.ipc";
if (argc < 2) {
fprintf(stderr, "Usage: %s %s|%s \n", argv[0], "server", "client");
diff --git a/test_nng/test_report.mk b/test_nng/test_report.mk
new file mode 100644
index 0000000..de4e0a8
--- /dev/null
+++ b/test_nng/test_report.mk
@@ -0,0 +1,117 @@
+# 娴嬭瘯缁撴灉
+
+姣忎釜娴嬭瘯涓夋锛屽彇骞冲潎鍊�
+
+娴嬭瘯鏃堕棿鍗曚綅鏄井濡欙紝1寰 = 鍗冨垎涔嬩竴姣 = 鍗佷竾鍒嗕箣涓�绉�
+
+## softbus 鏈湴娴嬭瘯
+
+| 娆� | 鐢ㄦ椂锛堝井濡欙級 |
+| ---- | ---- |
+| 1 | 37.30 |
+| 2 | 37.09 |
+| 3 | 37.72 |
+| 骞冲潎 | 37.36 |
+
+
+
+
+## nng 鏈湴娴嬭瘯
+
+| 娆� | 鐢ㄦ椂锛堝井濡欙級 |
+| ---- | ---- |
+| 1 | 41.57 |
+| 2 | 52.38 |
+| 3 | 39.68 |
+| 骞冲潎 |44.54 |
+
+
+
+## softbus 缃戠粶娴嬭瘯
+
+| 娆� | 鐢ㄦ椂锛堝井濡欙級 |
+| ---- | ---- |
+| 1 | 547.77 |
+| 2 | 539.17 |
+| 3 | 529.72 |
+| 骞冲潎 |538.88 |
+
+
+## nng 缃戠粶娴嬭瘯缁撴灉
+
+| 娆� | 鐢ㄦ椂锛堝井濡欙級 |
+| ---- | ---- |
+| 1 | 204.48 |
+| 2 | 194.51 |
+| 3 | 193.36 |
+| 骞冲潎 | 197.45 |
+
+
+# 娴嬭瘯缁撹
+
+鏈湴娴嬭瘯softbus姣攏ng蹇�� 铏界劧缃戠粶娴嬭瘯鐪嬭捣鏉oftbus姣攏ng鎱紝浣嗘槸瀹為檯涓婂苟涓嶅叿鏈夊叕骞虫�с�傚洜涓簄ng娴嬭瘯鍙槸绠�鍗曠殑寤虹珛涓�涓繛鎺ワ紝鐒跺悗涓�鐩翠娇鐢ㄨ繖涓繛鎺ヨ繛缁彂閫佹暟鎹�傝�宻oftbus涓哄悜澶氳妭鐐瑰彂閫佹暟鎹笌澶勭悊缃戠粶鏁呴殰鐨勭瓑鎯呭喌閲屽仛浜嗗緢澶嶆潅鐨勫鐞嗐��
+
+# 娴嬭瘯杈撳嚭
+## softbus
+
+鏈湴
+```
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (3 sec 730087 usec), 骞冲潎: 37.300870
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (3 sec 709180 usec), 骞冲潎: 37.091800
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (3 sec 772182 usec), 骞冲潎: 37.721820
+
+```
+
+缃戠粶
+```
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (54 sec 777229 usec), 骞冲潎: 547.772290
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (53 sec 917515 usec), 骞冲潎: 539.175150
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (52 sec 972213 usec), 骞冲潎: 529.722130
+wzq@wzq-B250M-HD3:~/wk/softbus/build (dev)$ ./test_net_mod_socket mclient 5000
+
+
+
+```
+
+
+## nng
+
+鏈湴
+```
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (4 sec 157404 usec), 骞冲潎: 41.574040
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (5 sec 238815 usec), 骞冲潎: 52.388150
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (3 sec 968687 usec), 骞冲潎: 39.686870
+
+```
+
+缃戠粶
+```
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (20 sec 448536 usec), 骞冲潎: 204.485360
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (19 sec 451469 usec), 骞冲潎: 194.514690
+wzq@wzq-B250M-HD3:~/wk/softbus/test_nng (dev)$ ./test_nng mclient
+寮�濮嬫祴璇�...
+鍙戦�佹暟鐩�: 100000, 鐢ㄦ椂: (19 sec 336459 usec), 骞冲潎: 193.364590
+
+```
\ No newline at end of file
--
Gitblit v1.8.0