From 4fd62552d8277f3d0ed20e66663cd219c36796df Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 21 一月 2021 11:20:22 +0800
Subject: [PATCH] update
---
src/queue/lock_free_queue.h | 55 ++++++++++++++++++++-----------------------------------
1 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 924537f..b7dfd9f 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -10,7 +10,7 @@
#include "sem_util.h"
#include "logger_factory.h"
#include "shm_allocator.h"
-#include "px_sem_util.h"
+#include "psem.h"
#include "bus_error.h"
// default Queue size
@@ -219,15 +219,15 @@
template <typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push(const ELEM_T &a_data)
{
-// LoggerFactory::getLogger()->debug("==================LockFreeQueue push before\n");
- if (sem_wait(&slots) == -1) {
+ LoggerFactory::getLogger()->debug("==================LockFreeQueue push before\n");
+ if (psem_wait(&slots) == -1) {
err_msg(errno, "LockFreeQueue push");
return errno;
}
if ( m_qImpl.push(a_data) ) {
- sem_post(&items);
-// LoggerFactory::getLogger()->debug("==================LockFreeQueue push after\n");
+ psem_post(&items);
+LoggerFactory::getLogger()->debug("==================LockFreeQueue push after\n");
return 0;
}
return -1;
@@ -240,7 +240,7 @@
template <typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push_nowait(const ELEM_T &a_data)
{
- if (sem_trywait(&slots) == -1) {
+ if (psem_trywait(&slots) == -1) {
if (errno == EAGAIN)
return EAGAIN;
else {
@@ -251,7 +251,7 @@
}
if ( m_qImpl.push(a_data)) {
- sem_post(&items);
+ psem_post(&items);
return 0;
}
return -1;
@@ -264,20 +264,12 @@
template <typename T, typename AT> class Q_TYPE>
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;
- struct timespec timeout = PXSemUtil::calc_sem_timeout(ts);
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue push_timeout before tv_sec=%d, tv_nsec=%ld",
- // timeout.tv_sec, timeout.tv_nsec);
-
- while ( sem_timedwait(&slots, &timeout) == -1) {
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue push_timeout before tv_sec=%d, tv_nsec=%ld, ETIMEDOUT=%d, errno=%d\n",
- // timeout.tv_sec, timeout.tv_nsec, ETIMEDOUT, errno);
+ if ( psem_timedwait(&slots, ts) == -1) {
if(errno == ETIMEDOUT)
return EBUS_TIMEOUT;
- else if(errno == EINTR)
- continue;
else {
LoggerFactory::getLogger()->error(errno, "LockFreeQueue push_timeout");
return errno;
@@ -285,8 +277,8 @@
}
if (m_qImpl.push(a_data)){
- sem_post(&items);
-// LoggerFactory::getLogger()->debug("==================LockFreeQueue push_timeout after\n");
+ psem_post(&items);
+LoggerFactory::getLogger()->debug("==================LockFreeQueue push_timeout after\n");
return 0;
}
return -1;
@@ -303,15 +295,15 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop(ELEM_T &a_data)
{
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before\n");
- if (sem_wait(&items) == -1) {
+ LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before\n");
+ if (psem_wait(&items) == -1) {
LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop");
return errno;
}
if (m_qImpl.pop(a_data)) {
- sem_post(&slots);
-// LoggerFactory::getLogger()->debug("==================LockFreeQueue pop after\n");
+ psem_post(&slots);
+ LoggerFactory::getLogger()->debug("==================LockFreeQueue pop after\n");
return 0;
}
return -1;
@@ -323,7 +315,7 @@
template <typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop_nowait(ELEM_T &a_data)
{
- if (sem_trywait(&items) == -1) {
+ if (psem_trywait(&items) == -1) {
if (errno == EAGAIN)
return errno;
else {
@@ -333,7 +325,7 @@
}
if (m_qImpl.pop(a_data)) {
- sem_post(&slots);
+ psem_post(&slots);
return 0;
}
return -1;
@@ -346,18 +338,11 @@
template <typename T, typename AT> class Q_TYPE>
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop_timeout(ELEM_T &a_data, struct timespec * ts)
{
-
- // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop_timeout before\n");
- struct timespec timeout = PXSemUtil::calc_sem_timeout(ts);
-
- while (sem_timedwait(&items, &timeout) == -1) {
- // LoggerFactory::getLogger()->error(errno, "1 LockFreeQueue pop_timeout %d %d", errno, ETIMEDOUT);
+ if (psem_timedwait(&items, ts) == -1) {
if (errno == ETIMEDOUT) {
- // LoggerFactory::getLogger()->error(errno, "2 LockFreeQueue pop_timeout %d %d", errno, EBUS_TIMEOUT);
return EBUS_TIMEOUT;
}
- else if(errno == EINTR)
- continue;
+
else {
LoggerFactory::getLogger()->error(errno, "3 LockFreeQueue pop_timeout %d", errno);
return errno;
@@ -365,7 +350,7 @@
}
if (m_qImpl.pop(a_data)) {
- sem_post(&slots);
+ psem_post(&slots);
// LoggerFactory::getLogger()->debug("==================LockFreeQueue pop_timeout after\n");
return 0;
}
--
Gitblit v1.8.0