From 509cf5db80c1d8919e19e1e061f2014e1ff3caf7 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期三, 05 八月 2020 19:44:03 +0800 Subject: [PATCH] udpate --- src/queue/include/shm_queue.h | 45 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/queue/include/shm_queue.h b/src/queue/include/shm_queue.h index e64f15a..ca5036f 100644 --- a/src/queue/include/shm_queue.h +++ b/src/queue/include/shm_queue.h @@ -40,6 +40,7 @@ static void remove_queues_exclude(int keys[], size_t length); static void remove_queues_include(int keys[], size_t length); + static void remove_queue(int key); private: protected: @@ -68,8 +69,9 @@ } } if (!found) { - // mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr); - // delete mqueue; + // 閿�姣佸叡浜唴瀛樼殑queue + mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr); + delete mqueue; hashtable_remove(hashtable, *keyItr); } } @@ -77,12 +79,23 @@ } + 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> +void SHMQueue<ELEM_T>::remove_queue(int key) { + int keys[] = {key}; + remove_queues_include(keys, 1); } template <typename ELEM_T> @@ -90,7 +103,6 @@ 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); @@ -100,26 +112,39 @@ } 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> 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