From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期一, 25 一月 2021 17:40:29 +0800 Subject: [PATCH] fix conflict --- README.md | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 102 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index be00c53..36dae67 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ # 1. 瀹炰緥 - +浠ヤ笅瀹炰緥浠ｇ爜鍦╜demo`鏂囦欢澶逛笅 ## 1.1 Bus妯″紡 -Source +**Source** `dgram_mod_bus.c` -缂栬瘧 +**缂栬瘧** 瀹夎濂絪o鍖呭悗锛岀敤濡備笅鐨勬柟寮忕紪璇戯紝shm_queue鏄�氫俊闃熷垪鍖咃紝usgcommon鏄叕鍏卞寘锛宲thread鏄郴缁熺殑绾跨▼鍖� `g++ dgram_mod_bus.c -mcx16 -std=c++11 -lshm_queue -lusgcommon -lpthread` -婕旂ず +**婕旂ず** 鍚姩bus `./dgram_mod_bus server 8`銆傜劧鍚庢墦寮�涓や釜瀹㈡埛绔繛鎺us锛� 绗竴涓鎴风璁㈤槄 "news", 绗簩涓鎴风鍙戝竷 "news". 绗竴涓鎴风浼氭敹鍒扮浜屼釜瀹㈡埛绔帹閫佺殑淇℃伅銆� @@ -49,11 +49,11 @@ ## 1.2 req_rep妯″紡, 閫傚簲浜庢敞鍐� -Source `dgram_mod_req_rep.c` +**Source** `dgram_mod_req_rep.c` -缂栬瘧 鍚屼笂 +**缂栬瘧** 鍚屼笂 -婕旂ず +**婕旂ず** ``` ## 鍚姩娉ㄥ唽涓績 @@ -64,10 +64,11 @@ ``` ## survey妯″紡锛� 閫傚簲浜庡績璺� -Source `dgram_mod_survey.c` +**Source** `dgram_mod_survey.c` -缂栬瘧 鍚屼笂 +**缂栬瘧** 鍚屼笂 +**婕旂ず** 鍚姩蹇冭烦涓績 ``` $ ./dgram_mod_survey server 3 @@ -101,24 +102,49 @@ SEND HEART:9 ``` - + +# 1.3 缃戠粶娴嬭瘯 + + + +鍦ㄤ笁涓妭鐐逛笂node1 node2 node3 鍒嗗埆鎵ц涓嬮潰鐨勭▼搴� +``` + +# 鎵撳紑璇锋眰搴旂瓟鐨剆erver +./dgram_mod_req_rep server 11 & + +# 寮�鍚痓us +./dgram_mod_bus server 8 & + +# 寮�鍚綉缁渟erver +./net_mod_socket server 5000 & + +# 璁㈤槄bus +./dgram_mod_bus client 8 +``` + +鍦ㄥ叾涓竴涓妭鐐规墽琛岀綉缁滃鎴风绋嬪簭锛屽悜鍏朵粬涓変釜鑺傜偣鍙戦�佹秷鎭� + +``` +./net_mod_socket client 5000 +``` # 2. 鎺ュ彛璇存槑 -shm_mm.h +shm_mm_wraper.h ``` /** * 鍒濆鍖栧叡浜唴瀛� * @size 鍏变韩鍐呭瓨澶у皬, 鍗曚綅M * */ -void shm_init(int size); +void shm_mm_wrapper_init(int size); /** * 閿�姣佸叡浜唴瀛� * 鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸�� */ -void shm_destroy(); +void shm_mm_wrapper_destroy(); ``` dgram_mod_socket.h @@ -201,4 +227,67 @@ void dgram_mod_free(void *buf) ; ``` +net_mod_server_socket_wrapper.h + +``` + +/** + * 鍒涘缓 + */ +void *net_mod_server_socket_open(int port) ; + +/** + * 鍏抽棴 + */ +void net_mod_server_socket_close(void *_sockt) ; + +/** + * 鍚姩 + */ +void net_mod_server_socket_start(void *_sockt); + +``` + +net_mod_socket_wrapper.h + +``` + +/** + * 鍒涘缓 + */ +void * net_mod_socket_open(); + +/** + * 鍏抽棴 + */ +void net_mod_socket_close(void *_sockt); + +/** + * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓� + * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴� + * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴� + * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴� + * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁� + */ +int net_mod_socket_sendandrecv(void *_sockt, net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size, + net_mod_recv_msg_t ** recv_arr, int *recv_arr_size); + +/** + * 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍 + * @arr 娑堟伅缁� + * @size 娑堟伅缁勭殑闀垮害 + */ +void net_mod_socket_free_recv_msg_arr(net_mod_recv_msg_t * arr, int size); + + /** + * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭� + * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴� + * @topic 涓婚锛孈topic_size 璇ヤ富棰樼殑闀垮害 + * @content 鍐呭锛孈content_size 鍐呭闀垮害 + * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟 + */ +int net_mod_socket_pub(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size); + +``` + -- Gitblit v1.8.0