From 6441a27cc69dc95d74f64f2869eb54181b10cbec Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 10:13:10 +0800
Subject: [PATCH] commit

---
 demo/dgram_mod_req_rep        |    0 
 src/libshm_queue.a            |    0 
 test_socket/dgram_mod_bus.c   |    9 +++++++--
 src/socket/dgram_mod_socket.c |   17 ++++++++++++++++-
 test_socket/dgram_mod_bus     |    0 
 test_socket/dgram_mod_req_rep |    0 
 demo/dgram_mod_survey         |    0 
 test_socket/dgram_mod_survey  |    0 
 8 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/demo/dgram_mod_req_rep b/demo/dgram_mod_req_rep
index ed8fe41..74d29d9 100755
--- a/demo/dgram_mod_req_rep
+++ b/demo/dgram_mod_req_rep
Binary files differ
diff --git a/demo/dgram_mod_survey b/demo/dgram_mod_survey
index 00bf41d..d064466 100755
--- a/demo/dgram_mod_survey
+++ b/demo/dgram_mod_survey
Binary files differ
diff --git a/src/libshm_queue.a b/src/libshm_queue.a
index 1e2bd99..da6d5e8 100644
--- a/src/libshm_queue.a
+++ b/src/libshm_queue.a
Binary files differ
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 5a7a0b7..c9566af 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;
@@ -49,10 +60,10 @@
 			subscripter_set = map_iter->second;
 			delete subscripter_set;
 		}
+		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,6 +120,7 @@
 
 int  dgram_mod_start_bus(void * _socket) {
 	dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+	socket->mod = BUS;
 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>(BUS_MAP_KEY);
diff --git a/test_socket/dgram_mod_bus b/test_socket/dgram_mod_bus
index b5eccd6..c1cb03d 100755
--- a/test_socket/dgram_mod_bus
+++ b/test_socket/dgram_mod_bus
Binary files differ
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 1c6268d..b016cbc 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -3,10 +3,15 @@
 #include "usg_common.h"
 #include "mm.h"
 
-
+void * server_socket;
+void sigint_handler(int sig) {
+   dgram_mod_close_socket(server_socket);
+   exit(0);
+}
 
 void server(int port, bool restart) {
-  void * server_socket = dgram_mod_open_socket();
+ // signal(SIGINT,  sigint_handler);
+  server_socket = dgram_mod_open_socket();
 
   if(restart) {
     dgram_mod_force_bind(server_socket, port);
diff --git a/test_socket/dgram_mod_req_rep b/test_socket/dgram_mod_req_rep
index 29f0599..e75553d 100755
--- a/test_socket/dgram_mod_req_rep
+++ b/test_socket/dgram_mod_req_rep
Binary files differ
diff --git a/test_socket/dgram_mod_survey b/test_socket/dgram_mod_survey
index 48db086..496c8b0 100755
--- a/test_socket/dgram_mod_survey
+++ b/test_socket/dgram_mod_survey
Binary files differ

--
Gitblit v1.8.0