From 42d1c7ef91627d5ac920c8fa35573970ac1bd2d5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 15 一月 2021 16:27:55 +0800
Subject: [PATCH] Merge branch 'dev' into rdma
---
src/queue/shm_queue.h | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 8a23da1..64d4600 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -28,13 +28,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);
@@ -167,23 +166,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 +190,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