From d3e7f93e69cb24c766292d8780e745caf24d42a8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 25 三月 2021 18:30:51 +0800
Subject: [PATCH] add ref count.

---
 src/msg.h |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/msg.h b/src/msg.h
index ec17aaf..44c961f 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -59,7 +59,7 @@
     int Get() { Guard lk(mutex_); return num_; }
 private:
     Mutex mutex_;
-    int num_ = 0;
+    int num_ = 1;
 };
 
 class Msg {
@@ -67,13 +67,6 @@
     offset_ptr<void> ptr_;
     offset_ptr<RefCount> count_;
 public:
-    class CountGuard : private boost::noncopyable {
-        Msg &msg_;
-    public:
-        CountGuard(Msg &msg) : msg_(msg) { msg_.AddRef(); }
-        ~CountGuard() { msg_.RemoveRef(); }
-    };
-
     Msg(void *p=0, RefCount *c=0):ptr_(p), count_(c) {}
     void swap(Msg &a) { std::swap(ptr_, a.ptr_); std::swap(count_, a.count_); }
 
@@ -84,9 +77,10 @@
     // Msg & operator = (Msg &&a) { Msg(std::move(a)).swap(*this); }
 
     template <class T = void> T *get() { return static_cast<T*>(ptr_.get()); }
-    int AddRef() const { return count_ ? count_->Inc() : 0; }
-    int RemoveRef()  const{ return count_ ? count_->Dec() : 0; }
-    int Count() const { return count_ ? count_->Get() : 0; }
+    int AddRef() const { return IsCounted() ? count_->Inc() : 1; }
+    int RemoveRef()  const{ return IsCounted() ? count_->Dec() : 0; }
+    int Count()  const{ return IsCounted() ? count_->Get() : 1; }
+    bool IsCounted() const { return static_cast<bool>(count_); }
     bool Build(SharedMemory &shm, const MQId &src_id, const void *p, const size_t size, const bool refcount);
     void FreeFrom(SharedMemory &shm);
 };

--
Gitblit v1.8.0