From 00dba6082e245d917cb7d6eed3c627211ff41cd7 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 25 九月 2020 15:53:21 +0800
Subject: [PATCH] update
---
src/queue/include/shm_queue.h | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/queue/include/shm_queue.h b/src/queue/include/shm_queue.h
index d633ed9..5c82b05 100644
--- a/src/queue/include/shm_queue.h
+++ b/src/queue/include/shm_queue.h
@@ -38,8 +38,10 @@
inline ELEM_T &operator[](unsigned i);
- static void remove_queues_exclude(int keys[], size_t length);
- static void remove_queues_include(int keys[], size_t length);
+ // @deprecate
+ static size_t remove_queues_exclude(int keys[], size_t length);
+ static size_t remove_queues(int keys[], size_t length);
+ static size_t remove_queue(int key);
private:
protected:
@@ -52,13 +54,15 @@
SHMQueue<ELEM_T>(const SHMQueue<ELEM_T> &a_src);
};
+// @deprecate
template <typename ELEM_T>
-void SHMQueue<ELEM_T>::remove_queues_exclude(int keys[], size_t length) {
+size_t 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;
LockFreeQueue<ELEM_T, SHM_Allocator> *mqueue;
bool found;
+ size_t count = 0;
for (keyItr = keyset->begin(); keyItr != keyset->end(); keyItr++) {
found = false;
for (size_t i = 0; i < length; i++) {
@@ -68,21 +72,37 @@
}
}
if (!found) {
+ // 閿�姣佸叡浜唴瀛樼殑queue
mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
delete mqueue;
hashtable_remove(hashtable, *keyItr);
+ count++;
}
}
delete keyset;
+ return count;
}
template <typename ELEM_T>
-void SHMQueue<ELEM_T>::remove_queues_include(int keys[], size_t length) {
+size_t SHMQueue<ELEM_T>::remove_queues(int keys[], size_t length) {
hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<ELEM_T, SHM_Allocator> *mqueue;
+ size_t count = 0;
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]);
+ count++;
}
+ return count;
+}
+
+template <typename ELEM_T>
+size_t SHMQueue<ELEM_T>::remove_queue(int key) {
+ int keys[] = {key};
+ return remove_queues(keys, 1);
}
template <typename ELEM_T>
@@ -90,7 +110,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 +119,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