From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.
---
src/shm.h | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/shm.h b/src/shm.h
index 3fce99d..28745dc 100644
--- a/src/shm.h
+++ b/src/shm.h
@@ -77,9 +77,14 @@
T *Find(const std::string &name) { return find<T>(name.c_str()).first; }
};
+template <class D>
+using Allocator = allocator<D, SharedMemory::segment_manager>;
+template <class D>
+using Deleter = deleter<D, SharedMemory::segment_manager>;
+template <class D>
+using SharedPtr = shared_ptr<D, Allocator<void>, Deleter<D>>;
+
// ShmObject manages an object in shared memory, but ShmObject itself is not in shared memory.
-// works like a smart pointer of an object in shared memory.
-// TODO handshake with center, and can be removed if killed.
template <class T>
class ShmObject : private boost::noncopyable
{
@@ -109,6 +114,7 @@
throw("Error: Not enough memory, can not allocate \"" + name_ + "\"");
}
}
+ static bool Remove(SharedMemory &shm, const std::string &name) { return shm.destroy<Data>(ObjName(name).c_str()); }
static Data *Find(SharedMemory &shm, const std::string &name) { return shm.Find<Data>(ObjName(name)); }
Data *Find(const std::string &name) { return Find(shm_, ObjName(name)); }
virtual ~ShmObject() {}
@@ -117,11 +123,8 @@
const Data *data() const { return pdata_; }
Data *operator->() { return data(); }
const Data *operator->() const { return data(); }
- bool Remove() { return shm_.destroy<Data>(ObjName(name_).c_str()); }
+ bool Remove() { return Remove(shm_, name_); }
};
-
-template <class D>
-using Allocator = allocator<D, SharedMemory::segment_manager>;
} // namespace bhome_shm
--
Gitblit v1.8.0