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 |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 6554b9a..31f2cc1 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -6,15 +6,21 @@
 
 #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"
 #include "psem.h"
 #include "bus_error.h"
 #include "bus_def.h"
+
 // 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
@@ -82,9 +88,11 @@
   sem_t slots;
   sem_t items;
 
+  // time_t createTime;
+  // time_t closeTime;
+  // int status;
 
 public:
-  sem_t mutex;
 
   LockFreeQueue(size_t qsize = LOCK_FREE_Q_DEFAULT_SIZE);
 
@@ -93,7 +101,9 @@
   /// template
   ~LockFreeQueue();
 
-  std::atomic_uint reference;
+  // inline void  close();
+
+  // std::atomic_uint reference;
   /// @brief constructor of the class
 
 
@@ -116,6 +126,20 @@
   inline bool empty();
 
   inline ELEM_T &operator[](unsigned i);
+
+  
+
+  // 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
@@ -151,17 +175,27 @@
   typename ELEM_T,
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
-LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::LockFreeQueue(size_t qsize): reference(0), m_qImpl(qsize) {
+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)
     err_exit(errno, "LockFreeQueue sem_init");
-  if (sem_init(&mutex, 1, 1) == -1)
-    err_exit(errno, "LockFreeQueue sem_init");
-
+  
+  // 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<
@@ -176,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<
@@ -269,13 +301,13 @@
     }
   }
 
-
   if (m_qImpl.pop(a_data)) {
     psem_post(&slots);
     // sigprocmask(SIG_SETMASK, &pre, NULL);
     // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop after\n");
     return 0;
   }
+
 
   LABEL_FAILTURE:
   // sigprocmask(SIG_SETMASK, &pre, NULL);
@@ -301,7 +333,8 @@
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
 void LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::operator delete(void *p) {
-  return Allocator::deallocate(p);
+  LockFreeQueue<ELEM_T, Allocator, Q_TYPE> * _que =  (LockFreeQueue<ELEM_T, Allocator, Q_TYPE> * )p;
+  Allocator::deallocate(p);
 }
 
 // include implementation files

--
Gitblit v1.8.0