From f51636c193d032723c47343e39ff8296db350200 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期一, 29 三月 2021 18:04:00 +0800 Subject: [PATCH] change msg to use protobuf, add more msg type. --- src/msg.h | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/msg.h b/src/msg.h index 99fb2e2..5cb0ce4 100644 --- a/src/msg.h +++ b/src/msg.h @@ -26,32 +26,12 @@ namespace bhome_msg { using namespace bhome_shm; - using namespace bhome::msg; // for serialized data in Msg + using namespace bhome::msg; // for serialized data in MsgI -// msg is safe to be stored in shared memory, so POD data or offset_ptr is required. +// MsgI is safe to be stored in shared memory, so POD data or offset_ptr is required. // message format: header(meta) + body(data). -enum MsgType { - kMsgTypeNull = 0, - kMsgTypeNormal = 1, - kMsgTypeMaxValue -}; typedef boost::uuids::uuid MQId; - -const uint32_t kMsgMetaTag = 0xf1e2d3c4; - -struct MsgMetaV1 { - uint16_t self_size_ = sizeof(MsgMetaV1); // sizeof(*this) - uint16_t type_ = kMsgTypeNormal; // msg type. - uint32_t tag_ = kMsgMetaTag; - uint32_t data_size_ = 0; - MQId src_id_; - // more fields add at end, must not change - - MsgMetaV1():src_id_(boost::uuids::nil_uuid()){} - bool Parse(const void *p); - void Pack(void *p); -}; // store ref count, msgs shareing the same data should also hold a pointer of the same RefCount object. class RefCount : private boost::noncopyable @@ -65,13 +45,21 @@ int num_ = 1; }; -class Msg { +BHMsg MakeRequest(const MQId &src_id, const void *data, const size_t size); +BHMsg MakeReply(const void *data, const size_t size); +BHMsg MakeSub(const std::vector<std::string> &topics); +BHMsg MakeUnsub(const std::vector<std::string> &topics); +BHMsg MakePub(const std::string &topic, const void *data, const size_t size); + +class MsgI { private: offset_ptr<void> ptr_; offset_ptr<RefCount> count_; + + bool BuildSubOrUnsub(SharedMemory &shm, const std::vector<std::string> &topics, const MsgType sub_unsub); public: - 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_); } + MsgI(void *p=0, RefCount *c=0):ptr_(p), count_(c) {} + void swap(MsgI &a) { std::swap(ptr_, a.ptr_); std::swap(count_, a.count_); } template <class T = void> T *get() { return static_cast<T*>(ptr_.get()); } // AddRef and Release works for both counted and not counted msg. @@ -79,11 +67,15 @@ int Release(SharedMemory &shm); 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); + + bool Make(SharedMemory &shm, const BHMsg &msg); + bool MakeRC(SharedMemory &shm, const BHMsg &msg); + bool Unpack(BHMsg &msg) const; }; -inline void swap(Msg &m1, Msg &m2) { m1.swap(m2); } +inline void swap(MsgI &m1, MsgI &m2) { m1.swap(m2); } } // namespace bhome_msg -- Gitblit v1.8.0