From 4c73fd7179e92bee9cccb65e46823b00f568acb3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 22 一月 2021 16:57:34 +0800
Subject: [PATCH] tmp
---
src/queue/shm_queue.h | 110 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 7d98eaa..0be124b 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -6,12 +6,14 @@
#define __SHM_QUEUE_H__
#include "hashtable.h"
-#include "lock_free_queue.h"
+
#include "logger_factory.h"
#include "sem_util.h"
#include "shm_allocator.h"
#include "usg_common.h"
-
+#include "array_lock_free_sem_queue.h"
+#include "lock_free_queue.h"
+#include "bus_error.h"
template <typename ELEM_T> class SHMQueue {
@@ -20,7 +22,7 @@
public:
/// @brief constructor of the class
- SHMQueue(int key = 0, size_t qsize = LOCK_FREE_Q_DEFAULT_SIZE);
+ SHMQueue(int key = 0, size_t qsize = 16);
~SHMQueue();
@@ -49,6 +51,7 @@
protected:
/// @brief the actual queue-> methods are forwarded into the real
/// implementation
+
LockFreeQueue<ELEM_T, SHM_Allocator> *queue;
private:
@@ -116,44 +119,17 @@
queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(qsize);
hashtable_put(hashtable, key, (void *)queue);
}
- queue->reference++;
+ // queue->reference++;
// LoggerFactory::getLogger()->debug("SHMQueue constructor reference===%d", queue->reference.load());
}
template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
- if(queue == NULL) {
- // queue宸茬粡閿�姣�
- return;
- }
-
- sem_wait(&(queue->mutex));
- queue->reference--;
- // LoggerFactory::getLogger()->debug("SHMQueue destructor reference===%d",
- if (queue->reference.load() == 0) {
- delete queue;
- queue = NULL;
- hashtable_t *hashtable = mm_get_hashtable();
- hashtable_remove(hashtable, KEY);
- // 姝ゆ椂queue宸茬粡閿�姣侊紝鏃犻渶 sem_post(&(queue->mutex))
- // printf("SHMQueue destructor delete queue\n");
- } else {
- sem_post(&(queue->mutex));
- }
-
-}
-
-template <typename ELEM_T> void SHMQueue<ELEM_T>::force_destroy() {
- if(queue == NULL) {
- // queue宸茬粡閿�姣�
- return;
- }
-
- SemUtil::dec(queue->mutex);
+ LoggerFactory::getLogger()->debug("SHMQueue destroy");
delete queue;
queue = NULL;
hashtable_t *hashtable = mm_get_hashtable();
hashtable_remove(hashtable, KEY);
- // 姝ゆ椂queue宸茬粡閿�姣侊紝鏃犻渶 SemUtil::inc(queue->mutex)
+
}
template <typename ELEM_T> inline uint32_t SHMQueue<ELEM_T>::size() {
@@ -170,36 +146,85 @@
template <typename ELEM_T>
inline int SHMQueue<ELEM_T>::push(const ELEM_T &a_data) {
- return queue->push(a_data);
+ int rv = queue->push(a_data);
+ if(rv == -1) {
+ return errno;
+ } else {
+ return 0;
+ }
}
template <typename ELEM_T>
inline int SHMQueue<ELEM_T>::push_nowait(const ELEM_T &a_data) {
- return queue->push_nowait(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;
}
template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data,
- const struct timespec *timeout) {
+inline int SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data, const struct timespec *timeout) {
- return queue->push_timeout(a_data, 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> inline int SHMQueue<ELEM_T>::pop(ELEM_T &a_data) {
// printf("SHMQueue pop before\n");
int rv = queue->pop(a_data);
// printf("SHMQueue after before\n");
- return rv;
+ if(rv == -1) {
+ return errno;
+ } else {
+ return 0;
+ }
}
template <typename ELEM_T>
inline int SHMQueue<ELEM_T>::pop_nowait(ELEM_T &a_data) {
- return queue->pop_nowait(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;
+ }
+ }
+ return 0;
+
}
template <typename ELEM_T>
inline int SHMQueue<ELEM_T>::pop_timeout(ELEM_T &a_data, struct timespec *timeout) {
- return queue->pop_timeout(a_data, 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;
+
}
template <typename ELEM_T>
@@ -207,4 +232,7 @@
return queue->operator[](i);
}
+
+
+
#endif
--
Gitblit v1.8.0