From 097827d6c57897ec4c7da4025c2677321cb3e97f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 29 七月 2020 09:35:56 +0800
Subject: [PATCH] modify dgram_mod_close_socket
---
src/socket/dgram_mod_socket.c | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 5a7a0b7..4c79df2 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -13,6 +13,16 @@
#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
@@ -22,6 +32,7 @@
typedef struct dgram_mod_socket_t {
shm_socket_t *shm_socket;
+ socket_mod_t mod;
// pthread_t recv_thread;
// <涓婚锛� 璁㈤槄鑰�>
SHMTopicSubMap *topic_sub_map;
@@ -47,12 +58,15 @@
if(topic_sub_map != NULL) {
for (map_iter = topic_sub_map->begin(); map_iter != topic_sub_map->end(); map_iter++) {
subscripter_set = map_iter->second;
- delete subscripter_set;
+ subscripter_set->clear();
+ mm_free((void *)subscripter_set);
+ //delete subscripter_set;
+ // printf("=============delete subscripter_set\n");
}
+ topic_sub_map->clear();
mem_pool_free_by_key(BUS_MAP_KEY);
}
-
-
+ // printf("=============close socket\n");
shm_close_socket(socket->shm_socket);
free(_socket);
}
@@ -78,6 +92,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 +123,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->mod = BUS;
socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY);
-printf("mem_pool_malloc_by_key after\n");
-
- // socket->topic_sub_map = new(map_ptr) SHMTopicSubMap;
-
- //socket->topic_sub_map = new SHMTopicSubMap;
+
run_pubsub_proxy(socket);
// pthread_t tid;
// pthread_create(&tid, NULL, run_accept_sub_request, _socket);
@@ -189,12 +201,12 @@
subscripter_set = map_iter->second;
for(set_iter = subscripter_set->begin(); set_iter != subscripter_set->end(); set_iter++) {
send_port = *set_iter;
- printf("_proxy_pub send before %d \n", send_port);
+ // printf("_proxy_pub send before %d \n", send_port);
if (shm_sendto(socket->shm_socket, buf+head_len, size-head_len, send_port, &timeout) !=0 ) {
//瀵规柟宸插叧闂殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
subscripter_to_del.push_back(send_port);
} else {
-printf("_proxy_pub send after: %d \n", send_port);
+// printf("_proxy_pub send after: %d \n", send_port);
}
@@ -220,9 +232,9 @@
size_t head_len;
const char *topic_delim = ",";
-printf("run_pubsub_proxy server receive before\n");
+// printf("run_pubsub_proxy server receive before\n");
while(shm_recvfrom(socket->shm_socket, (void **)&buf, &size, &port) == 0) {
-printf("run_pubsub_proxy server recv after: %s \n", buf);
+// printf("run_pubsub_proxy server recv after: %s \n", buf);
if(parse_pubsub_topic(buf, size, &action, &topics, &head_len)) {
if(strcmp(action, "sub") == 0) {
// 璁㈤槄鏀寔澶氫富棰樿闃�
--
Gitblit v1.8.0