From e5718922616d3a948d4fa616ad3d0af53f5c5556 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期四, 01 四月 2021 14:07:37 +0800 Subject: [PATCH] add todo, need gc. --- src/shm.h | 12 +++++++----- src/shm_queue.cpp | 9 ++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/shm.h b/src/shm.h index 3fce99d..22a975b 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 { @@ -119,9 +124,6 @@ const Data *operator->() const { return data(); } bool Remove() { return shm_.destroy<Data>(ObjName(name_).c_str()); } }; - -template <class D> -using Allocator = allocator<D, SharedMemory::segment_manager>; } // namespace bhome_shm diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp index f2fb45b..de38229 100644 --- a/src/shm_queue.cpp +++ b/src/shm_queue.cpp @@ -21,6 +21,11 @@ #include <boost/uuid/uuid_generators.hpp> #include <boost/uuid/uuid_io.hpp> +// TODO !!! add garbage collection, and handshake with gc-center. +// smart pointer will NOT work if user crash. +// problem of process release mq: client query success; server exits; client send. +// client query success; server exits; client send. + namespace bhome_shm { using namespace bhome_msg; @@ -61,7 +66,9 @@ ShmMsgQueue::~ShmMsgQueue() { - Remove(); + // It's not safe to remove, others may still holder pointers and write to it. + // TODO use smart_ptr or garbage collection. + //Remove(); } bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend) -- Gitblit v1.8.0