From 8967e7f2f8b94dc032135707e16c8a9f233d0db6 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期四, 03 六月 2021 13:32:16 +0800 Subject: [PATCH] rafactor, remove old todo, add some err msg. --- src/msg.cpp | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/msg.cpp b/src/msg.cpp index a4777d2..3546424 100644 --- a/src/msg.cpp +++ b/src/msg.cpp @@ -17,16 +17,11 @@ */ #include "msg.h" #include "bh_util.h" -#include "socket.h" +#include "defs.h" +#include "shm_socket.h" namespace bhome_msg { - -ShmSocket &ShmMsg::Sender() -{ - static ShmSocket sender(shm(), false, BHGlobalSenderAddress(), 16); - return sender; -} int ShmMsg::Release() { @@ -35,10 +30,16 @@ } 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) { - throw -123; + // ns_log::GetTrace(); + LOG_FATAL() << "double release msg."; + throw std::runtime_error("double release msg."); } return n; } -- Gitblit v1.8.0