From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/queue/shm_queue.h | 226 ++++++++++++++++++++------------------------------------
1 files changed, 81 insertions(+), 145 deletions(-)
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 9e64992..74b9b33 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -18,34 +18,33 @@
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();
bool full();
bool empty();
- int push(const ELEM_T &a_data);
- int push_nowait(const ELEM_T &a_data);
- int push_timeout(const ELEM_T &a_data, const struct timespec *timeout);
- int pop(ELEM_T &a_data);
- int pop_nowait(ELEM_T &a_data);
- int pop_timeout(ELEM_T &a_data, struct timespec *timeout);
+ int push(const ELEM_T &a_data, const struct timespec *timeout=NULL, int flag=0);
+ int pop(ELEM_T &a_data, const struct timespec *timeout=NULL, int flag=0);
ELEM_T &operator[](unsigned i);
- // @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:
@@ -59,78 +58,62 @@
SHMQueue<ELEM_T>(const SHMQueue<ELEM_T> &a_src);
};
-// @deprecate
-template <typename ELEM_T>
-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++) {
- if (*keyItr == keys[i]) {
- found = true;
- break;
- }
- }
- 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>
-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;
-}
+SHMQueue<ELEM_T>::SHMQueue(size_t qsize): mqsize(qsize) {
-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>
-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);
+
+
}
+
+template <typename ELEM_T>
+bool SHMQueue<ELEM_T>::bind(int key, bool force) {
+
+ 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;
+ return true;
+ }
+
+ 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();
@@ -144,89 +127,42 @@
return queue->empty();
}
+
+
+
template <typename ELEM_T>
-int SHMQueue<ELEM_T>::push(const ELEM_T &a_data) {
- int rv = queue->push(a_data);
- if(rv == -1) {
- return errno;
- } else {
+int SHMQueue<ELEM_T>::push(const ELEM_T &a_data, const struct timespec *timeout, int flag) {
+
+
+ int rv = queue->push(a_data, timeout, flag);
+ if(rv == 0) {
return 0;
}
+ if(rv == ETIMEDOUT)
+ return EBUS_TIMEOUT;
+ else {
+ LoggerFactory::getLogger()->error("LockFreeQueue push_timeout: %s", bus_strerror(rv));
+ return rv;
+ }
}
+
template <typename ELEM_T>
-int SHMQueue<ELEM_T>::push_nowait(const ELEM_T &a_data) {
- int rv = queue->push(a_data, NULL, BUS_NOWAIT_FLAG);
- if(rv == -1) {
- if (errno == EAGAIN)
- return EAGAIN;
- else {
- err_msg(errno, "LockFreeQueue push_nowait");
- return errno;
- }
- }
- return 0;
-}
+int SHMQueue<ELEM_T>::pop(ELEM_T &a_data, const struct timespec *timeout, int flag) {
-template <typename ELEM_T>
-int SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data, const struct timespec *timeout) {
-
- int rv = queue->push(a_data, timeout, BUS_TIMEOUT_FLAG);
- if(rv == -1) {
- if(errno == ETIMEDOUT)
- return EBUS_TIMEOUT;
- else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue push_timeout");
- return errno;
- }
- }
- return 0;
-}
-
-template <typename ELEM_T>
-int SHMQueue<ELEM_T>::pop(ELEM_T &a_data) {
- LoggerFactory::getLogger()->debug("SHMQueue pop before\n");
- int rv = queue->pop(a_data);
-
- LoggerFactory::getLogger()->debug("SHMQueue pop before\n");
- if(rv == -1) {
-
- return errno;
- } else {
+ int rv = queue->pop(a_data, timeout, flag);
+ if(rv == 0) {
return 0;
}
-}
-template <typename ELEM_T>
-int SHMQueue<ELEM_T>::pop_nowait(ELEM_T &a_data) {
- int rv = queue->pop(a_data, NULL, BUS_NOWAIT_FLAG);
-
- if(rv == -1) {
- if (errno == EAGAIN)
- return errno;
- else {
- LoggerFactory::getLogger()->error(errno, " SHMQueue pop_nowait");
- return errno;
- }
+
+ if(rv == ETIMEDOUT)
+ return EBUS_TIMEOUT;
+ else {
+ LoggerFactory::getLogger()->error("LockFreeQueue pop_timeout: %s", bus_strerror(rv));
+ return rv;
}
- return 0;
-
-}
-
-template <typename ELEM_T>
-int SHMQueue<ELEM_T>::pop_timeout(ELEM_T &a_data, struct timespec *timeout) {
-
- int rv;
- rv = queue->pop(a_data, timeout, BUS_TIMEOUT_FLAG);
- if(rv == -1) {
- if (errno == ETIMEDOUT) {
- return EBUS_TIMEOUT;
- } else {
- LoggerFactory::getLogger()->error(errno, " SHMQueue pop_timeout");
- return errno;
- }
- }
- return 0;
+ return rv;
}
--
Gitblit v1.8.0