From 3c2b6739208d961cf8b86460d7f05516d044960c Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 31 三月 2021 19:13:42 +0800
Subject: [PATCH] add async recv suport; sync by waiting for async.
---
src/socket.cpp | 243 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 196 insertions(+), 47 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 21928b8..13f1e38 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -21,57 +21,33 @@
#include "defs.h"
#include "msg.h"
#include <chrono>
+#include <condition_variable>
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
+
+//TODO maybe change to base class, each type is a sub class.
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()
{
@@ -91,7 +67,6 @@
}
DEFER1(imsg.Release(shm_));
return Queue::Send(shm_, kBHBusQueueId, imsg, timeout_ms);
-
} catch (...) {
return false;
}
@@ -110,25 +85,199 @@
}
}
-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::StartAsync(int nworker)
{
- run_ = false;
- for (auto &t : workers_) {
- if (t.joinable()) {
- t.join();
+ auto AsyncRecvProc = [this](BHMsg &msg) {
+ auto Find = [&](RecvCB &cb) {
+ std::lock_guard<std::mutex> lock(mutex_);
+ const std::string &msgid = msg.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) {
+ cb(msg);
+ }
+ };
+
+ return Start(AsyncRecvProc, nworker);
+}
+
+bool ShmSocket::Stop()
+{
+ 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;
+ }
+ return false;
+}
+
+bool ShmSocket::AsyncRequest(const void *remote, const void *pmsg, const int timeout_ms, const RecvCB &cb)
+{
+ if (type_ != eSockRequest) {
+ return false;
+ }
+ assert(remote && pmsg && !mq_);
+ try {
+ const BHMsg &msg = *static_cast<const BHMsg *>(pmsg);
+ auto RegisterCB = [&]() {
+ std::lock_guard<std::mutex> lock(mutex_);
+ async_cbs_.emplace(msg.msg_id(), cb);
+ };
+
+ return mq_->Send(*static_cast<const MQId *>(remote), msg, timeout_ms, RegisterCB);
+ } catch (...) {
+ return false;
+ }
+}
+
+bool ShmSocket::SyncRequest(const void *remote, const void *msg, void *result, const int timeout_ms)
+{
+ struct State {
+ std::mutex mutex;
+ std::condition_variable cv;
+ bool canceled = false;
+ };
+
+ try {
+ std::shared_ptr<State> st(new State);
+ auto OnRecv = [=](BHMsg &msg) {
+ std::unique_lock<std::mutex> lk(st->mutex);
+ if (!st->canceled) {
+ static_cast<BHMsg *>(result)->Swap(&msg);
+ st->cv.notify_one();
+ }
+ };
+
+ std::unique_lock<std::mutex> lk(st->mutex);
+ auto end = std::chrono::steady_clock::now() + std::chrono::milliseconds(timeout_ms);
+ if (AsyncRequest(remote, msg, timeout_ms, OnRecv) && st->cv.wait_until(lk, end) == std::cv_status::no_timeout) {
+ return true;
+ } else {
+ st->canceled = true;
+ return false;
+ }
+ } catch (...) {
+ return false;
+ }
+}
+
+bool ShmSocket::QueryRPCTopic(const std::string &topic, bhome::msg::BHAddress &addr, const int timeout_ms)
+{
+ BHMsg result;
+ const BHMsg &msg = MakeQueryTopic(topic);
+ if (SyncRequest(&kBHTopicRPCId, &msg, &result, timeout_ms)) {
+ if (result.type() == kMsgTypeQueryTopicReply) {
+ DataQueryTopicReply reply;
+ if (reply.ParseFromString(result.body())) {
+ addr = reply.address();
+ return !addr.mq_id().empty();
+ }
}
}
-}
\ No newline at end of file
+ return false;
+}
+
+bool ShmSocket::RequestRPC(const std::string &topic, const void *data, const size_t size, const int timeout_ms, const RequestResultCB &cb)
+{
+ auto Call = [&](const void *remote) {
+ const BHMsg &msg(MakeRequest(mq_->Id(), topic, data, size));
+ auto onRecv = [cb](BHMsg &msg) {
+ if (msg.type() == kMsgTypeReply) {
+ DataReply reply;
+ if (reply.ParseFromString(msg.body())) {
+ cb(reply.data().data(), reply.data().size());
+ }
+ }
+ };
+ return AsyncRequest(remote, &msg, timeout_ms, onRecv);
+ };
+
+ try {
+ BHAddress addr;
+ if (QueryRPCTopic(topic, addr, timeout_ms)) {
+ return Call(addr.mq_id().data());
+ }
+ } catch (...) {
+ return false;
+ }
+}
+
+bool ShmSocket::RequestRPC(const std::string &topic, const void *data, const size_t size, const int timeout_ms, std::string &out)
+{
+ try {
+ BHAddress addr;
+ if (QueryRPCTopic(topic, addr, timeout_ms)) {
+ const BHMsg &msg(MakeRequest(mq_->Id(), topic, data, size));
+ BHMsg reply;
+ if (SyncRequest(addr.mq_id().data(), &msg, &reply, timeout_ms) && reply.type() == kMsgTypeReply) {
+ DataReply dr;
+ if (dr.ParseFromString(msg.body())) {
+ dr.mutable_data()->swap(out);
+ return true;
+ }
+ }
+ }
+ } catch (...) {
+ return false;
+ }
+}
--
Gitblit v1.8.0