From c338820e4db43ad32c20ff429a038b06bcb980f8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 08 四月 2021 18:13:25 +0800
Subject: [PATCH] BIG change, join center,bus; now msg is head+body.
---
src/socket.cpp | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index b9def0c..f2b29f4 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -29,43 +29,53 @@
} // namespace
-ShmSocket::ShmSocket(Shm &shm, const void *id, const int len) :
- shm_(shm), run_(false)
+ShmSocket::ShmSocket(Shm &shm, const MQId &id, const int len) :
+ shm_(shm), run_(false), mq_(id, shm, len)
{
- if (id && len > 0) {
- mq_.reset(new Queue(*static_cast<const MQId *>(id), shm, len));
- }
}
ShmSocket::ShmSocket(bhome_shm::SharedMemory &shm, const int len) :
- shm_(shm), run_(false)
-{
- if (len > 0) {
- mq_.reset(new Queue(shm_, len));
- }
-}
+ shm_(shm), run_(false), mq_(shm, len) {}
ShmSocket::~ShmSocket()
{
Stop(); //TODO should stop in sub class, incase thread access sub class data.
}
-bool ShmSocket::Start(const RecvCB &onData, const IdleCB &onIdle, int nworker)
+bool ShmSocket::Start(int nworker, const RecvCB &onData, const IdleCB &onIdle)
{
- if (!mq_ || !onData) {
- return false; // TODO error code.
- }
+ auto onRecv = [this, onData](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
+ auto Find = [&](RecvCB &cb) {
+ std::lock_guard<std::mutex> lock(mutex());
+ const std::string &msgid = head.msg_id();
+ auto pos = async_cbs_.find(msgid);
+ if (pos != async_cbs_.end()) {
+ cb.swap(pos->second);
+ async_cbs_.erase(pos);
+ return true;
+ } else {
+ return false;
+ }
+ };
+
+ RecvCB cb;
+ if (Find(cb)) {
+ cb(socket, imsg, head);
+ } else if (onData) {
+ onData(socket, imsg, head);
+ } // else ignored, or dropped
+ };
std::lock_guard<std::mutex> lock(mutex_);
StopNoLock();
- auto RecvProc = [this, onData, onIdle]() {
+ auto RecvProc = [this, onRecv, onIdle]() {
while (run_) {
try {
MsgI imsg;
- DEFER1(imsg.Release(shm_));
- if (mq_->Recv(imsg, 100)) {
- BHMsg msg;
- if (imsg.Unpack(msg)) {
- onData(*this, imsg, msg);
+ if (mq().Recv(imsg, 10)) {
+ DEFER1(imsg.Release(shm()));
+ BHMsgHead head;
+ if (imsg.ParseHead(head)) {
+ onRecv(*this, imsg, head);
}
} else if (onIdle) {
onIdle(*this);
@@ -102,17 +112,18 @@
return false;
}
-bool ShmSocket::SyncSend(const void *id, const bhome_msg::BHMsg &msg, const int timeout_ms)
-{
- return mq_->Send(*static_cast<const MQId *>(id), msg, timeout_ms);
-}
-
-bool ShmSocket::SyncRecv(bhome_msg::BHMsg &msg, 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_);
- if (!mq_ || RunningNoLock()) {
+ auto Recv = [&]() {
+ if (mq().Recv(msg, timeout_ms)) {
+ if (msg.ParseHead(head)) {
+ return true;
+ } else {
+ msg.Release(shm());
+ }
+ }
return false;
- } else {
- return mq_->Recv(msg, timeout_ms);
- }
+ };
+ return !RunningNoLock() && Recv();
}
--
Gitblit v1.8.0