From 124011574583b980c1794a1de4e61b39f73f1f11 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 14 一月 2021 16:44:49 +0800
Subject: [PATCH] Merge branch 'dev' into rdma
---
src/queue/lock_free_queue.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 3914b85..4c55f7b 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -262,12 +262,12 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push_timeout(const ELEM_T &a_data, const struct timespec * ts)
{
-
+ 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) {
+ 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);
@@ -300,7 +300,7 @@
int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop(ELEM_T &a_data)
{
-// LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before\n");
+ // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before\n");
if (sem_wait(&items) == -1) {
LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop");
return errno;
@@ -343,9 +343,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");
+// LoggerFactory::getLogger()->debug("=================ts sec = %d, nsec = %ld \n", ts->tv_sec, ts->tv_nsec );
+ LoggerFactory::getLogger()->debug("==================LockFreeQueue pop_timeout before\n");
struct timespec timeout = PXSemUtil::calc_sem_timeout(ts);
+// LoggerFactory::getLogger()->debug("================== timeout before sec = %d, nsec = %ld \n", timeout.tv_sec, timeout.tv_nsec );
while (sem_timedwait(&items, &timeout) == -1) {
if (errno == ETIMEDOUT)
@@ -353,8 +355,8 @@
else if(errno == EINTR)
continue;
else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout");
- return -1;
+ LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout %d", errno);
+ return errno;
}
}
--
Gitblit v1.8.0