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.cpp | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 28 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index bb193ec..ed8adba 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -16,50 +16,115 @@
* =====================================================================================
*/
#include "msg.h"
+#include "bh_util.h"
namespace bhome_msg {
-
-bool MsgMetaV1::Parse(const void *p)
+const uint32_t kMsgTag = 0xf1e2d3c4;
+const uint32_t kMsgPrefixLen = 4;
+
+BHMsg InitMsg(MsgType type)
{
- assert(p);
- *this = *static_cast<const MsgMetaV1*>(p);
- return tag_ == kMsgMetaTag;
+ BHMsg msg;
+ msg.set_type(type);
+ time_t tm = 0;
+ msg.set_timestamp(time(&tm));
+ return msg;
}
-void MsgMetaV1::Pack(void *p)
+BHMsg MakeRequest(const MQId &src_id, const void *data, const size_t size)
{
- *static_cast<MsgMetaV1*>(p) = *this;
+ assert(data && size);
+ BHMsg msg(InitMsg(kMsgTypeRequest));
+ msg.set_body(data, size);
+ BHAddress addr;
+ msg.add_route()->set_mq_id(&src_id, sizeof(src_id));
+ return msg;
}
-bool Msg::Build(SharedMemory &shm, const MQId &src_id, const void *data, const size_t size, const bool refcount)
+BHMsg MakeReply(const void *data, const size_t size)
{
- if (!data || !size) {
- return false;
+ assert(data && size);
+ BHMsg msg(InitMsg(kMsgTypeReply));
+ msg.set_body(data, size);
+ return msg;
+}
+
+BHMsg MakeSubUnsub(const std::vector<std::string> &topics, const MsgType sub_unsub)
+{
+ assert(sub_unsub == kMsgTypeSubscribe || sub_unsub == kMsgTypeUnsubscribe);
+ BHMsg msg(InitMsg(sub_unsub));
+ DataSub subs;
+ for (auto &t : topics) {
+ subs.add_topics(t);
}
- void *p = shm.Alloc(sizeof(MsgMetaV1) + size);
- if (!p) {
- return false;
- }
- RefCount *rc = 0;
- if (refcount) {
- rc = shm.New<RefCount>();
- if (!rc) {
+ msg.set_body(subs.SerializeAsString());
+ return msg;
+}
+
+BHMsg MakeSub(const std::vector<std::string> &topics) { return MakeSubUnsub(topics, kMsgTypeSubscribe); }
+BHMsg MakeUnsub(const std::vector<std::string> &topics) { return MakeSubUnsub(topics, kMsgTypeUnsubscribe); }
+
+BHMsg MakePub(const std::string &topic, const void *data, const size_t size)
+{
+ 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);
- return false;
+ p = 0;
}
}
- MsgMetaV1 meta;
- meta.data_size_ = size;
- meta.src_id_ = src_id;
- meta.Pack(p);
- memcpy(static_cast<char *>(p) + sizeof(meta), data, size);
- Msg(p, rc).swap(*this);
- return true;
-
+ return p;
}
-int Msg::Release(SharedMemory &shm)
+bool MsgI::Unpack(BHMsg &msg) const
+{
+ void *p = ptr_.get();
+ assert(p);
+ uint32_t msg_size = Get32(p);
+ return msg.ParseFromArray(static_cast<char*>(p) + kMsgPrefixLen, msg_size);
+}
+
+// with ref count;
+bool MsgI::MakeRC(SharedMemory &shm, const BHMsg &msg)
+{
+ void *p = Pack(shm, msg);
+ if(!p) {
+ return false;
+ }
+ RefCount *rc = shm.New<RefCount>();
+ if (!rc) {
+ shm.Dealloc(p);
+ return false;
+ }
+ MsgI(p, rc).swap(*this);
+ return true;
+}
+
+bool MsgI::Make(SharedMemory &shm, const BHMsg &msg)
+{
+ void *p = Pack(shm, msg);
+ if(!p) {
+ return false;
+ }
+ MsgI(p, 0).swap(*this);
+ return true;
+}
+
+int MsgI::Release(SharedMemory &shm)
{
if (IsCounted()) {
const int n = count_->Dec();
--
Gitblit v1.8.0