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.cpp | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/src/shm.cpp b/src/shm.cpp
index 6d7dccd..479b94f 100644
--- a/src/shm.cpp
+++ b/src/shm.cpp
@@ -21,46 +21,11 @@
namespace bhome_shm
{
-bool MutexWithTimeLimit::try_lock()
-{
- if (mutex_.try_lock()) {
- auto old_time = last_lock_time_.load();
- if (Now() - old_time > limit_) {
- return last_lock_time_.compare_exchange_strong(old_time, Now());
- } else {
- last_lock_time_.store(Now());
- return true;
- }
- } else {
- auto old_time = last_lock_time_.load();
- if (Now() - old_time > limit_) {
- return last_lock_time_.compare_exchange_strong(old_time, Now());
- } else {
- return false;
- }
- }
-}
-void MutexWithTimeLimit::lock()
-{
- while (!try_lock()) {
- std::this_thread::yield();
- }
-}
-void MutexWithTimeLimit::unlock()
-{
- auto old_time = last_lock_time_.load();
- if (Now() - old_time > limit_) {
- } else {
- if (last_lock_time_.compare_exchange_strong(old_time, Now())) {
- mutex_.unlock();
- }
- }
-}
-
SharedMemory::SharedMemory(const std::string &name, const uint64_t size) :
mshm_t(open_or_create, name.c_str(), size, 0, AllowAll()),
name_(name)
{
+ pmutex_ = FindOrCreate<Mutex>("ShmSelfControlMutex0");
}
SharedMemory::~SharedMemory()
--
Gitblit v1.8.0