From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit

---
 src/socket/shm_mod_socket.h |  113 +++++++++++++++++++++-----------------------------------
 1 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index aced91d..9890aef 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -3,64 +3,52 @@
 #include "usg_common.h"
 #include "shm_socket.h"
 #include "shm_allocator.h"
-#include "mem_pool.h"
+#include "shm_mm.h"
 #include "hashtable.h"
 #include "sem_util.h"
 #include "logger_factory.h"
+#include "key_def.h"
 #include <set>
+#include "socket_def.h"
 
-#define ACTION_LIDENTIFIER "<**"
-#define ACTION_RIDENTIFIER "**>"
-#define TOPIC_LIDENTIFIER "{"
-#define TOPIC_RIDENTIFIER "}"
+#define BUS_HEAD_SIZE sizeof(bus_head_t)
+class BusServerSocket;
 
-#define BUS_MAP_KEY 1
-//typedef std::basic_string<char, std::char_traits<char>, SHM_STL_Allocator<char> > SHMString;
-typedef std::set<int,  std::less<int>, SHM_STL_Allocator<int> > SHMKeySet;
-typedef std::map<SHMString, SHMKeySet *, std::less<SHMString>, SHM_STL_Allocator<std::pair<const SHMString, SHMKeySet *> > > SHMTopicSubMap;
-
-enum socket_mod_t
+struct bus_head_t
 {
-	PULL_PUSH = 1,
-	REQ_REP = 2,
-	PAIR = 3,
-	PUB_SUB = 4,
-	SURVEY = 5,
-	BUS = 6
-	
+	char action[64];
+	uint32_t topic_size;
+	uint32_t content_size;
 };
 
+
 class ShmModSocket {
+friend class BusServerSocket;
 private:
 	shm_socket_t *shm_socket;
-  socket_mod_t mod;
-  // pthread_t recv_thread;
-  // <涓婚锛� 璁㈤槄鑰�>
-	SHMTopicSubMap *topic_sub_map;
+  
 	std::set<int> *bus_set;
 
 private:
-	inline int _recvfrom_(void **buf, int *size, int *key,  struct timespec *timeout, int flags);
-	void _proxy_sub( char *topic, int key);
-	void _proxy_pub( char *topic, size_t head_len, void *buf, size_t size, int key);
-	void *run_pubsub_proxy();
-	int parse_pubsub_topic(char *str, size_t size, char **_action, char **_topic, size_t *head_len );
-	int _sub_( char *topic, int size, int key, struct timespec *timeout, int flags);
-	int _pub_( char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout, int flags);
+	 
+	 
 
-	void _proxy_desub( char *topic, int key);
-	void _proxy_desub_all(int key);
-	int  _desub_( char *topic, int size, int key, struct timespec *timeout, int flags);
+	static int get_bus_sendbuf(bus_head_t &request_head, const void *topic_buf, int topic_size, const void *content_buf, int content_size, void **retbuf);
 
-	static void foreach_subscripters(std::function<void(SHMKeySet *, int)>  cb);
-	static bool include_in_keys(int key, int keys[], size_t length);
-	static size_t remove_subscripters(int keys[], size_t length) ;
 public:
-	static size_t remove_keys(int keys[], size_t length);
+	// static size_t remove_keys(int keys[], size_t length);
+	// static size_t remove_keys_exclude(int keys[], size_t length);
+
+  // bus header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
+  static void * encode_bus_head(bus_head_t & bushead);
+  // 瑙g爜 bus  header
+  static bus_head_t  decode_bus_head(void *headbs); 
+  
 public:
 	ShmModSocket();
 	~ShmModSocket();
 	 
+	int stop();
 	/**
 	 * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -75,58 +63,45 @@
 	/**
 	 * 鍙戦�佷俊鎭�
 	 * @key 鍙戦�佺粰璋�
+	 * @flag BUS_TIMEOUT_FLAG  BUS_NOWAIT_FLAG
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 	 */
-	int sendto(const void *buf, const int size, const int key);
-	// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
-	int sendto_timeout(const void *buf, const int size, const int key, const struct timespec *timeout);
-	// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
-	int sendto_nowait(const void *buf, const int size, const int key);
+ 
+	int sendto(const void *buf, const int size, const int key, const struct timespec *timeout = NULL, int flag = 0);
+ 
 
 	/**
 	 * 鎺ユ敹淇℃伅
 	 * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 	*/
-	int recvfrom(void **buf, int *size, int *key);
-	// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int recvfrom_timeout(void **buf, int *size, int *key,  struct timespec *timeout);
-	int recvfrom_nowait(void **buf, int *size, int *key);
+ 
+	int recvfrom(void **buf, int *size, int *key,  const struct timespec *timeout = NULL, int flag = 0);
 
 	/**
 	 * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
 	 * @key 鍙戦�佺粰璋�
+	 * @flag BUS_TIMEOUT_FLAG  BUS_NOWAIT_FLAG
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 	*/
-	int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
-	// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int sendandrecv_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size,  struct timespec *timeout) ;
-	int sendandrecv_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
-
-
-	int sendandrecv_unsafe(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
-	// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size,  struct timespec *timeout) ;
-	int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ;
+ 
+	int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size,
+	 const struct timespec *timeout = NULL, int flag = 0);
 
 
 	/**
-	 * 鍚姩bus
 	 * 
-	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-	*/
-	int  start_bus();
+	 */
+  int recvandsend( recvandsend_callback_fn callback, const struct timespec *timeout = NULL , int flag = 0, void * user_data = NULL);
 
 	/**
 	 * 璁㈤槄鎸囧畾涓婚
 	 * @topic 涓婚
 	 * @size 涓婚闀垮害
 	 * @key 鎬荤嚎绔彛
+	 * @flag BUS_TIMEOUT_FLAG  BUS_NOWAIT_FLAG
 	 */
-	int  sub(char *topic, int size, int key);
-	// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int  sub_timeout(char *topic, int size, int key,  struct timespec *timeout);
-	int  sub_nowait(char *topic, int size, int key);
+	int  sub(const char *topic, int size, int key,  const struct timespec *timeout = NULL, int flag = 0);
 
 
 	 /**
@@ -134,22 +109,18 @@
  	 * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
 	 * @size 涓婚闀垮害
 	 * @key 鎬荤嚎绔彛
+	 * @flag BUS_TIMEOUT_FLAG  BUS_NOWAIT_FLAG
 	 */
-	int desub( char *topic, int size, int key);
-	// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int desub_timeout(char *topic, int size, int key, struct timespec *timeout);
-	int desub_nowait(char *topic, int size, int key) ;
+	int desub(const char *topic, int size, int key, const struct timespec *timeout = NULL, int flag = 0);
 
 	/**
 	 * 鍙戝竷涓婚
 	 * @topic 涓婚
 	 * @content 涓婚鍐呭
 	 * @key 鎬荤嚎绔彛
+	 * @flag BUS_TIMEOUT_FLAG  BUS_NOWAIT_FLAG
 	 */
-	int  pub(char *topic, int topic_size, void *content, int content_size, int key);
-	//  瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-	int  pub_timeout(char *topic, int topic_size, void *content, int content_size, int key,  struct timespec *timeout);
-	int  pub_nowait(char *topic, int topic_size, void *content, int content_size, int key);
+	int  pub(const char *topic, int topic_size, const void *content, int content_size, int key, const  struct timespec *timeout = NULL, int flag = 0);
 
 
 	/**

--
Gitblit v1.8.0