From 458d0f0511acdf181671f13c2b6967d9d95b9316 Mon Sep 17 00:00:00 2001
From: shenxin <shenxin@basic.com>
Date: 星期六, 21 八月 2021 21:54:57 +0800
Subject: [PATCH] add lichao's interface
---
src/queue/lock_free_queue.h | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index d66ee8c..f536208 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -6,7 +6,7 @@
#include <usg_common.h>
#include <assert.h> // assert()
-#include "mem_pool.h"
+#include "shm_mm.h"
#include "sem_util.h"
#include "logger_factory.h"
#include "shm_allocator.h"
@@ -102,6 +102,7 @@
~LockFreeQueue();
inline void close();
+ inline bool isClosed();
// std::atomic_uint reference;
/// @brief constructor of the class
@@ -176,7 +177,6 @@
typename Allocator,
template<typename T, typename AT> class Q_TYPE>
LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::LockFreeQueue(size_t qsize): m_qImpl(qsize) {
- // std::cout << "LockFreeQueue init reference=" << reference << std::endl;
if (sem_init(&slots, 1, qsize) == -1)
err_exit(errno, "LockFreeQueue sem_init");
if (sem_init(&items, 1, 0) == -1)
@@ -197,13 +197,20 @@
closeTime = time(NULL);
}
+template<
+ typename ELEM_T,
+ typename Allocator,
+ template<typename T, typename AT> class Q_TYPE>
+inline bool LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::isClosed() {
+ return status == LOCK_FREE_Q_ST_CLOSED;
+}
+
template<
typename ELEM_T,
typename Allocator,
template<typename T, typename AT> class Q_TYPE>
LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::~LockFreeQueue() {
- // LoggerFactory::getLogger()->debug("LockFreeQueue desctroy");
if (sem_destroy(&slots) == -1) {
err_exit(errno, "LockFreeQueue sem_destroy");
}
@@ -242,7 +249,6 @@
typename Allocator,
template<typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push(const ELEM_T &a_data, const struct timespec *timeout, int flag) {
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue push before\n");
// sigset_t mask_all, pre;
// sigfillset(&mask_all);
@@ -266,7 +272,6 @@
if (m_qImpl.push(a_data)) {
psem_post(&items);
// sigprocmask(SIG_SETMASK, &pre, NULL);
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue push after\n");
return 0;
}
@@ -279,7 +284,6 @@
typename Allocator,
template<typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop(ELEM_T &a_data, const struct timespec *timeout, int flag) {
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before....");
// sigset_t mask_all, pre;
// sigfillset(&mask_all);
@@ -291,8 +295,7 @@
goto LABEL_FAILTURE;
}
} else if ((flag & BUS_TIMEOUT_FLAG) == BUS_TIMEOUT_FLAG && timeout != NULL) {
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before. flag=%d , %d\n", flag, timeout->tv_sec);
- if (psem_timedwait(&items, timeout) == -1) {
+ if (psem_timedwait(&items, timeout) == -1) {
goto LABEL_FAILTURE;
}
} else {
@@ -304,7 +307,6 @@
if (m_qImpl.pop(a_data)) {
psem_post(&slots);
// sigprocmask(SIG_SETMASK, &pre, NULL);
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop after\n");
return 0;
}
--
Gitblit v1.8.0