From 4d5adf4ac44c864e67e8019bb97d89199bb0b4b7 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 06 八月 2020 17:06:27 +0800
Subject: [PATCH] fix survey
---
src/queue/include/shm_queue.h | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/queue/include/shm_queue.h b/src/queue/include/shm_queue.h
index f47cf48..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++) {
@@ -72,22 +76,33 @@
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>
--
Gitblit v1.8.0