From a6f67b4249525089fb97eb9418c7014f66c2a000 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 28 四月 2021 19:29:17 +0800
Subject: [PATCH] use new robust mutex, circurar; rm timeout mutex.
---
src/socket.cpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index c664982..2127260 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -24,7 +24,7 @@
using namespace bhome_msg;
using namespace bhome_shm;
-ShmSocket::ShmSocket(Shm &shm, const MQId &id, const int len) :
+ShmSocket::ShmSocket(Shm &shm, const MQId id, const int len) :
run_(false), mq_(id, shm, len)
{
Start();
@@ -59,13 +59,14 @@
return false;
}
auto onMsg = [&](MsgI &imsg) {
- DEFER1(imsg.Release(shm()));
+ DEFER1(imsg.Release());
BHMsgHead head;
if (imsg.ParseHead(head)) {
onRecvWithPerMsgCB(*this, imsg, head);
}
};
- return mq().TryRecvAll(onMsg) > 0; // this will recv all msgs.
+ MsgI imsg;
+ return mq().TryRecv(imsg) ? (onMsg(imsg), true) : false;
};
try {
@@ -74,6 +75,8 @@
if (onIdle) { onIdle(*this); }
if (!more_to_send && !more_to_recv) {
std::this_thread::yield();
+ using namespace std::chrono_literals;
+ std::this_thread::sleep_for(10000ns);
}
} catch (...) {
}
@@ -118,7 +121,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0