From 83085f2ce99cca05d40a19482151873a55e6393a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 02 四月 2021 19:32:21 +0800
Subject: [PATCH] refactor center; add async request no cb.
---
src/socket.cpp | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 4c2fc6b..73681f1 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -46,10 +46,10 @@
ShmSocket::~ShmSocket()
{
- Stop();
+ Stop(); //TODO should stop in sub class, incase thread access sub class data.
}
-bool ShmSocket::StartRaw(const RecvRawCB &onData, int nworker)
+bool ShmSocket::Start(const RecvCB &onData, int nworker)
{
if (!mq_) {
return false;
@@ -62,7 +62,12 @@
try {
MsgI imsg;
DEFER1(imsg.Release(shm_));
- if (mq_->Recv(imsg, 100)) { onData(imsg); }
+ if (mq_->Recv(imsg, 100)) {
+ BHMsg msg;
+ if (imsg.Unpack(msg)) {
+ onData(*this, imsg, msg);
+ }
+ }
} catch (...) {
}
}
@@ -73,11 +78,6 @@
workers_.emplace_back(RecvProc);
}
return true;
-}
-
-bool ShmSocket::Start(const RecvCB &onData, int nworker)
-{
- return StartRaw([this, onData](MsgI &imsg) { BHMsg m; if (imsg.Unpack(m)) { onData(m); } }, nworker);
}
bool ShmSocket::Stop()
@@ -102,12 +102,7 @@
bool ShmSocket::SyncSend(const void *id, const bhome_msg::BHMsg &msg, const int timeout_ms)
{
- std::lock_guard<std::mutex> lock(mutex_);
- if (!mq_ || RunningNoLock()) {
- return false;
- } else {
- return mq_->Send(*static_cast<const MQId *>(id), msg, timeout_ms);
- }
+ return mq_->Send(*static_cast<const MQId *>(id), msg, timeout_ms);
}
bool ShmSocket::SyncRecv(bhome_msg::BHMsg &msg, const int timeout_ms)
--
Gitblit v1.8.0