From cf05ea3d9f43e4e84d621e1f9d54cbef552b6e2b Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 18 五月 2021 16:53:28 +0800
Subject: [PATCH] fix center init mutex.
---
src/socket.cpp | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 0704174..c450e65 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -28,25 +28,13 @@
using namespace bhome_shm;
ShmSocket::ShmSocket(Shm &shm, const MQId id, const int len) :
- run_(false), mq_(id, shm, len), alloc_id_(0)
-{
- Start();
-}
+ run_(false), mq_(shm, id, len), alloc_id_(0) { Start(); }
ShmSocket::ShmSocket(Shm &shm, const bool create_or_else_find, const MQId id, const int len) :
- run_(false), mq_(id, create_or_else_find, shm, len), alloc_id_(0)
-{
- Start();
-}
-ShmSocket::ShmSocket(bhome_shm::SharedMemory &shm, const int len) :
- run_(false), mq_(shm, len), alloc_id_(0)
-{
- Start();
-}
+ run_(false), mq_(shm, create_or_else_find, id, len), alloc_id_(0) { Start(); }
+ShmSocket::ShmSocket(int64_t abs_addr, Shm &shm, const MQId id) :
+ run_(false), mq_(abs_addr, shm, id), alloc_id_(0) { Start(); }
-ShmSocket::~ShmSocket()
-{
- Stop();
-}
+ShmSocket::~ShmSocket() { Stop(); }
bool ShmSocket::Start(int nworker, const RecvCB &onData, const RawRecvCB &onRaw, const IdleCB &onIdle)
{
@@ -92,15 +80,13 @@
}
};
ShmMsgQueue::RawData val = 0;
- auto TryRecvMore = [&]() {
- for (int i = 0; i < 100; ++i) {
- if (mq().TryRecv(val)) {
- return true;
- }
+ for (int i = 0; i < 100; ++i) {
+ if (mq().TryRecv(val)) {
+ onRecv(val);
+ return true;
}
- return false;
- };
- return TryRecvMore() ? (onRecv(val), true) : false;
+ }
+ return false;
};
try {
@@ -172,6 +158,42 @@
return false;
}
+bool ShmSocket::Send(const MQInfo &remote, std::string &&content, const std::string &msg_id, RecvCB &&cb)
+{
+ size_t size = content.size();
+ auto OnResult = [content = std::move(content), msg_id, remote, cb = std::move(cb), this](MsgI &msg) mutable {
+ if (!msg.Fill(content)) { return false; }
+
+ try {
+ if (!cb) {
+ Send(remote, msg);
+ } else {
+ per_msg_cbs_->Store(msg_id, std::move(cb));
+ auto onExpireRemoveCB = [this, msg_id](SendQ::Data const &msg) {
+ RecvCB cb_no_use;
+ per_msg_cbs_->Pick(msg_id, cb_no_use);
+ };
+ Send(remote, msg, onExpireRemoveCB);
+ }
+ return true;
+ } catch (...) {
+ SetLastError(eError, "Send internal error.");
+ return false;
+ }
+ };
+#if 0
+ // self alloc
+ MsgI msg;
+ if (msg.Make(size)) {
+ DEFER1(msg.Release());
+ return OnResult(msg);
+ }
+#else
+ // center alloc
+ return RequestAlloc(size, OnResult);
+#endif
+}
+
bool ShmSocket::RequestAlloc(const int64_t size, std::function<void(MsgI &msg)> const &onResult)
{ // 8bit size, 4bit socket index, 16bit proc index, 28bit id, ,4bit cmd+flag
// LOG_FUNCTION;
@@ -196,5 +218,6 @@
RawRecvCB cb_no_use;
alloc_cbs_->Pick(id, cb_no_use);
};
+
return Send(BHTopicCenterAddress(), cmd, onExpireRemoveCB);
}
\ No newline at end of file
--
Gitblit v1.8.0