From 2de7ebf4516e58a8fa959977a51dccd22823c0e0 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 06 五月 2021 18:58:35 +0800
Subject: [PATCH] fix node recursive lock.
---
src/socket.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index c664982..9580529 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();
@@ -38,6 +38,44 @@
ShmSocket::~ShmSocket()
{
Stop();
+}
+
+bool ShmSocket::Start(const RawRecvCB &onData, const IdleCB &onIdle, int nworker)
+{
+ auto ioProc = [this, onData, onIdle]() {
+ auto DoSend = [this]() { return send_buffer_.TrySend(mq()); };
+ auto DoRecv = [=] {
+ // do not recv if no cb is set.
+ if (!onData) {
+ return false;
+ }
+ auto onMsg = [&](MsgI &imsg) {
+ DEFER1(imsg.Release());
+ onData(*this, imsg);
+ };
+ MsgI imsg;
+ return mq().TryRecv(imsg) ? (onMsg(imsg), true) : false;
+ };
+
+ try {
+ bool more_to_send = DoSend();
+ bool more_to_recv = DoRecv();
+ if (onIdle) { onIdle(*this); }
+ if (!more_to_send && !more_to_recv) {
+ robust::QuickSleep();
+ }
+ } catch (...) {
+ }
+ };
+
+ std::lock_guard<std::mutex> lock(mutex_);
+ StopNoLock();
+
+ run_.store(true);
+ for (int i = 0; i < nworker; ++i) {
+ workers_.emplace_back([this, ioProc]() { while (run_) { ioProc(); } });
+ }
+ return true;
}
bool ShmSocket::Start(int nworker, const RecvCB &onData, const IdleCB &onIdle)
@@ -59,13 +97,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 {
@@ -73,7 +112,7 @@
bool more_to_recv = DoRecv();
if (onIdle) { onIdle(*this); }
if (!more_to_send && !more_to_recv) {
- std::this_thread::yield();
+ robust::QuickSleep();
}
} catch (...) {
}
@@ -118,7 +157,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0