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/msg.h | 151 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 55 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index ec17aaf..10ad0d2 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -18,84 +18,125 @@
#ifndef MSG_5BILLZET
#define MSG_5BILLZET
-#include <stdint.h>
+#include "bh_util.h"
+#include "proto.h"
#include "shm.h"
#include <boost/interprocess/offset_ptr.hpp>
#include <boost/uuid/uuid_generators.hpp>
+#include <functional>
+#include <stdint.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
{
public:
- int Inc() { Guard lk(mutex_); return ++num_; }
- int Dec() { Guard lk(mutex_); return --num_; }
- int Get() { Guard lk(mutex_); return num_; }
+ int Inc()
+ {
+ Guard lk(mutex_);
+ return ++num_;
+ }
+ int Dec()
+ {
+ Guard lk(mutex_);
+ return --num_;
+ }
+ int Get()
+ {
+ Guard lk(mutex_);
+ return num_;
+ }
+
private:
- Mutex mutex_;
- int num_ = 0;
+ Mutex mutex_;
+ int num_ = 1;
};
-class Msg {
+// message content layout: header_size + header + data_size + data
+class MsgI
+{
private:
- offset_ptr<void> ptr_;
- offset_ptr<RefCount> count_;
+ offset_ptr<void> ptr_;
+ offset_ptr<RefCount> count_;
+
+ typedef std::function<void(void *p, int len)> ToArray;
+ void *Pack(SharedMemory &shm,
+ const uint32_t head_len, const ToArray &headToArray,
+ const uint32_t body_len, const ToArray &bodyToArray);
+
+ template <class Body>
+ void *Pack(SharedMemory &shm, const BHMsgHead &head, const Body &body)
+ {
+ return Pack(
+ shm,
+ uint32_t(head.ByteSizeLong()), [&](void *p, int len) { head.SerializeToArray(p, len); },
+ uint32_t(body.ByteSizeLong()), [&](void *p, int len) { body.SerializeToArray(p, len); });
+ }
+
+ bool MakeRC(SharedMemory &shm, void *addr);
+ bool Make(SharedMemory &shm, void *addr);
+
public:
- class CountGuard : private boost::noncopyable {
- Msg &msg_;
- public:
- CountGuard(Msg &msg) : msg_(msg) { msg_.AddRef(); }
- ~CountGuard() { msg_.RemoveRef(); }
- };
+ MsgI(void *p = 0, RefCount *c = 0) :
+ ptr_(p), count_(c) {}
- 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_); }
+ 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()); }
- // ~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); }
+ // AddRef and Release works for both counted and not counted msg.
+ int AddRef() const { return IsCounted() ? count_->Inc() : 1; }
+ int Release(SharedMemory &shm);
- 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; }
- bool Build(SharedMemory &shm, const MQId &src_id, const void *p, const size_t size, const bool refcount);
- void FreeFrom(SharedMemory &shm);
+ int Count() const { return IsCounted() ? count_->Get() : 1; }
+ bool IsCounted() const { return static_cast<bool>(count_); }
+
+ template <class Body>
+ inline bool MakeRC(SharedMemory &shm, const BHMsgHead &head, const Body &body)
+ {
+ return MakeRC(shm, Pack(shm, head, body));
+ }
+
+ bool EnableRefCount(SharedMemory &shm);
+
+ template <class Body>
+ inline bool Make(SharedMemory &shm, const BHMsgHead &head, const Body &body)
+ {
+ void *p = Pack(shm, head, body);
+ auto NeedRefCount = [&]() { return head.type() == kMsgTypePublish; };
+ return NeedRefCount() ? MakeRC(shm, p) : Make(shm, p);
+ }
+
+ bool ParseHead(BHMsgHead &head) const;
+ template <class Body>
+ bool ParseBody(Body &body) const
+ {
+ auto p = static_cast<char *>(ptr_.get());
+ assert(p);
+ uint32_t size = Get32(p);
+ p += 4;
+ p += size;
+ size = Get32(p);
+ p += 4;
+ return body.ParseFromArray(p, size);
+ }
};
-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
#endif // end of include guard: MSG_5BILLZET
--
Gitblit v1.8.0