From 056f71f24cefaf88f2a93714c6678c03ed5f1e0e Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 02 七月 2021 16:54:33 +0800
Subject: [PATCH] fixed to adapt gcc-5.4 & glibc-2.25
---
src/shm.h | 148 ++++++++++++++++++------------------------------
1 files changed, 56 insertions(+), 92 deletions(-)
diff --git a/src/shm.h b/src/shm.h
index a70afcb..e005cfc 100644
--- a/src/shm.h
+++ b/src/shm.h
@@ -19,14 +19,10 @@
#ifndef SHM_6CHO6D6C
#define SHM_6CHO6D6C
-#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>
+#include <string>
namespace bhome_shm
{
@@ -34,58 +30,13 @@
using namespace boost::interprocess;
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
-{
- 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_;
- MutexT mutex_;
-
-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(); }
-
- 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();
-};
-
-// typedef boost::interprocess::interprocess_mutex Mutex;
-typedef MutexWithTimeLimit Mutex;
+typedef interprocess_mutex Mutex;
typedef scoped_lock<Mutex> Guard;
-typedef interprocess_condition Cond;
class SharedMemory : public mshm_t
{
std::string name_;
+ Mutex *pmutex_ = 0;
static permissions AllowAll()
{
@@ -112,74 +63,87 @@
{
return construct<T>(name.c_str(), std::nothrow)(std::forward<decltype(params)>(params)...);
}
- void *Alloc(const size_t size) { return allocate(size, std::nothrow); }
+ template <class T>
+ bool Destroy(const std::string &name) { return destroy<T>(name.c_str()); }
+
+ 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)...); }
- template <class T>
- void Delete(T *p)
- {
- if (p) { destroy_ptr<T>(p); };
- }
- template <class T>
- void Delete(offset_ptr<T> p) { Delete(p.get()); }
template <class T>
T *Find(const std::string &name) { return find<T>(name.c_str()).first; }
};
-template <class D>
-using Allocator = allocator<D, SharedMemory::segment_manager>;
-template <class D>
-using Deleter = deleter<D, SharedMemory::segment_manager>;
-template <class D>
-using SharedPtr = shared_ptr<D, Allocator<void>, Deleter<D>>;
+enum Mode {
+ eOpen = 0,
+ eCreate = 1,
+ eOpenOrCreate = 2
+};
-// ShmObject manages an object in shared memory, but ShmObject itself is not in shared memory.
+// NamedShmObject manages an object in shared memory, but NamedShmObject itself is not in shared memory.
template <class T>
-class ShmObject : private boost::noncopyable
+class NamedShmObject : private boost::noncopyable
{
static std::string ObjName(const std::string &name) { return "obj" + name; }
-protected:
+public:
typedef T Data;
typedef SharedMemory ShmType;
+ ShmType &shm() const { return shm_; }
-private:
- ShmType &shm_;
- std::string name_;
- Data *pdata_ = nullptr;
+ template <class... Params>
+ NamedShmObject(ShmType &segment, const std::string &name, Mode mode, Params &&...t) :
+ shm_(segment), name_(name)
+ {
+ switch (mode) {
+ case eOpen:
+ pdata_ = shm_.Find<Data>(ObjName(name_));
+ break;
+ case eCreate:
+ pdata_ = shm_.Create<Data>(ObjName(name_), std::forward<decltype(t)>(t)...);
+ break;
+ case eOpenOrCreate:
+ pdata_ = shm_.FindOrCreate<Data>(ObjName(name_), std::forward<decltype(t)>(t)...);
+ break;
+ default: break;
+ }
+ if (!IsOk()) {
+ throw std::runtime_error("Error: shm can not create/open \"" + name_ + "\"");
+ }
+ }
+
+ NamedShmObject(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_; }
-protected:
- ShmType &shm() const { return shm_; }
-
-public:
- template <class... Params>
- ShmObject(ShmType &segment, const std::string &name, Params &&...t) :
- shm_(segment), name_(name)
- {
- pdata_ = shm_.Create<Data>(ObjName(name_), std::forward<decltype(t)>(t)...);
- if (!IsOk()) {
- throw("Error: Not enough memory, can not allocate \"" + name_ + "\"");
- }
- }
- static bool Remove(SharedMemory &shm, const std::string &name) { return shm.destroy<Data>(ObjName(name).c_str()); }
+ static bool Remove(SharedMemory &shm, const std::string &name) { return shm.Destroy<Data>(ObjName(name)); }
static Data *Find(SharedMemory &shm, const std::string &name) { return shm.Find<Data>(ObjName(name)); }
Data *Find(const std::string &name) { return Find(shm_, ObjName(name)); }
- virtual ~ShmObject() {}
+ virtual ~NamedShmObject() {}
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;
};
} // namespace bhome_shm
--
Gitblit v1.8.0