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.cpp | 105 ++++++++++++++++------------------------------------
1 files changed, 33 insertions(+), 72 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index 3a01240..06b817e 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -20,89 +20,43 @@
namespace bhome_msg
{
-
+/*TODO change msg format, header has proc info;
+reply has errer msg
+ center accept request and route.;
+//*/
const uint32_t kMsgTag = 0xf1e2d3c4;
-const uint32_t kMsgPrefixLen = 4;
-BHMsg InitMsg(MsgType type)
+void *MsgI::Pack(SharedMemory &shm,
+ const uint32_t head_len, const ToArray &headToArray,
+ const uint32_t body_len, const ToArray &bodyToArray)
{
- BHMsg msg;
- msg.set_type(type);
- time_t tm = 0;
- msg.set_timestamp(time(&tm));
- return msg;
-}
-
-BHMsg MakeRequest(const MQId &src_id, const void *data, const size_t size)
-{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypeRequest));
- msg.set_body(data, size);
- msg.add_route()->set_mq_id(&src_id, sizeof(src_id));
- return msg;
-}
-
-BHMsg MakeReply(const void *data, const size_t size)
-{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypeReply));
- msg.set_body(data, size);
- return msg;
-}
-
-BHMsg MakeSubUnsub(const MQId &client, const std::vector<std::string> &topics, const MsgType sub_unsub)
-{
- assert(sub_unsub == kMsgTypeSubscribe || sub_unsub == kMsgTypeUnsubscribe);
- BHMsg msg(InitMsg(sub_unsub));
- msg.add_route()->set_mq_id(&client, sizeof(client));
- DataSub subs;
- for (auto &t : topics) {
- subs.add_topics(t);
+ void *addr = shm.Alloc(sizeof(head_len) + head_len + sizeof(body_len) + body_len);
+ if (addr) {
+ auto p = static_cast<char *>(addr);
+ auto Pack1 = [&p](auto len, auto &writer) {
+ Put32(p, len);
+ p += sizeof(len);
+ writer(p, len);
+ p += len;
+ };
+ Pack1(head_len, headToArray);
+ Pack1(body_len, bodyToArray);
}
- msg.set_body(subs.SerializeAsString());
- return msg;
+ return addr;
}
-BHMsg MakeSub(const MQId &client, const std::vector<std::string> &topics) { return MakeSubUnsub(client, topics, kMsgTypeSubscribe); }
-BHMsg MakeUnsub(const MQId &client, const std::vector<std::string> &topics) { return MakeSubUnsub(client, topics, kMsgTypeUnsubscribe); }
-
-BHMsg MakePub(const std::string &topic, const void *data, const size_t size)
+bool MsgI::ParseHead(BHMsgHead &head) const
{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypePublish));
- DataPub pub;
- pub.set_topic(topic);
- pub.set_data(data, size);
- msg.set_body(pub.SerializeAsString());
- return msg;
-}
-
-void *Pack(SharedMemory &shm, const BHMsg &msg)
-{
- uint32_t msg_size = msg.ByteSizeLong();
- void *p = shm.Alloc(4 + msg_size);
- if (p) {
- Put32(p, msg_size);
- if (!msg.SerializeToArray(static_cast<char *>(p) + kMsgPrefixLen, msg_size)) {
- shm.Dealloc(p);
- p = 0;
- }
- }
- return p;
-}
-
-bool MsgI::Unpack(BHMsg &msg) const
-{
- void *p = ptr_.get();
+ auto p = static_cast<char *>(ptr_.get());
assert(p);
uint32_t msg_size = Get32(p);
- return msg.ParseFromArray(static_cast<char *>(p) + kMsgPrefixLen, msg_size);
+ p += 4;
+ return head.ParseFromArray(p, msg_size);
}
// with ref count;
-bool MsgI::MakeRC(SharedMemory &shm, const BHMsg &msg)
+bool MsgI::MakeRC(SharedMemory &shm, void *p)
{
- void *p = Pack(shm, msg);
if (!p) {
return false;
}
@@ -115,9 +69,8 @@
return true;
}
-bool MsgI::Make(SharedMemory &shm, const BHMsg &msg)
+bool MsgI::Make(SharedMemory &shm, void *p)
{
- void *p = Pack(shm, msg);
if (!p) {
return false;
}
@@ -125,6 +78,14 @@
return true;
}
+bool MsgI::EnableRefCount(SharedMemory &shm)
+{
+ if (!IsCounted()) {
+ count_ = shm.New<RefCount>();
+ }
+ return IsCounted();
+}
+
int MsgI::Release(SharedMemory &shm)
{
if (IsCounted()) {
--
Gitblit v1.8.0