From a76a94009d78a6a41654335dcb9202fb31659de0 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 25 三月 2021 13:23:16 +0800
Subject: [PATCH] bulid msg, refactor.
---
src/msg.h | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index 214bb72..8a820bd 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -21,6 +21,7 @@
#include <stdint.h>
#include "shm.h"
#include <boost/interprocess/offset_ptr.hpp>
+#include <boost/uuid/uuid_generators.hpp>
namespace bhome_shm {
@@ -32,6 +33,8 @@
kMsgTypeMaxValue
};
+typedef boost::uuids::uuid MQId;
+
const uint32_t kMsgMetaTag = 0xf1e2d3c4;
struct MsgMetaV1 {
@@ -39,10 +42,10 @@
uint16_t type_ = kMsgTypeNormal; // msg type.
uint32_t tag_ = kMsgMetaTag;
uint32_t data_size_ = 0;
- unsigned char src_id_[16] = {0};
+ MQId src_id_;
// more fields add at end, must not change
- MsgMetaV1(){}
+ MsgMetaV1():src_id_(boost::uuids::nil_uuid()){}
bool Parse(const void *p);
void Pack(void *p);
};
@@ -63,7 +66,6 @@
private:
offset_ptr<void> ptr_;
offset_ptr<RefCount> count_;
- void swap(Msg &a) { std::swap(ptr_, a.ptr_); std::swap(count_, a.count_); }
public:
class CountGuard : private boost::noncopyable {
Msg &msg_;
@@ -73,6 +75,7 @@
};
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(); }
@@ -81,11 +84,15 @@
// Msg & operator = (Msg &&a) { Msg(std::move(a)).swap(*this); }
template <class T = void> T *get() { return static_cast<T*>(ptr_.get()); }
- int AddRef() { return count_ ? count_->Inc() : 0; }
- int RemoveRef() { return count_ ? count_->Dec() : 0; }
- int Count() { return count_ ? count_->Get() : 0; }
+ 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);
};
+Msg BuildMsg(const MQId &src, const void *p, const size_t size);
+
} // namespace bhome_shm
--
Gitblit v1.8.0