From 628c1c21ffb19d8c96ed9ce89531595f9870ab1a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 18:41:02 +0800
Subject: [PATCH] add msg tag; recv all msgs before remove mq.
---
src/socket.cpp | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 0ba195a..313c212 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -24,11 +24,6 @@
using namespace bhome_msg;
using namespace bhome_shm;
-namespace
-{
-
-} // namespace
-
ShmSocket::ShmSocket(Shm &shm, const MQId &id, const int len) :
run_(false), mq_(id, shm, len)
{
@@ -42,7 +37,7 @@
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)
@@ -52,7 +47,7 @@
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);
@@ -64,7 +59,7 @@
return false;
}
auto onMsg = [&](MsgI &imsg) {
- DEFER1(imsg.Release(shm()));
+ DEFER1(imsg.Release());
BHMsgHead head;
if (imsg.ParseHead(head)) {
onRecvWithPerMsgCB(*this, imsg, head);
@@ -115,7 +110,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);
@@ -123,7 +118,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0