From 87b5445e2a08a18bbbe1e0ce63d5f65e81bfb79f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 15:09:30 +0800
Subject: [PATCH] update

---
 src/queue/shm_queue.h |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 5c82b05..7d98eaa 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -1,3 +1,7 @@
+/**
+ * encapsulate lock_free_queue, populate in userspace
+ */
+
 #ifndef __SHM_QUEUE_H__
 #define __SHM_QUEUE_H__
 
@@ -7,8 +11,7 @@
 #include "sem_util.h"
 #include "shm_allocator.h"
 #include "usg_common.h"
-// default Queue size
-// #define LOCK_FREE_Q_DEFAULT_SIZE 16
+
 
 template <typename ELEM_T> class SHMQueue {
 
@@ -28,13 +31,12 @@
   inline bool full();
   inline bool empty();
 
-  inline bool push(const ELEM_T &a_data);
-  inline bool push_nowait(const ELEM_T &a_data);
-  inline bool push_timeout(const ELEM_T &a_data,
-                           const struct timespec *timeout);
-  inline bool pop(ELEM_T &a_data);
-  inline bool pop_nowait(ELEM_T &a_data);
-  inline bool pop_timeout(ELEM_T &a_data, struct timespec *timeout);
+  inline int push(const ELEM_T &a_data);
+  inline int push_nowait(const ELEM_T &a_data);
+  inline int push_timeout(const ELEM_T &a_data, const struct timespec *timeout);
+  inline int pop(ELEM_T &a_data);
+  inline int pop_nowait(ELEM_T &a_data);
+  inline int pop_timeout(ELEM_T &a_data, struct timespec *timeout);
 
   inline ELEM_T &operator[](unsigned i);
 
@@ -115,7 +117,7 @@
     hashtable_put(hashtable, key, (void *)queue);
   }
   queue->reference++;
-  LoggerFactory::getLogger().debug("SHMQueue constructor reference===%d", queue->reference.load());
+  // LoggerFactory::getLogger()->debug("SHMQueue constructor reference===%d", queue->reference.load());
 }
 
 template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
@@ -124,18 +126,18 @@
     return;
   }
 
-  SemUtil::dec(queue->mutex);
+  sem_wait(&(queue->mutex));
   queue->reference--;
-  // LoggerFactory::getLogger().debug("SHMQueue destructor  reference===%d",
+  // 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宸茬粡閿�姣侊紝鏃犻渶 SemUtil::inc(queue->mutex)
+      // 姝ゆ椂queue宸茬粡閿�姣侊紝鏃犻渶  sem_post(&(queue->mutex))
       // printf("SHMQueue destructor delete queue\n");
   } else {
-      SemUtil::inc(queue->mutex);
+      sem_post(&(queue->mutex));
   }
   
 }
@@ -167,23 +169,23 @@
 }
 
 template <typename ELEM_T>
-inline bool SHMQueue<ELEM_T>::push(const ELEM_T &a_data) {
+inline int SHMQueue<ELEM_T>::push(const ELEM_T &a_data) {
   return queue->push(a_data);
 }
 
 template <typename ELEM_T>
-inline bool SHMQueue<ELEM_T>::push_nowait(const ELEM_T &a_data) {
+inline int SHMQueue<ELEM_T>::push_nowait(const ELEM_T &a_data) {
   return queue->push_nowait(a_data);
 }
 
 template <typename ELEM_T>
-inline bool SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data,
+inline int SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data,
                                            const struct timespec *timeout) {
 
   return queue->push_timeout(a_data, timeout);
 }
 
-template <typename ELEM_T> inline bool SHMQueue<ELEM_T>::pop(ELEM_T &a_data) {
+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");
@@ -191,13 +193,12 @@
 }
 
 template <typename ELEM_T>
-inline bool SHMQueue<ELEM_T>::pop_nowait(ELEM_T &a_data) {
+inline int SHMQueue<ELEM_T>::pop_nowait(ELEM_T &a_data) {
   return queue->pop_nowait(a_data);
 }
 
 template <typename ELEM_T>
-inline bool SHMQueue<ELEM_T>::pop_timeout(ELEM_T &a_data,
-                                          struct timespec *timeout) {
+inline int SHMQueue<ELEM_T>::pop_timeout(ELEM_T &a_data, struct timespec *timeout) {
   return queue->pop_timeout(a_data, timeout);
 }
 

--
Gitblit v1.8.0