From 5bb28835d06e27dbd960916c9fb11a555fc5a9bc Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 26 四月 2021 14:24:29 +0800
Subject: [PATCH] add shared lib target.
---
src/shm_queue.cpp | 101 ++++++++++++++++++++++----------------------------
1 files changed, 45 insertions(+), 56 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index cf4c8b4..face18b 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -18,20 +18,21 @@
#include "shm_queue.h"
#include "bh_util.h"
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
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()(); }
+std::string MsgQIdToName(const ShmMsgQueue::MQId id)
+{
+ char buf[40] = "mqOx";
+ int n = sprintf(buf + 4, "%lx", id);
+ return std::string(buf, n + 4);
+}
+
const int AdjustMQLength(const int len)
{
const int kMaxLength = 10000;
@@ -47,76 +48,64 @@
} // namespace
+ShmMsgQueue::MQId ShmMsgQueue::NewId()
+{
+ static auto &id = GetData();
+ return ++id;
+}
// 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(const MQId id, ShmType &segment, const int len) :
+ id_(id),
+ queue_(segment, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager())
{
}
ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), segment, len)
+ id_(NewId()),
+ queue_(segment, true, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager())
{
+ if (!queue_.IsOk()) {
+ throw("error create msgq " + std::to_string(id_));
+ }
}
-ShmMsgQueue::~ShmMsgQueue()
-{
- Remove();
-}
+ShmMsgQueue::~ShmMsgQueue() {}
-bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
+bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
{
- Queue *remote = Find(shm, MsgQIdToName(remote_id));
- return remote && remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
-}
-
-// bool ShmMsgQueue::Send(const MQId &remote_id, const MsgI &msg, const int timeout_ms)
-// {
-// Queue *remote = Find(MsgQIdToName(remote_id));
-// return remote && remote->Write(msg, timeout_ms, [](const MsgI&msg){msg.AddRef();});
-// }
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const BHMsg &data, const int timeout_ms)
-{
- MsgI msg;
- if (msg.Make(shm(), data)) {
- if (Send(remote_id, msg, timeout_ms)) {
- return true;
- } else {
- msg.Release(shm());
+ Queue *q = Find(shm, id);
+ if (q) {
+ MsgI msg;
+ while (q->TryRead(msg)) {
+ msg.Release();
}
}
- return false;
+ return Shmq::Remove(shm, MsgQIdToName(id));
}
-/*
-bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
+ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId remote_id)
{
- // 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.
-
- MsgI msg;
- if(msg.BuildRequest(shm(), Id(), data, size)) {
- if(Send(remote_id, msg, timeout_ms)) {
- return true;
- } else {
- msg.Release(shm());
- }
- }
- return false;
+ return Shmq::Find(shm, MsgQIdToName(remote_id));
}
-//*/
-bool ShmMsgQueue::Recv(BHMsg &msg, const int timeout_ms)
+
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend)
{
- MsgI imsg;
- if (Read(imsg, timeout_ms)) {
- DEFER1(imsg.Release(shm()););
- return imsg.Unpack(msg);
+ Queue *remote = Find(shm, remote_id);
+ if (remote) {
+ if (onsend) {
+ return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ } else {
+ return remote->TryWrite(msg, [](const MsgI &msg) { msg.AddRef(); });
+ }
} else {
+ // SetLestError(eNotFound);
return false;
}
}
+// 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.
+
} // namespace bhome_shm
--
Gitblit v1.8.0