From 330f78f3334bcdcdb4cc2ab2dbf66604e0224d71 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 16:21:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/valib/bhshmq
---
src/shm_queue.cpp | 87 +------------------------------------------
1 files changed, 2 insertions(+), 85 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index f770afc..86f0d91 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -15,93 +15,10 @@
*
* =====================================================================================
*/
+
#include "shm_queue.h"
-#include <boost/uuid/uuid_io.hpp>
-#include <boost/uuid/uuid_generators.hpp>
#include "bh_util.h"
-namespace bhome_shm {
-
-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 bhome_shm
{
- printf("queue size: %ld cap: %ld\n", data()->size(), data()->capacity());
-}
-
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const uint32_t len):ShmMsgQueue(NewId(), segment, len)
-{}
-
-ShmMsgQueue::~ShmMsgQueue()
-{
- Remove();
-}
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
-{
- 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;
- }
-}
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, 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 {
- msg.FreeFrom(shm());
- }
- }
- return false;
-}
-
-bool ShmMsgQueue::Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms)
-{
- Msg msg;
- if (Read(msg, timeout_ms)) {
- auto ptr = msg.get<char>();
- if (ptr) {
- DEFER1(shm().Dealloc(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;
-}
-
} // namespace bhome_shm
-
--
Gitblit v1.8.0