From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置

---
 src/msg.h |  229 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 146 insertions(+), 83 deletions(-)

diff --git a/src/msg.h b/src/msg.h
index 99b3a09..3ca20d4 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -22,19 +22,15 @@
 #include "proto.h"
 #include "shm.h"
 #include <atomic>
-#include <boost/interprocess/offset_ptr.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <functional>
 #include <stdint.h>
 
+class ShmSocket;
 namespace bhome_msg
 {
 using namespace bhome_shm;
 
 // ShmMsg is safe to be stored in shared memory, so POD data or offset_ptr is required.
 // message content layout: (meta) / header_size + header + data_size + data
-
-typedef boost::uuids::uuid MQId;
 
 class ShmMsg
 {
@@ -46,135 +42,174 @@
 
 	public:
 		RefCount() :
-		    num_(1) { static_assert(std::is_pod<decltype(num_)>::value); }
+		    num_(1) { }
+		    // num_(1) { static_assert(std::is_pod<decltype(num_)>::value); }
 		int Inc() { return ++num_; }
 		int Dec() { return --num_; }
 		int Get() { return num_.load(); }
 	};
-	typedef int64_t Offset;
-	static Offset Addr(void *ptr) { return reinterpret_cast<Offset>(ptr); }
-	static void *Ptr(const Offset offset) { return reinterpret_cast<void *>(offset); }
-	static inline Offset BaseAddr()
-	{
-		static const Offset base = Addr(shm().get_address()); // cache value.
-		return base;
-	}
-	static inline SharedMemory &shm()
-	{
-		if (!pshm()) { throw std::string("Must set ShmMsg shm before use!"); }
-		return *pshm();
-	}
-	static inline SharedMemory *&pshm()
-	{
-		static SharedMemory *pshm = 0;
-		return pshm;
-	}
 
+	typedef int64_t OffsetType;
+	static OffsetType Addr(void *ptr) { return reinterpret_cast<OffsetType>(ptr); }
+	static void *Ptr(const OffsetType offset) { return reinterpret_cast<void *>(offset); }
+	OffsetType BaseAddr() const { return Addr(shm().get_address()); }
+
+	static const uint32_t kMsgTag = 0xf1e2d3c4;
 	struct Meta {
+		static int64_t NewId()
+		{
+			static std::atomic<int64_t> id(0);
+			return ++id;
+		}
+
 		RefCount count_;
+		const uint32_t tag_ = kMsgTag;
+		const uint32_t capacity_ = 0;
+		const int64_t id_ = 0;
+		std::atomic<int64_t> timestamp_;
+		bool managed_ = false;
+		uint32_t size_ = 0;
+		Meta(uint32_t size) :
+		    capacity_(size), id_(NewId()), timestamp_(NowSec()) {}
 	};
-	Offset offset_;
-	void *Alloc(const size_t size)
+	OffsetType offset_;
+	SharedMemory *pshm_;
+
+	void *Alloc(const size_t size, const void *src = nullptr)
 	{
 		void *p = shm().Alloc(sizeof(Meta) + size);
 		if (p) {
-			auto pmeta = new (p) Meta;
+			auto pmeta = new (p) Meta(size);
 			p = pmeta + 1;
+			if (src) {
+				memcpy(p, src, size);
+			}
 		}
 		return p;
 	}
-	void Free()
-	{
-		assert(valid());
-		shm().Dealloc(meta());
-		offset_ = 0;
-		assert(!valid());
-	}
+
+private:
 	Meta *meta() const { return get<Meta>() - 1; }
 
-	typedef std::function<void(void *p, int len)> ToArray;
-	void *Pack(const uint32_t head_len, const ToArray &headToArray,
-	           const uint32_t body_len, const ToArray &bodyToArray)
+	template <class Body>
+	void *Pack(const BHMsgHead &head, const uint32_t head_len, const Body &body, const uint32_t body_len)
 	{
-		void *addr = Alloc(sizeof(head_len) + head_len + sizeof(body_len) + body_len);
+		void *addr = get();
 		if (addr) {
 			auto p = static_cast<char *>(addr);
-			auto Pack1 = [&p](auto len, auto &writer) {
+			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);
+			Pack1(head_len, [&](void *p, int len) { head.SerializeToArray(p, len); });
+			Pack1(body_len, [&](void *p, int len) { body.SerializeToArray(p, len); });
+			meta()->size_ = 4 + head_len + 4 + body_len;
 		}
 		return addr;
 	}
-
-	template <class Body>
-	void *Pack(const BHMsgHead &head, const Body &body)
+	void *Pack(const BHMsgHead &head, const uint32_t head_len, const std::string &body_content)
 	{
-		return Pack(
-		    uint32_t(head.ByteSizeLong()), [&](void *p, int len) { head.SerializeToArray(p, len); },
-		    uint32_t(body.ByteSizeLong()), [&](void *p, int len) { body.SerializeToArray(p, len); });
-	}
-
-	void *Pack(const std::string &content)
-	{
-		void *addr = Alloc(content.size());
+		void *addr = get();
 		if (addr) {
-			memcpy(addr, content.data(), content.size());
+			auto p = static_cast<char *>(addr);
+			auto Pack1 = [&p](uint32_t len, auto &&writer) {
+				Put32(p, len);
+				p += sizeof(len);
+				writer(p, len);
+				p += len;
+			};
+			Pack1(head_len, [&](void *p, int len) { head.SerializeToArray(p, len); });
+			Pack1(body_content.size(), [&](void *p, int len) { memcpy(p, body_content.data(), len); });
+			meta()->size_ = 4 + head_len + 4 + body_content.size();
 		}
 		return addr;
 	}
+
+	void *Pack(const void *src, const size_t size)
+	{
+		void *addr = get();
+		if (addr && src) {
+			memcpy(addr, src, size);
+			meta()->size_ = size;
+		}
+		return addr;
+	}
+
+	void *Pack(const std::string &content) { return Pack(content.data(), content.size()); }
 
 	bool Make(void *addr)
 	{
 		if (!addr) {
 			return false;
 		}
-		ShmMsg(addr).swap(*this);
+		offset_ = Addr(addr) - BaseAddr();
 		return true;
 	}
-	ShmMsg(void *p) :
-	    offset_(p ? (Addr(p) - BaseAddr()) : 0) {}
 
 	template <class T = void>
-	T *get() const { return static_cast<T *>(Ptr(offset_ + BaseAddr())); }
+	T *get() const { return offset_ != 0 ? static_cast<T *>(Ptr(offset_ + BaseAddr())) : nullptr; }
 
 public:
-	static bool BindShm(SharedMemory &shm)
-	{
-		assert(!pshm());
-		pshm() = &shm;
-		return true;
-	}
+	explicit ShmMsg(SharedMemory &shm) :
+	    offset_(0), pshm_(&shm) {}
+	ShmMsg(const OffsetType offset, SharedMemory &shm) :
+	    offset_(offset), pshm_(&shm) {}
+	OffsetType Offset() const { return offset_; }
+	OffsetType &OffsetRef() { return offset_; }
+	SharedMemory &shm() const { return *pshm_; }
 
-	ShmMsg() :
-	    ShmMsg(nullptr) {}
-	explicit ShmMsg(const size_t size) :
-	    ShmMsg(Alloc(size)) {}
-	void swap(ShmMsg &a) { std::swap(offset_, a.offset_); }
-	bool valid() const { return static_cast<bool>(offset_); }
-
-	// AddRef and Release works for both counted and not counted msg.
-	int AddRef() const { return valid() ? meta()->count_.Inc() : 1; }
-	int Release()
+	void swap(ShmMsg &a)
 	{
-		if (!valid()) {
-			return 0;
-		}
-		auto n = meta()->count_.Dec();
-		if (n == 0) {
-			Free();
-		}
-		return n;
+		std::swap(offset_, a.offset_);
+		std::swap(pshm_, a.pshm_);
 	}
+	bool valid() const { return offset_ != 0 && meta()->tag_ == kMsgTag; }
+	int64_t id() const { return valid() ? meta()->id_ : 0; }
+	int64_t timestamp() const { return valid() ? meta()->timestamp_.load() : 0; }
+	size_t Size() const { return valid() ? meta()->size_ : 0; }
 	int Count() const { return valid() ? meta()->count_.Get() : 1; }
+	int AddRef() const { return valid() ? meta()->count_.Inc() : 1; }
+	int Release();
+	void Free();
+	void reset_managed(const bool val) const
+	{
+		if (valid()) { meta()->managed_ = val; }
+	}
 
 	template <class Body>
-	inline bool Make(const BHMsgHead &head, const Body &body) { return Make(Pack(head, body)); }
-	inline bool Make(const std::string &content) { return Make(Pack(content)); }
+	inline bool Make(const BHMsgHead &head, const Body &body)
+	{
+		uint32_t head_len = head.ByteSizeLong();
+		uint32_t body_len = body.ByteSizeLong();
+		uint32_t size = sizeof(head_len) + head_len + sizeof(body_len) + body_len;
+		return Make(size) && Pack(head, head_len, body, body_len);
+	}
+	inline bool Make(const BHMsgHead &head, const std::string &body_content)
+	{
+		uint32_t head_len = head.ByteSizeLong();
+		uint32_t size = sizeof(head_len) + head_len + sizeof(uint32_t) + body_content.size();
+		return Make(size) && Pack(head, head_len, body_content);
+	}
+
+	template <class Body>
+	inline bool Fill(const BHMsgHead &head, const Body &body)
+	{
+		uint32_t head_len = head.ByteSizeLong();
+		uint32_t body_len = body.ByteSizeLong();
+		uint32_t size = sizeof(head_len) + head_len + sizeof(body_len) + body_len;
+		return valid() && (meta()->capacity_ >= size) && Pack(head, head_len, body, body_len);
+	}
+
+	inline bool Make(const void *src, const size_t size) { return Make(Alloc(size, src)); }
+	inline bool Fill(const void *src, const size_t size) { return valid() && (meta()->capacity_ >= size) && Pack(src, size); }
+
+	inline bool Make(const std::string &content) { return Make(content.data(), content.size()); }
+	inline bool Fill(const std::string &content) { return Fill(content.data(), content.size()); }
+
+	inline bool Make(const size_t size) { return Make(Alloc(size)); }
+
 	template <class Body>
 	static inline std::string Serialize(const BHMsgHead &head, const Body &body)
 	{
@@ -202,6 +237,22 @@
 		p += 4;
 		return head.ParseFromArray(p, msg_size);
 	}
+	std::string content() const
+	{
+		auto p = get<char>();
+		return p ? std::string(p, meta()->size_) : std::string();
+	}
+	std::string body() const
+	{
+		auto p = get<char>();
+		assert(p);
+		uint32_t size = Get32(p);
+		p += 4;
+		p += size;
+		size = Get32(p);
+		p += 4;
+		return std::string(p, size);
+	}
 	template <class Body>
 	bool ParseBody(Body &body) const
 	{
@@ -220,6 +271,18 @@
 
 typedef ShmMsg MsgI;
 
+constexpr inline int EncodeCmd(int cmd) { return ((cmd & MaskBits(3)) << 1) | 1; }
+constexpr inline int DecodeCmd(int64_t msg) { return (msg >> 1) & MaskBits(3); }
+constexpr inline bool IsCmd(int64_t msg) { return (msg & 1) != 0; }
+// int64_t pack format: cmd data ,3bit cmd, 1bit flag.
+enum MsgCmd {
+	eCmdNodeInit = 0,      // upto 56bit ssn id
+	eCmdNodeInitReply = 1, // 31bit proc index,
+	eCmdAllocRequest0 = 2, // 8bit size, 4bit socket index, 16bit proc index, 28bit id
+	eCmdAllocReply0 = 3,   // 31bit ptr, 28bit id,
+	eCmdFree = 4,          // upto 59bit msg id,
+};
+
 } // namespace bhome_msg
 
 #endif // end of include guard: MSG_5BILLZET

--
Gitblit v1.8.0