From 34cd75f77d0ca94dbdba4e6cc9451fe4d33e78b3 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 19:14:13 +0800
Subject: [PATCH] add api BHQueryProcs.
---
src/shm.h | 110 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/src/shm.h b/src/shm.h
index 7773ceb..b5ec2ea 100644
--- a/src/shm.h
+++ b/src/shm.h
@@ -19,13 +19,11 @@
#ifndef SHM_6CHO6D6C
#define SHM_6CHO6D6C
+#include "log.h"
#include <atomic>
#include <boost/interprocess/managed_shared_memory.hpp>
-#include <boost/interprocess/sync/interprocess_condition.hpp>
#include <boost/interprocess/sync/interprocess_mutex.hpp>
-#include <boost/interprocess/sync/scoped_lock.hpp>
#include <boost/noncopyable.hpp>
-#include <chrono>
#include <thread>
namespace bhome_shm
@@ -35,57 +33,71 @@
typedef managed_shared_memory mshm_t;
-class CasMutex
-{
- std::atomic<bool> flag_;
- bool cas(bool expected, bool new_val) { return flag_.compare_exchange_strong(expected, new_val); }
-
-public:
- CasMutex() :
- flag_(false) {}
- bool try_lock() { return cas(false, true); }
- void lock()
- {
- while (!try_lock()) { std::this_thread::yield(); }
- }
- void unlock() { cas(true, false); }
-};
-
-class MutexWithTimeLimit
+class MutexWithPidCheck
{
typedef boost::interprocess::interprocess_mutex MutexT;
- // typedef CasMutex MutexT;
- typedef std::chrono::steady_clock Clock;
- typedef Clock::duration Duration;
- static Duration Now() { return Clock::now().time_since_epoch(); }
-
- const Duration limit_;
- std::atomic<Duration> last_lock_time_;
+ static pid_t pid()
+ {
+ static pid_t val = getpid();
+ return val;
+ }
+ static bool Killed(pid_t pid)
+ {
+ char buf[64] = {0};
+ snprintf(buf, sizeof(buf) - 1, "/proc/%d/stat", pid);
+ return access(buf, F_OK) != 0;
+ }
+ bool PidCas(pid_t exp, pid_t val) { return pid_.compare_exchange_strong(exp, val); }
MutexT mutex_;
+ std::atomic<pid_t> pid_;
public:
typedef MutexT::internal_mutex_type internal_mutex_type;
const internal_mutex_type &internal_mutex() const { return mutex_.internal_mutex(); }
internal_mutex_type &internal_mutex() { return mutex_.internal_mutex(); }
+ MutexWithPidCheck() :
+ pid_(0) {}
+ bool try_lock()
+ {
+ bool r = false;
+ if (mutex_.try_lock()) {
+ auto old = pid_.load();
+ r = PidCas(old, pid());
+ } else {
+ auto old = pid_.load();
+ if (Killed(old)) {
+ r = PidCas(old, pid());
+ if (r) {
+ LOG_DEBUG() << "PidCheck captured pid " << old << " -> " << pid();
+ }
+ }
+ }
+ return r;
+ }
- explicit MutexWithTimeLimit(Duration limit) :
- limit_(limit) {}
- MutexWithTimeLimit() :
- MutexWithTimeLimit(std::chrono::seconds(1)) {}
- ~MutexWithTimeLimit() { static_assert(std::is_pod<Duration>::value); }
- bool try_lock();
- void lock();
- void unlock();
+ void lock()
+ {
+ while (!try_lock()) {
+ std::this_thread::yield();
+ }
+ }
+ void unlock()
+ {
+ auto old = pid_.load();
+ if (old == pid()) {
+ mutex_.unlock();
+ }
+ }
};
-// typedef boost::interprocess::interprocess_mutex Mutex;
-typedef MutexWithTimeLimit Mutex;
+typedef interprocess_mutex Mutex;
typedef scoped_lock<Mutex> Guard;
-typedef interprocess_condition Cond;
+// typedef robust::Guard<Mutex> Guard;
class SharedMemory : public mshm_t
{
std::string name_;
+ Mutex *pmutex_ = 0;
static permissions AllowAll()
{
@@ -112,19 +124,29 @@
{
return construct<T>(name.c_str(), std::nothrow)(std::forward<decltype(params)>(params)...);
}
- void *Alloc(const size_t size) { return allocate(size, std::nothrow); }
+ void *Alloc(const size_t size)
+ {
+ Guard lock(*pmutex_);
+ return allocate(size, std::nothrow);
+ }
void Dealloc(void *p)
{
+ Guard lock(*pmutex_);
if (p) { deallocate(p); }
}
template <class T>
void Dealloc(offset_ptr<T> ptr) { return Dealloc(ptr.get()); }
template <class T, class... Params>
- T *New(Params &&...params) { return construct<T>(anonymous_instance, std::nothrow)(std::forward<decltype(params)>(params)...); }
+ T *New(Params &&...params)
+ {
+ Guard lock(*pmutex_);
+ return construct<T>(anonymous_instance, std::nothrow)(std::forward<decltype(params)>(params)...);
+ }
template <class T>
void Delete(T *p)
{
+ Guard lock(*pmutex_);
if (p) { destroy_ptr<T>(p); };
}
template <class T>
@@ -170,6 +192,12 @@
pdata_ = shm_.Find<Data>(ObjName(name_));
}
}
+ ShmObject(const int64_t offset, ShmType &segment, const std::string &name) :
+ shm_(segment), name_(name)
+ {
+ pdata_ = reinterpret_cast<Data *>(Addr(shm_.get_address()) + offset);
+ }
+
bool IsOk() const { return pdata_; }
static bool Remove(SharedMemory &shm, const std::string &name) { return shm.destroy<Data>(ObjName(name).c_str()); }
@@ -179,11 +207,13 @@
std::string name() const { return name_; }
Data *data() { return pdata_; }
const Data *data() const { return pdata_; }
+ int64_t offset() const { return Addr(pdata_) - Addr(shm_.get_address()); }
Data *operator->() { return data(); }
const Data *operator->() const { return data(); }
bool Remove() { return Remove(shm_, name_); }
private:
+ static int64_t Addr(const void *p) { return reinterpret_cast<int64_t>(p); }
ShmType &shm_;
std::string name_;
Data *pdata_ = nullptr;
--
Gitblit v1.8.0