From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置
---
src/shm.cpp | 67 ++++-----------------------------
1 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/src/shm.cpp b/src/shm.cpp
index b89acef..479b94f 100644
--- a/src/shm.cpp
+++ b/src/shm.cpp
@@ -10,76 +10,25 @@
* Revision: none
* Compiler: gcc
*
- * Author: YOUR NAME (),
+ * Author: Li Chao (),
* Organization:
*
* =====================================================================================
*/
+
#include "shm.h"
-#include "bh_util.h"
-#include <mutex>
-#include <boost/uuid/uuid_io.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-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(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()
+SharedMemory::SharedMemory(const std::string &name, const uint64_t size) :
+ mshm_t(open_or_create, name.c_str(), size, 0, AllowAll()),
+ name_(name)
{
- Remove();
+ pmutex_ = FindOrCreate<Mutex>("ShmSelfControlMutex0");
}
-bool ShmMsgQueue::Send(MQId remote_id, const void *data, const size_t size, const int timeout_ms)
+SharedMemory::~SharedMemory()
{
- if (data && size) {
- Queue *remote = find(MsgQIdToName(remote_id));
- if (remote) {
- void *p = shm().allocate(size, std::nothrow);
- bool r = false;
- if (p) {
- Msg buf = { Id(), p, size};
- memcpy(p, data, size);
- if (remote->Write(buf, timeout_ms)) {
- return true;
- } else {
- shm().deallocate(p);
- }
- }
- }
- }
- return false;
}
-
-bool ShmMsgQueue::Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms)
-{
- Msg buf;
- if (Read(buf, timeout_ms) && buf.size_ > 0) {
- DEFER1(shm().deallocate(buf.data_.get()););
- source_id = buf.src_;
- size = buf.size_;
- if (data = malloc(size)) {
- memcpy(data, buf.data_.get(), size);
- return true;
- }
- }
- source_id = EmptyId();
- data = 0;
- size = 0;
- return false;
-}
-
} // namespace bhome_shm
--
Gitblit v1.8.0