From c338820e4db43ad32c20ff429a038b06bcb980f8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 08 四月 2021 18:13:25 +0800
Subject: [PATCH] BIG change, join center,bus; now msg is head+body.
---
src/shm_queue.cpp | 136 +++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 73 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 77add97..521f773 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -15,96 +15,86 @@
*
* =====================================================================================
*/
-#include "shm_queue.h"
-#include <boost/uuid/uuid_io.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include "bh_util.h"
-namespace bhome_shm {
-
+#include "shm_queue.h"
+#include "bh_util.h"
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
+
+// TODO !!! add garbage collection, and handshake with gc-center.
+// smart pointer will NOT work if user crash.
+// problem of process release mq: client query success; server exits; client send.
+// client query success; server exits; client send.
+
+namespace bhome_shm
+{
+using namespace bhome_msg;
using namespace boost::interprocess;
using namespace boost::uuids;
-namespace {
-std::string MsgQIdToName(const MQId& id) { return "shmq" + to_string(id); }
-MQId EmptyId() { return nil_uuid(); }
-MQId NewId() { return random_generator()(); }
-}
-
-ShmMsgQueue::ShmMsgQueue(const MQId &id, ShmType &segment, const uint32_t len):
-SharedQueue(segment, MsgQIdToName(id), id, len, segment.get_segment_manager())
+namespace
{
- printf("queue size: %ld cap: %ld\n", data()->size(), data()->capacity());
+std::string MsgQIdToName(const MQId &id) { return "shmq" + to_string(id); }
+// MQId EmptyId() { return nil_uuid(); }
+MQId NewId() { return random_generator()(); }
+const int AdjustMQLength(const int len)
+{
+ const int kMaxLength = 10000;
+ const int kDefaultLen = 12;
+ if (len <= 0) {
+ return kDefaultLen;
+ } else if (len < kMaxLength) {
+ return len;
+ } else {
+ return kMaxLength;
+ }
}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const uint32_t len):ShmMsgQueue(NewId(), segment, len)
-{}
+} // namespace
+
+// ShmMsgQueue memory usage: (320 + 16*length) bytes, length >= 2
+ShmMsgQueue::ShmMsgQueue(const MQId &id, ShmType &segment, const int len) :
+ Super(segment, MsgQIdToName(id), AdjustMQLength(len), segment.get_segment_manager()),
+ id_(id)
+{
+}
+
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
+ ShmMsgQueue(NewId(), segment, len)
+{
+}
ShmMsgQueue::~ShmMsgQueue()
{
- Remove();
+ // It's not safe to remove, others may still holder pointers and write to it.
+ // TODO use smart_ptr or garbage collection.
+ //Remove();
}
-bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
+bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend)
{
- Queue *remote = find(MsgQIdToName(remote_id));
-
- if(!remote) {
- return false;
- }
- msg.AddRef();
- if (remote->Write(msg, timeout_ms)) {
- return true;
- } else {
- msg.RemoveRef();
- return false;
- }
+ Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ return remote && remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
}
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
+bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
{
- // Test shows that in the 2 cases:
- // 1) build msg first, then find remote queue;
- // 2) find remote queue first, then build msg;
- // 1 is about 50% faster than 2, maybe cache related.
-
- Msg msg;
- if (msg.Build(shm(), Id(), data, size, false)) {
- if (Send(remote_id, msg, timeout_ms)) {
- return true;
- } else {
- if (msg.RemoveRef() == 0) { // works for both refcounted and not counted.
- msg.FreeFrom(shm());
- }
- }
- }
- return false;
+ Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ return remote && remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
}
-bool ShmMsgQueue::Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms)
-{
- Msg msg;
- if (Read(msg, timeout_ms)) {
- DEFER1(if (msg.RemoveRef() == 0) { msg.FreeFrom(shm()); });
+// Test shows that in the 2 cases:
+// 1) build msg first, then find remote queue;
+// 2) find remote queue first, then build msg;
+// 1 is about 50% faster than 2, maybe cache related.
- auto ptr = msg.get<char>();
- if (ptr) {
- MsgMetaV1 meta;
- meta.Parse(ptr);
- source_id = meta.src_id_;
- size = meta.data_size_;
- data = malloc(size);
- if (data) {
- memcpy(data, ptr + meta.self_size_, size);
- return true;
- }
- }
- }
- source_id = EmptyId();
- data = 0;
- size = 0;
- return false;
-}
+// bool ShmMsgQueue::Recv(MsgI &imsg, BHMsgHead &head, const int timeout_ms)
+// {
+// if (Read(imsg, timeout_ms)) {
+// // DEFER1(imsg.Release(shm()););
+// return imsg.ParseHead(head);
+// } else {
+// return false;
+// }
+// }
} // namespace bhome_shm
-
--
Gitblit v1.8.0