From f462d191f5ded9f9992837862fd97f5c1a536bce Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 01 十二月 2020 16:49:33 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.h | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 34c78a5..aced91d 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -14,7 +14,6 @@
#define TOPIC_LIDENTIFIER "{"
#define TOPIC_RIDENTIFIER "}"
-static Logger *logger = LoggerFactory::getLogger();
#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;
@@ -41,17 +40,17 @@
std::set<int> *bus_set;
private:
- inline int _recvfrom_(void **buf, int *size, int *port, struct timespec *timeout, int flags);
- void _proxy_sub( char *topic, int port);
- void _proxy_pub( char *topic, size_t head_len, void *buf, size_t size, int port);
+ 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 port, struct timespec *timeout, int flags);
- int _pub_( char *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout, int flags);
+ 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 port);
- void _proxy_desub_all(int port);
- int _desub_( char *topic, int size, int port, 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 void foreach_subscripters(std::function<void(SHMKeySet *, int)> cb);
static bool include_in_keys(int key, int keys[], size_t length);
@@ -66,49 +65,49 @@
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int bind(int port);
+ int bind(int key);
/**
* 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int force_bind(int port);
+ int force_bind(int key);
/**
* 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendto(const void *buf, const int size, const int port);
+ int sendto(const void *buf, const int size, const int key);
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
- int sendto_timeout(const void *buf, const int size, const int port, const struct timespec *timeout);
+ 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 port);
+ int sendto_nowait(const void *buf, const int size, const int key);
/**
* 鎺ユ敹淇℃伅
- * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int recvfrom(void **buf, int *size, int *port);
+ int recvfrom(void **buf, int *size, int *key);
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int recvfrom_timeout(void **buf, int *size, int *port, struct timespec *timeout);
- int recvfrom_nowait(void **buf, int *size, int *port);
+ int recvfrom_timeout(void **buf, int *size, int *key, struct timespec *timeout);
+ int recvfrom_nowait(void **buf, int *size, int *key);
/**
* 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendandrecv(const void *send_buf, const int send_size, const int port, 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) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_timeout(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, struct timespec *timeout) ;
- int sendandrecv_nowait(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ 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 port, 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 port, void **recv_buf, int *recv_size, struct timespec *timeout) ;
- int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+ 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) ;
/**
@@ -122,35 +121,35 @@
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
* @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int sub(char *topic, int size, int port);
+ int sub(char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sub_timeout(char *topic, int size, int port, struct timespec *timeout);
- int sub_nowait(char *topic, int size, int port);
+ int sub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int sub_nowait(char *topic, int size, int key);
/**
* 鍙栨秷璁㈤槄鎸囧畾涓婚
* @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
* @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int desub( char *topic, int size, int port);
+ int desub( char *topic, int size, int key);
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int desub_timeout(char *topic, int size, int port, struct timespec *timeout);
- int desub_nowait(char *topic, int size, int port) ;
+ int desub_timeout(char *topic, int size, int key, struct timespec *timeout);
+ int desub_nowait(char *topic, int size, int key) ;
/**
* 鍙戝竷涓婚
* @topic 涓婚
* @content 涓婚鍐呭
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
*/
- int pub(char *topic, int topic_size, void *content, int content_size, int port);
+ 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 port, struct timespec *timeout);
- int pub_nowait(char *topic, int topic_size, void *content, int content_size, int port);
+ 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);
/**
--
Gitblit v1.8.0