From 2c65db46500207f8445aa4baa53bfbb6602e0e18 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 21 一月 2021 16:37:03 +0800
Subject: [PATCH] restructure
---
src/queue/lock_free_queue.h | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index b7dfd9f..01e597c 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -221,8 +221,7 @@
{
LoggerFactory::getLogger()->debug("==================LockFreeQueue push before\n");
if (psem_wait(&slots) == -1) {
- err_msg(errno, "LockFreeQueue push");
- return errno;
+ return -1;
}
if ( m_qImpl.push(a_data) ) {
@@ -241,13 +240,7 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push_nowait(const ELEM_T &a_data)
{
if (psem_trywait(&slots) == -1) {
- if (errno == EAGAIN)
- return EAGAIN;
- else {
- err_msg(errno, "LockFreeQueue push_nowait");
- return errno;
- }
-
+ return -1;
}
if ( m_qImpl.push(a_data)) {
@@ -265,15 +258,8 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push_timeout(const ELEM_T &a_data, const struct timespec * ts)
{
LoggerFactory::getLogger()->debug("==================LockFreeQueue push_timeout before\n");
- int rv;
if ( psem_timedwait(&slots, ts) == -1) {
-
- if(errno == ETIMEDOUT)
- return EBUS_TIMEOUT;
- else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue push_timeout");
- return errno;
- }
+ return -1;
}
if (m_qImpl.push(a_data)){
@@ -297,8 +283,7 @@
LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before\n");
if (psem_wait(&items) == -1) {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop");
- return errno;
+ return -1;
}
if (m_qImpl.pop(a_data)) {
@@ -316,12 +301,7 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop_nowait(ELEM_T &a_data)
{
if (psem_trywait(&items) == -1) {
- if (errno == EAGAIN)
- return errno;
- else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_nowait");
- return errno;
- }
+ return -1;
}
if (m_qImpl.pop(a_data)) {
@@ -339,14 +319,7 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop_timeout(ELEM_T &a_data, struct timespec * ts)
{
if (psem_timedwait(&items, ts) == -1) {
- if (errno == ETIMEDOUT) {
- return EBUS_TIMEOUT;
- }
-
- else {
- LoggerFactory::getLogger()->error(errno, "3 LockFreeQueue pop_timeout %d", errno);
- return errno;
- }
+ return -1;
}
if (m_qImpl.pop(a_data)) {
--
Gitblit v1.8.0