From c85fe0b87d3a1d6765b8ce9a17136a9f7e056178 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 05 八月 2020 09:51:49 +0800
Subject: [PATCH] update shmqueue destory
---
src/queue/include/shm_queue.h | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/queue/include/shm_queue.h b/src/queue/include/shm_queue.h
index 81913d0..f47cf48 100644
--- a/src/queue/include/shm_queue.h
+++ b/src/queue/include/shm_queue.h
@@ -21,6 +21,8 @@
~SHMQueue();
+ void force_destroy();
+
inline uint32_t size();
inline bool full();
@@ -36,7 +38,8 @@
inline ELEM_T &operator[](unsigned i);
- static void remove_queues_exclude(int *keys, size_t length);
+ static void remove_queues_exclude(int keys[], size_t length);
+ static void remove_queues_include(int keys[], size_t length);
private:
protected:
@@ -50,7 +53,7 @@
};
template <typename ELEM_T>
-void SHMQueue<ELEM_T>::remove_queues_exclude(int *keys, size_t length) {
+void SHMQueue<ELEM_T>::remove_queues_exclude(int keys[], size_t length) {
hashtable_t *hashtable = mm_get_hashtable();
std::set<int> *keyset = hashtable_keyset(hashtable);
std::set<int>::iterator keyItr;
@@ -65,12 +68,26 @@
}
}
if (!found) {
- mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable,
- *keyItr);
+ // 閿�姣佸叡浜唴瀛樼殑queue
+ mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
delete mqueue;
+ hashtable_remove(hashtable, *keyItr);
}
}
delete keyset;
+}
+
+
+template <typename ELEM_T>
+void SHMQueue<ELEM_T>::remove_queues_include(int keys[], size_t length) {
+ hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<ELEM_T, SHM_Allocator> *mqueue;
+ for(int i = 0; i< length; i++) {
+ // 閿�姣佸叡浜唴瀛樼殑queue
+ mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)mm_get_by_key(keys[i]);
+ delete mqueue;
+ hashtable_remove(hashtable, keys[i]);
+ }
}
template <typename ELEM_T>
@@ -78,37 +95,48 @@
hashtable_t *hashtable = mm_get_hashtable();
queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, key);
- // LockFreeQueue<int, 10000> q;
if (queue == NULL || (void *)queue == (void *)1) {
queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(qsize);
hashtable_put(hashtable, key, (void *)queue);
}
queue->reference++;
- LoggerFactory::getLogger().debug("SHMQueue constructor reference===%d",
- queue->reference.load());
+ LoggerFactory::getLogger().debug("SHMQueue constructor reference===%d", queue->reference.load());
}
template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
+ if(queue == NULL) {
+ // queue宸茬粡閿�姣�
+ return;
+ }
+
SemUtil::dec(queue->mutex);
queue->reference--;
// LoggerFactory::getLogger().debug("SHMQueue destructor reference===%d",
- // queue->reference.load());
if (queue->reference.load() == 0) {
- delete queue;
- hashtable_t *hashtable = mm_get_hashtable();
- hashtable_remove(hashtable, KEY);
- // LoggerFactory::getLogger().debug("SHMQueue destructor delete queue\n");
+ delete queue;
+ queue = NULL;
+ hashtable_t *hashtable = mm_get_hashtable();
+ hashtable_remove(hashtable, KEY);
+ // 姝ゆ椂queue宸茬粡閿�姣侊紝鏃犻渶 SemUtil::inc(queue->mutex)
+ // printf("SHMQueue destructor delete queue\n");
} else {
- SemUtil::inc(queue->mutex);
+ SemUtil::inc(queue->mutex);
}
+
}
-template <typename ELEM_T> inline uint32_t SHMQueue<ELEM_T>::force_destroy() {
+template <typename ELEM_T> void SHMQueue<ELEM_T>::force_destroy() {
+ if(queue == NULL) {
+ // queue宸茬粡閿�姣�
+ return;
+ }
+
SemUtil::dec(queue->mutex);
delete queue;
+ queue = NULL;
hashtable_t *hashtable = mm_get_hashtable();
hashtable_remove(hashtable, KEY);
- SemUtil::inc(queue->mutex);
+ // 姝ゆ椂queue宸茬粡閿�姣侊紝鏃犻渶 SemUtil::inc(queue->mutex)
}
template <typename ELEM_T> inline uint32_t SHMQueue<ELEM_T>::size() {
--
Gitblit v1.8.0