From 66e36f251a61c8b6722a90ecfb195e28c87dd99a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:52:57 +0800
Subject: [PATCH] dgram_mod_force_bind 注解
---
src/socket/dgram_mod_socket.c | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 937d8f0..7e21fd2 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -13,15 +13,26 @@
#define TOPIC_LIDENTIFIER "{"
#define TOPIC_RIDENTIFIER "}"
+enum socket_mod_t
+{
+ PULL_PUSH = 1,
+ REQ_REP = 2,
+ PAIR = 3,
+ PUB_SUB = 4,
+ SURVEY = 5,
+ BUS = 6
+
+};
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;
typedef std::map<SHMString, SHMKeySet *, std::less<SHMString>, SHM_STL_Allocator<std::pair<SHMString, SHMKeySet *> > > SHMTopicSubMap;
typedef struct dgram_mod_socket_t {
shm_socket_t *shm_socket;
+ socket_mod_t mod;
// pthread_t recv_thread;
// <涓婚锛� 璁㈤槄鑰�>
SHMTopicSubMap *topic_sub_map;
@@ -49,10 +60,10 @@
subscripter_set = map_iter->second;
delete subscripter_set;
}
- delete topic_sub_map;
+ topic_sub_map->clear();
+ mem_pool_free_by_key(BUS_MAP_KEY);
}
-
shm_close_socket(socket->shm_socket);
free(_socket);
}
@@ -78,6 +89,9 @@
int dgram_mod_recvfrom(void *_socket, void **buf, int *size, int *port) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ if(socket->mod == BUS) {
+ err_exit(0, "Can not use method recvfrom in a Bus");
+ }
// printf("dgram_mod_recvfrom before\n");
int rv = shm_recvfrom(socket->shm_socket, buf, size, port);
// printf("dgram_mod_recvfrom after\n");
@@ -106,14 +120,9 @@
int dgram_mod_start_bus(void * _socket) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
-printf("mem_pool_malloc_by_key before\n");
- // void *map_ptr = mem_pool_malloc_by_key(1, sizeof(SHMTopicSubMap));
- socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(1);
-printf("mem_pool_malloc_by_key after\n");
-
- // socket->topic_sub_map = new(map_ptr) SHMTopicSubMap;
-
- //socket->topic_sub_map = new SHMTopicSubMap;
+ socket->mod = BUS;
+ socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY);
+
run_pubsub_proxy(socket);
// pthread_t tid;
// pthread_create(&tid, NULL, run_accept_sub_request, _socket);
--
Gitblit v1.8.0