From 2e99e5311d1b9a53cca17008452cbe49e2af7234 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 31 三月 2021 14:05:09 +0800
Subject: [PATCH] add bus socket for manager; refactor.
---
src/socket.cpp | 104 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 21928b8..5eb6756 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -20,58 +20,30 @@
#include "bh_util.h"
#include "defs.h"
#include "msg.h"
-#include <chrono>
using namespace bhome_msg;
using namespace bhome_shm;
-using namespace std::chrono_literals;
namespace
{
-
-int GetSocketDefaultLen(ShmSocket::Type type)
-{
- switch (type) {
- case ShmSocket::eSockRequest: return 12;
- case ShmSocket::eSockReply: return 64;
- case ShmSocket::eSockPublish: return 0;
- case ShmSocket::eSockSubscribe: return 64;
- default: return 0;
- }
-}
} // namespace
ShmSocket::ShmSocket(Type type, bhome_shm::SharedMemory &shm) :
shm_(shm), type_(type), run_(false)
{
- int len = GetSocketDefaultLen(type);
- if (len != 0) {
- mq_.reset(new Queue(shm_, len));
-
- auto RecvProc = [this]() {
- while (run_) {
- try {
- std::unique_lock<std::mutex> lk(mutex_);
- if (cv_recv_cb_.wait_for(lk, 100ms, [this]() { return HasRecvCB(); })) {
- BHMsg msg;
- if (mq_->Recv(msg, 100)) {
- this->onRecv_(msg);
- }
- }
- } catch (...) {
- }
- }
- };
- run_.store(true);
- workers_.emplace_back(RecvProc);
+ switch (type) {
+ case eSockBus: mq_.reset(new Queue(kBHBusQueueId, shm_, 1000)); break;
+ case eSockRequest: mq_.reset(new Queue(shm_, 12)); break;
+ case eSockReply: mq_.reset(new Queue(shm_, 64)); break;
+ case eSockSubscribe: mq_.reset(new Queue(shm_, 64)); break;
+ case eSockPublish: break; // no recv mq needed
+ default: break;
}
}
ShmSocket::ShmSocket(Type type) :
- ShmSocket(type, BHomeShm())
-{
-}
+ ShmSocket(type, BHomeShm()) {}
ShmSocket::~ShmSocket()
{
@@ -110,25 +82,63 @@
}
}
-bool ShmSocket::SetRecvCallback(const RecvCB &onRecv)
+bool ShmSocket::StartRaw(const RecvRawCB &onData, int nworker)
{
+ auto CanRecv = [this]() {
+ switch (type_) {
+ case eSockRequest:
+ case eSockReply:
+ case eSockBus:
+ case eSockSubscribe:
+ return true;
+ default:
+ return false;
+ }
+ };
+ if (!CanRecv()) {
+ return false;
+ }
std::lock_guard<std::mutex> lock(mutex_);
- onRecv_ = onRecv;
- cv_recv_cb_.notify_one();
+
+ StopNoLock();
+ auto RecvProc = [this, onData]() {
+ while (run_) {
+ try {
+ MsgI imsg;
+ DEFER1(imsg.Release(shm_));
+ if (mq_->Recv(imsg, 100)) { onData(imsg); }
+ } catch (...) {
+ }
+ }
+ };
+
+ run_.store(true);
+ for (int i = 0; i < nworker; ++i) {
+ workers_.emplace_back(RecvProc);
+ }
return true;
}
-bool ShmSocket::HasRecvCB()
+bool ShmSocket::Start(const RecvCB &onData, int nworker)
{
- return static_cast<bool>(onRecv_);
+ return StartRaw([this, onData](MsgI &imsg) { BHMsg m; if (imsg.Unpack(m)) { onData(m); } }, nworker);
}
-void ShmSocket::Stop()
+bool ShmSocket::Stop()
{
- run_ = false;
- for (auto &t : workers_) {
- if (t.joinable()) {
- t.join();
+ std::lock_guard<std::mutex> lock(mutex_);
+ return StopNoLock();
+}
+
+bool ShmSocket::StopNoLock()
+{
+ if (run_.exchange(false)) {
+ for (auto &w : workers_) {
+ if (w.joinable()) {
+ w.join();
+ }
}
+ return true;
}
-}
\ No newline at end of file
+ return false;
+}
--
Gitblit v1.8.0