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 | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index b7ef4f3..2127260 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -24,31 +24,30 @@
using namespace bhome_msg;
using namespace bhome_shm;
-namespace
-{
-
-} // namespace
-
-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();
}
ShmSocket::ShmSocket(bhome_shm::SharedMemory &shm, const int len) :
- run_(false), mq_(shm, len) {}
+ run_(false), mq_(shm, len)
+{
+ Start();
+}
ShmSocket::~ShmSocket()
{
- Stop(); //TODO should stop in sub class, incase thread access sub class data.
+ Stop();
}
bool ShmSocket::Start(int nworker, const RecvCB &onData, const IdleCB &onIdle)
{
auto ioProc = [this, onData, onIdle]() {
- auto DoSend = [this]() { return send_buffer_->TrySend(mq()); };
+ auto DoSend = [this]() { return send_buffer_.TrySend(mq()); };
auto DoRecv = [=] {
auto onRecvWithPerMsgCB = [this, onData](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
RecvCB cb;
- if (per_msg_cbs_->Find(head.msg_id(), cb)) {
+ if (per_msg_cbs_->Pick(head.msg_id(), cb)) {
cb(socket, imsg, head);
} else if (onData) {
onData(socket, imsg, head);
@@ -60,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 {
@@ -75,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 (...) {
}
@@ -111,7 +113,7 @@
}
//maybe reimplment, using async cbs?
-bool ShmSocket::SyncRecv(bhome_msg::MsgI &msg, bhome::msg::BHMsgHead &head, const int timeout_ms)
+bool ShmSocket::SyncRecv(bhome_msg::MsgI &msg, bhome_msg::BHMsgHead &head, const int timeout_ms)
{
// std::lock_guard<std::mutex> lock(mutex_); // seems no need to lock mutex_.
bool got = (timeout_ms == 0) ? mq().TryRecv(msg) : mq().Recv(msg, timeout_ms);
@@ -119,7 +121,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0