From 3f8ae6cf4f03be83f16846af32d73dd89b937c40 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 30 三月 2021 15:45:54 +0800
Subject: [PATCH] add dot separated topic partial match; refactor.
---
src/msg.h | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index 44c961f..f3fe726 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -22,33 +22,16 @@
#include "shm.h"
#include <boost/interprocess/offset_ptr.hpp>
#include <boost/uuid/uuid_generators.hpp>
+#include "bhome_msg.pb.h"
-namespace bhome_shm {
+namespace bhome_msg {
+ using namespace bhome_shm;
+ 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
@@ -62,33 +45,40 @@
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 MQId &client, const std::vector<std::string> &topics);
+BHMsg MakeUnsub(const MQId &client, 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_); }
-
- // ~Msg() { RemoveRef(); }
- // Msg(const Msg &a):ptr_(a.ptr_), count_(a.count_) { AddRef(); }
- // Msg(Msg &&a):ptr_(a.ptr_), count_(a.count_) { a.ptr_ = 0; a.count_ = 0; }
- // Msg & operator = (const Msg &a) { Msg(a).swap(*this); }
- // Msg & operator = (Msg &&a) { Msg(std::move(a)).swap(*this); }
-
+ 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.
int AddRef() const { return IsCounted() ? count_->Inc() : 1; }
- int RemoveRef() const{ return IsCounted() ? count_->Dec() : 0; }
+ 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);
- void FreeFrom(SharedMemory &shm);
+
+ 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_shm
+} // namespace bhome_msg
--
Gitblit v1.8.0