From 5e463316508fbb0bd79c8b4b68cd461b302a4da1 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 01 二月 2021 14:16:36 +0800
Subject: [PATCH] update
---
src/queue/shm_queue.h | 96 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 104ea73..3a7750e 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -18,15 +18,22 @@
template <typename ELEM_T> class SHMQueue {
private:
- const int KEY;
+ const int mkey;
+ hashtable_t * hashtable;
+ // 鏄惁鏄痥ey瀵瑰簲鐨勫叡浜槦鍒楃殑鐪熸鎷ユ湁鑰咃紝涔熷氨鏄鏄痓ind鍒発ey涓婄殑锛屼笉鏄痑ttach鍒発ey涓婄殑瀵硅薄
+ bool owner;
+ size_t mqsize;
public:
/// @brief constructor of the class
- SHMQueue(int key = 0, size_t qsize = 16);
+ SHMQueue(size_t qsize = 16);
~SHMQueue();
- void force_destroy();
+ bool bind(int key, bool force) ;
+ bool attach(int key);
+
+ int get_key();
uint32_t size();
@@ -40,8 +47,6 @@
// @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:
@@ -85,48 +90,66 @@
}
-template <typename ELEM_T>
-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);
-}
+SHMQueue<ELEM_T>::SHMQueue(size_t qsize): mqsize(qsize) {
-template <typename ELEM_T>
-SHMQueue<ELEM_T>::SHMQueue(int key, size_t qsize) : KEY(key) {
-
- hashtable_t *hashtable = mm_get_hashtable();
- queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, key);
- if (queue == NULL || (void *)queue == (void *)1) {
- queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(qsize);
- hashtable_put(hashtable, key, (void *)queue);
- }
+ hashtable = mm_get_hashtable();
+ owner = false;
+ mkey = 0;
+ // queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, key);
+ // 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());
}
template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
LoggerFactory::getLogger()->debug("SHMQueue destroy");
- delete queue;
- queue = NULL;
- hashtable_t *hashtable = mm_get_hashtable();
- hashtable_remove(hashtable, KEY);
+ if(owner) {
+ delete queue;
+ hashtable_remove(hashtable, mkey);
+ }
+
}
+
+template <typename ELEM_T>
+bool SHMQueue<ELEM_T>::bind(int key, bool force) {
+
+
+ hashtable_lock(hashtable);
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force) {
+ queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(mqsize);
+ hashtable_put(hashtable, key, (void *)queue);
+ mkey = key;
+ owner = true;
+ hashtable_unlock(hashtable);
+ return true;
+ }
+
+ hashtable_unlock(hashtable);
+ return false;
+}
+
+template <typename ELEM_T>
+bool SHMQueue<ELEM_T>::attach(int key) {
+ void *tmp_ptr = hashtable_get(hashtable, key);
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
+ return false;
+ }
+ mkey = key;
+ queue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)tmp_ptr;
+ return true;
+}
+
+template <typename ELEM_T> int SHMQueue<ELEM_T>::get_key() {
+ return mkey;
+}
+
template <typename ELEM_T> uint32_t SHMQueue<ELEM_T>::size() {
return queue->size();
@@ -140,6 +163,7 @@
return queue->empty();
}
+
template <typename ELEM_T>
--
Gitblit v1.8.0