From 4deeafbd502dc3c57dab8ad6ca601a38a9e7f074 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 06 四月 2021 19:10:49 +0800
Subject: [PATCH] add uni center.
---
src/socket.cpp | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 4c2fc6b..b9def0c 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -46,23 +46,30 @@
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, const IdleCB &onIdle, int nworker)
{
- if (!mq_) {
- return false;
+ if (!mq_ || !onData) {
+ return false; // TODO error code.
}
std::lock_guard<std::mutex> lock(mutex_);
StopNoLock();
- auto RecvProc = [this, onData]() {
+ auto RecvProc = [this, onData, onIdle]() {
while (run_) {
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);
+ }
+ } else if (onIdle) {
+ onIdle(*this);
+ }
} catch (...) {
}
}
@@ -73,11 +80,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 +104,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