From a38304f7f6b91aaa1b0aa76cc9d3e5b6aef1f85f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 13 三月 2021 17:07:22 +0800
Subject: [PATCH] update
---
src/queue/lock_free_queue.h | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 425d9f8..31f2cc1 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"
@@ -16,6 +16,11 @@
// default Queue size
#define LOCK_FREE_Q_DEFAULT_SIZE 16
+
+
+#define LOCK_FREE_Q_ST_OPENED 0
+
+#define LOCK_FREE_Q_ST_CLOSED 1
// static Logger *logger = LoggerFactory::getLogger();
// define this macro if calls to "size" must return the real size of the
@@ -83,11 +88,11 @@
sem_t slots;
sem_t items;
- time_t createTime;
+ // time_t createTime;
+ // time_t closeTime;
+ // int status;
public:
- // sem_t mutex;
-
LockFreeQueue(size_t qsize = LOCK_FREE_Q_DEFAULT_SIZE);
@@ -95,6 +100,8 @@
/// Note it is not virtual since it is not expected to inherit from this
/// template
~LockFreeQueue();
+
+ // inline void close();
// std::atomic_uint reference;
/// @brief constructor of the class
@@ -120,9 +127,19 @@
inline ELEM_T &operator[](unsigned i);
- time_t getCreateTime() {
- return createTime;
- }
+
+
+ // time_t getCreateTime() {
+ // return createTime;
+ // }
+
+ // time_t getCloseTime() {
+ // return closeTime;
+ // }
+
+ // int getStatus() {
+ // return status;
+ // }
/// @brief push an element at the tail of the queue
/// @param the element to insert in the queue
@@ -165,9 +182,20 @@
if (sem_init(&items, 1, 0) == -1)
err_exit(errno, "LockFreeQueue sem_init");
- createTime = time(NULL);
+ // createTime = time(NULL);
+ // status = LOCK_FREE_Q_ST_OPENED;
}
+
+
+// template<
+// typename ELEM_T,
+// typename Allocator,
+// template<typename T, typename AT> class Q_TYPE>
+// inline void LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::close() {
+// // status = LOCK_FREE_Q_ST_CLOSED;
+// // closeTime = time(NULL);
+// }
template<
@@ -182,9 +210,7 @@
if (sem_destroy(&items) == -1) {
err_exit(errno, "LockFreeQueue sem_destroy");
}
- // if (sem_destroy(&mutex) == -1) {
- // err_exit(errno, "LockFreeQueue sem_destroy");
- // }
+
}
template<
--
Gitblit v1.8.0