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 | 125 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 34 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index 5cb0ce4..10ad0d2 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -18,15 +18,18 @@
#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 "bhome_msg.pb.h"
+#include <functional>
+#include <stdint.h>
-namespace bhome_msg {
- using namespace bhome_shm;
- using namespace bhome::msg; // for serialized data in MsgI
+namespace bhome_msg
+{
+using namespace bhome_shm;
+using namespace bhome::msg; // for serialized data in MsgI
// MsgI is safe to be stored in shared memory, so POD data or offset_ptr is required.
// message format: header(meta) + body(data).
@@ -37,49 +40,103 @@
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_ = 1;
+ Mutex mutex_;
+ int num_ = 1;
};
-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 {
+// 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_;
- bool BuildSubOrUnsub(SharedMemory &shm, const std::vector<std::string> &topics, const MsgType sub_unsub);
+ 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:
- 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()); }
+ MsgI(void *p = 0, RefCount *c = 0) :
+ ptr_(p), count_(c) {}
- // AddRef and Release works for both counted and not counted msg.
- int AddRef() const { return IsCounted() ? count_->Inc() : 1; }
- int Release(SharedMemory &shm);
+ 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()); }
- int Count() const{ return IsCounted() ? count_->Get() : 1; }
+ // AddRef and Release works for both counted and not counted msg.
+ int AddRef() const { return IsCounted() ? count_->Inc() : 1; }
+ int Release(SharedMemory &shm);
- bool IsCounted() const { return static_cast<bool>(count_); }
+ int Count() const { return IsCounted() ? count_->Get() : 1; }
+ bool IsCounted() const { return static_cast<bool>(count_); }
- bool Make(SharedMemory &shm, const BHMsg &msg);
- bool MakeRC(SharedMemory &shm, const BHMsg &msg);
- bool Unpack(BHMsg &msg) const;
+ 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(MsgI &m1, MsgI &m2) { m1.swap(m2); }
-
} // namespace bhome_msg
-
-
#endif // end of include guard: MSG_5BILLZET
--
Gitblit v1.8.0