From c1e39e20ca42b21eeac8b5068fa1f921bf9a070f Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 23 六月 2021 19:43:29 +0800
Subject: [PATCH] refactor, start tcp pub/sub.
---
src/msg.cpp | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index edffff1..3546424 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -18,17 +18,10 @@
#include "msg.h"
#include "bh_util.h"
#include "defs.h"
-#include "socket.h"
+#include "shm_socket.h"
namespace bhome_msg
{
-
-ShmSocket &ShmMsg::Sender()
-{
- static auto &mq = GetCenterInfo(shm())->mq_sender_;
- static ShmSocket sender(mq.offset_, shm(), mq.id_);
- return sender;
-}
int ShmMsg::Release()
{
@@ -37,10 +30,15 @@
}
auto n = meta()->count_.Dec();
if (n == 0) {
- int64_t free_cmd = (id() << 4) | EncodeCmd(eCmdFree);
- Sender().Send(BHTopicCenterAddress(), free_cmd);
+ if (meta()->managed_) {
+ int64_t free_cmd = (id() << 4) | EncodeCmd(eCmdFree);
+ DefaultSender(shm()).Send(BHTopicCenterAddress(shm()), free_cmd);
+ } else {
+ Free();
+ }
} else if (n < 0) {
- LOG_FATAL() << "error double release data.";
+ // ns_log::GetTrace();
+ LOG_FATAL() << "double release msg.";
throw std::runtime_error("double release msg.");
}
return n;
--
Gitblit v1.8.0