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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index e1429eb..4c55f7b 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -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;
@@ -345,7 +345,7 @@
{
// LoggerFactory::getLogger()->debug("=================ts sec = %d, nsec = %ld \n", ts->tv_sec, ts->tv_nsec );
- // struct timespec timeout_tmp = {1, 0};
+ 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 );
@@ -355,7 +355,7 @@
else if(errno == EINTR)
continue;
else {
- // LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout %d", errno);
+ LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout %d", errno);
return errno;
}
}
--
Gitblit v1.8.0