From c46be6db32872bfd7c4010b43526b5e6bc0fa6a5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 14:04:59 +0800
Subject: [PATCH] update

---
 src/queue/shm_queue.h |  116 ++++++++++++++++-----------------------------------------
 1 files changed, 33 insertions(+), 83 deletions(-)

diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 0be124b..72c9689 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -28,19 +28,15 @@
 
   void force_destroy();
 
-  inline uint32_t size();
+  uint32_t size();
 
-  inline bool full();
-  inline bool empty();
+  bool full();
+  bool empty();
 
-  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);
+  int push(const ELEM_T &a_data, const struct timespec *timeout=NULL, int flag=0);
+  int pop(ELEM_T &a_data, const struct timespec *timeout=NULL, int flag=0);
 
-  inline ELEM_T &operator[](unsigned i);
+  ELEM_T &operator[](unsigned i);
 
  // @deprecate
   static size_t remove_queues_exclude(int keys[], size_t length);
@@ -132,103 +128,57 @@
   
 }
 
-template <typename ELEM_T> inline uint32_t SHMQueue<ELEM_T>::size() {
+template <typename ELEM_T> uint32_t SHMQueue<ELEM_T>::size() {
   return queue->size();
 }
 
-template <typename ELEM_T> inline bool SHMQueue<ELEM_T>::full() {
+template <typename ELEM_T> bool SHMQueue<ELEM_T>::full() {
   return queue->full();
 }
 
-template <typename ELEM_T> inline bool SHMQueue<ELEM_T>::empty() {
+template <typename ELEM_T> bool SHMQueue<ELEM_T>::empty() {
   return queue->empty();
 }
 
+ 
+
 template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::push(const ELEM_T &a_data) {
-  int rv = queue->push(a_data);
-  if(rv == -1) {
-    return errno;
-  } else {
+int SHMQueue<ELEM_T>::push(const ELEM_T &a_data, const struct timespec *timeout, int flag) {
+
+ 
+  int rv = queue->push(a_data, timeout, flag);
+  if(rv == 0) {
     return 0;
   }
+  if(rv == ETIMEDOUT)
+    return EBUS_TIMEOUT;
+  else {
+    LoggerFactory::getLogger()->error("LockFreeQueue push_timeout: %s", bus_strerror(rv));
+    return rv;
+  }
 }
+
 
 template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::push_nowait(const ELEM_T &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;
-}
+int SHMQueue<ELEM_T>::pop(ELEM_T &a_data, const struct timespec *timeout, int flag) {
 
-template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::push_timeout(const ELEM_T &a_data, const struct timespec *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");
-  if(rv == -1) {
-    return errno;
-  } else {
+  int rv = queue->pop(a_data, timeout, flag);
+  if(rv == 0) {
     return 0;
   }
-}
 
-template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::pop_nowait(ELEM_T &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;
-    }
+  if(rv == ETIMEDOUT)
+    return EBUS_TIMEOUT;
+  else {
+    LoggerFactory::getLogger()->error("LockFreeQueue pop_timeout: %s", bus_strerror(rv));
+    return rv;
   }
-  return 0;
+  return rv;
   
 }
 
 template <typename ELEM_T>
-inline int SHMQueue<ELEM_T>::pop_timeout(ELEM_T &a_data, struct timespec *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>
-inline ELEM_T &SHMQueue<ELEM_T>::operator[](unsigned i) {
+ELEM_T &SHMQueue<ELEM_T>::operator[](unsigned i) {
   return queue->operator[](i);
 }
 

--
Gitblit v1.8.0