From ea2ee85202f7b16d7b713bc7a7dcd1fa63bc6213 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 26 三月 2021 11:54:50 +0800
Subject: [PATCH] change refcount to AddRef,Release interface.
---
src/shm_queue.cpp | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 77add97..5e67d1f 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -48,17 +48,7 @@
bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
{
Queue *remote = find(MsgQIdToName(remote_id));
-
- if(!remote) {
- return false;
- }
- msg.AddRef();
- if (remote->Write(msg, timeout_ms)) {
- return true;
- } else {
- msg.RemoveRef();
- return false;
- }
+ return remote && remote->Write(msg, timeout_ms, [&](){msg.AddRef();});
}
bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
@@ -69,13 +59,11 @@
// 1 is about 50% faster than 2, maybe cache related.
Msg msg;
- if (msg.Build(shm(), Id(), data, size, false)) {
- if (Send(remote_id, msg, timeout_ms)) {
+ if(msg.Build(shm(), Id(), data, size, false)) {
+ if(Send(remote_id, msg, timeout_ms)) {
return true;
} else {
- if (msg.RemoveRef() == 0) { // works for both refcounted and not counted.
- msg.FreeFrom(shm());
- }
+ msg.Release(shm());
}
}
return false;
@@ -85,7 +73,7 @@
{
Msg msg;
if (Read(msg, timeout_ms)) {
- DEFER1(if (msg.RemoveRef() == 0) { msg.FreeFrom(shm()); });
+ DEFER1(msg.Release(shm()););
auto ptr = msg.get<char>();
if (ptr) {
--
Gitblit v1.8.0