From e924ba2fc0f4e57aae032fade3a566c2019f4630 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 29 一月 2021 09:52:30 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.h | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 5c66fbb..f5441ce 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -11,23 +11,38 @@
#include <set>
#include "socket_def.h"
+#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t))
+class BusServerSocket;
+
+struct bus_head_t
+{
+ 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;
std::set<int> *bus_set;
private:
- inline int _recvfrom_(void **buf, int *size, int *key, 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);
+
- int _desub_( char *topic, int size, int key, struct timespec *timeout, int flags);
+ static int get_bus_sendbuf(bus_head_t &request_head, void *topic_buf, int topic_size, void *content_buf, int content_size, void **retbuf);
public:
static size_t remove_keys(int keys[], size_t length);
+
+ // bus header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
+ static void * encode_bus_head(bus_head_t & bushead);
+ // 瑙ｇ爜 bus header
+ static bus_head_t decode_bus_head(void *headbs);
+
public:
ShmModSocket();
~ShmModSocket();
@@ -46,50 +61,44 @@
/**
* 鍙戦�佷俊鎭�
* @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(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);
- 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_unsafe(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) ;
/**
* 璁㈤槄鎸囧畾涓婚
* @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(char *topic, int size, int key, const struct timespec *timeout = NULL, int flag = 0);
/**
@@ -97,22 +106,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(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(char *topic, int topic_size, void *content, int content_size, int key, const struct timespec *timeout = NULL, int flag = 0);
/**
--
Gitblit v1.8.0