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 | 89 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index 1ac153a..3ca20d4 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -22,8 +22,6 @@
#include "proto.h"
#include "shm.h"
#include <atomic>
-#include <boost/interprocess/offset_ptr.hpp>
-#include <functional>
#include <stdint.h>
class ShmSocket;
@@ -34,14 +32,9 @@
// 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
-class ShmMsg : private StaticDataRef<SharedMemory, ShmMsg>
+class ShmMsg
{
-public:
- static inline SharedMemory &shm() { return GetData(); }
-
private:
- static ShmSocket &Sender();
-
// store ref count, msgs shareing the same data should also hold a pointer of the same RefCount object.
class RefCount : private boost::noncopyable
{
@@ -49,7 +42,8 @@
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(); }
@@ -58,11 +52,7 @@
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); }
- static inline OffsetType BaseAddr()
- {
- static const OffsetType base = Addr(shm().get_address()); // cache value.
- return base;
- }
+ OffsetType BaseAddr() const { return Addr(shm().get_address()); }
static const uint32_t kMsgTag = 0xf1e2d3c4;
struct Meta {
@@ -83,20 +73,23 @@
capacity_(size), id_(NewId()), timestamp_(NowSec()) {}
};
OffsetType offset_;
- static void *Alloc(const size_t size)
+ 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(size);
p = pmeta + 1;
+ if (src) {
+ memcpy(p, src, size);
+ }
}
return p;
}
private:
Meta *meta() const { return get<Meta>() - 1; }
-
- typedef std::function<void(void *p, int len)> ToArray;
template <class Body>
void *Pack(const BHMsgHead &head, const uint32_t head_len, const Body &body, const uint32_t body_len)
@@ -116,40 +109,62 @@
}
return addr;
}
-
- void *Pack(const std::string &content)
+ void *Pack(const BHMsgHead &head, const uint32_t head_len, const std::string &body_content)
{
void *addr = get();
if (addr) {
- memcpy(addr, content.data(), content.size());
- meta()->size_ = 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 offset_ != 0 ? static_cast<T *>(Ptr(offset_ + BaseAddr())) : nullptr; }
public:
- static bool BindShm(SharedMemory &shm) { return SetData(shm); }
- ShmMsg() :
- offset_(0) {}
- explicit ShmMsg(const OffsetType offset) :
- offset_(offset) {}
+ 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_; }
- void swap(ShmMsg &a) { std::swap(offset_, a.offset_); }
+ SharedMemory &shm() const { return *pshm_; }
+
+ void swap(ShmMsg &a)
+ {
+ 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; }
@@ -171,6 +186,13 @@
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)
{
@@ -180,8 +202,11 @@
return valid() && (meta()->capacity_ >= size) && Pack(head, head_len, body, body_len);
}
- inline bool Make(const std::string &content) { return Make(content.size()) && Pack(content); }
- inline bool Fill(const std::string &content) { return valid() && (meta()->capacity_ >= content.size()) && Pack(content); }
+ 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)); }
--
Gitblit v1.8.0