From 11f6c600e55ca5677f93624efe44d2605cdd908d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 20:18:38 +0800
Subject: [PATCH] reserve #,@ prefix for internal proc id and topic.
---
src/msg.h | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/msg.h b/src/msg.h
index 42a753e..12922b5 100644
--- a/src/msg.h
+++ b/src/msg.h
@@ -34,14 +34,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
{
@@ -58,11 +53,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 {
@@ -74,15 +65,17 @@
RefCount count_;
const uint32_t tag_ = kMsgTag;
- const uint32_t size_ = 0;
+ 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) :
- size_(size), id_(NewId()), timestamp_(NowSec()) {}
+ capacity_(size), id_(NewId()), timestamp_(NowSec()) {}
};
OffsetType offset_;
- static void *Alloc(const size_t size)
+ SharedMemory *pshm_;
+ void *Alloc(const size_t size)
{
void *p = shm().Alloc(sizeof(Meta) + size);
if (p) {
@@ -111,6 +104,7 @@
};
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;
}
@@ -120,6 +114,7 @@
void *addr = get();
if (addr) {
memcpy(addr, content.data(), content.size());
+ meta()->size_ = content.size();
}
return addr;
}
@@ -129,24 +124,27 @@
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; }
@@ -174,11 +172,11 @@
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()->size_ >= size) && Pack(head, head_len, body, body_len);
+ 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()->size_ >= content.size()) && Pack(content); }
+ inline bool Fill(const std::string &content) { return valid() && (meta()->capacity_ >= content.size()) && Pack(content); }
inline bool Make(const size_t size) { return Make(Alloc(size)); }
@@ -209,6 +207,11 @@
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>();
--
Gitblit v1.8.0