From df9ea12ea1b0811ef3537a4ecd04cc881348214f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 27 七月 2020 18:33:47 +0800
Subject: [PATCH] update

---
 src/libshm_queue.a            |    0 
 src/queue/include/shm_mm.h    |    2 --
 src/queue/include/shm_queue.h |    4 ++--
 test_socket/dgram_mod_bus.c   |   12 +-----------
 src/socket/dgram_mod_socket.c |    4 ++--
 test_socket/dgram_mod_bus     |    0 
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/libshm_queue.a b/src/libshm_queue.a
index 56e099f..56836b6 100644
--- a/src/libshm_queue.a
+++ b/src/libshm_queue.a
Binary files differ
diff --git a/src/queue/include/shm_mm.h b/src/queue/include/shm_mm.h
index 6f28f13..8aeb202 100644
--- a/src/queue/include/shm_mm.h
+++ b/src/queue/include/shm_mm.h
@@ -18,8 +18,6 @@
  */
 void shm_destroy();
 
-void* shm_malloc_by_key(int key, int size);
-
 
 #ifdef __cplusplus
 }
diff --git a/src/queue/include/shm_queue.h b/src/queue/include/shm_queue.h
index e64f15a..d633ed9 100644
--- a/src/queue/include/shm_queue.h
+++ b/src/queue/include/shm_queue.h
@@ -68,8 +68,8 @@
       }
     }
     if (!found) {
-      // mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
-      // delete mqueue;
+      mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
+      delete mqueue;
       hashtable_remove(hashtable, *keyItr);
     }
   }
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 937d8f0..1fa1303 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -15,7 +15,7 @@
 
 
 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;
@@ -108,7 +108,7 @@
 	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);
+	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;
diff --git a/test_socket/dgram_mod_bus b/test_socket/dgram_mod_bus
index 82d76a1..3e8dd52 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 3cb6d9f..86e49a7 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -2,19 +2,9 @@
 #include "shm_mm.h"
 #include "usg_common.h"
 #include "mm.h"
-
-void sigint_handler(int sig) {
-  printf("sigint_handler\n");
-  hashtable_t *hashtable = mm_get_hashtable();
-  //hashtable_remove(hashtable, 8);
-  // dgram_mod_close_socket(server_socket);
-  //SHMQueue<ELEM_T>::remove_queues_include
-  exit(0);
-}
-
+ 
 
 void server(int port, bool restart) {
-  //signal(SIGINT,  sigint_handler);
   void * server_socket = dgram_mod_open_socket();
 
   if(restart) {

--
Gitblit v1.8.0