From 5bb28835d06e27dbd960916c9fb11a555fc5a9bc Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 26 四月 2021 14:24:29 +0800
Subject: [PATCH] add shared lib target.
---
src/socket.cpp | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index aec42b4..e471633 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -24,12 +24,7 @@
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();
@@ -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);
@@ -123,7 +118,7 @@
if (msg.ParseHead(head)) {
return true;
} else {
- msg.Release(shm());
+ msg.Release();
}
}
return false;
--
Gitblit v1.8.0