From 58e3540930d290b315fd24d0414c8feeb7bc8bc1 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期日, 25 四月 2021 10:15:43 +0800
Subject: [PATCH] query topic add dest param.
---
src/socket.cpp | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index b7ef4f3..313c212 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) :
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,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);
@@ -111,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);
@@ -119,7 +118,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0