From 1b167ec5ad101ac44451381e26cc73ab5d67d2a1 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 26 四月 2021 16:37:52 +0800
Subject: [PATCH] fix socket busy loop; del locked readall; refactor.
---
src/shm_queue.cpp | 87 -------------------------------------------
1 files changed, 0 insertions(+), 87 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index face18b..86f0d91 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -21,91 +21,4 @@
namespace bhome_shm
{
-using namespace bhome_msg;
-using namespace boost::interprocess;
-
-namespace
-{
-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;
- const int kDefaultLen = 12;
- if (len <= 0) {
- return kDefaultLen;
- } else if (len < kMaxLength) {
- return len;
- } else {
- return kMaxLength;
- }
-}
-
-} // 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) :
- id_(id),
- queue_(segment, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager())
-{
-}
-
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int 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() {}
-
-bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
-{
- Queue *q = Find(shm, id);
- if (q) {
- MsgI msg;
- while (q->TryRead(msg)) {
- msg.Release();
- }
- }
- return Shmq::Remove(shm, MsgQIdToName(id));
-}
-
-ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId remote_id)
-{
- return Shmq::Find(shm, MsgQIdToName(remote_id));
-}
-
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend)
-{
- 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