coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2026-02-06 01:39:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

use new for synchronized-wrapper

Browse Source
This commit is contained in:
mutouyun 2019-01-25 15:02:53 +08:00
parent 1a71313431
commit 66cfab4a62
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/memory/wrapper.h
View File

@ -13,9 +13,6 @@
#include "def.h" #include "def.h"
#include "rw_lock.h" #include "rw_lock.h"
#include "tls_pointer.h" #include "tls_pointer.h"
#include "memory/alloc.h"
#include "memory/detail.h"
#include "platform/detail.h" #include "platform/detail.h"
namespace ipc { namespace ipc {
@ -124,14 +121,6 @@ constexpr bool operator!=(const allocator_wrapper<T, AllocP>&, const allocator_w
/// Thread-safe allocation wrapper /// Thread-safe allocation wrapper
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
template <std::size_t BlockSize>
using page_fixed = ipc::mem::detail::fixed<BlockSize, page_fixed_alloc>;
using page_pool_alloc = detail::pool_alloc<page_fixed>;
template <typename T>
using page_allocator = allocator_wrapper<T, page_pool_alloc>;
template <typename AllocP> template <typename AllocP>
class synchronized { class synchronized {
public: public:
@ -139,8 +128,7 @@ public:
private: private:
spin_lock lc_; spin_lock lc_;
std::multimap<std::size_t, alloc_policy*, std::less<std::size_t>, std::multimap<std::size_t, alloc_policy*> allocs_;
page_allocator<std::pair<const std::size_t, alloc_policy*>>> allocs_;
struct alloc_t { struct alloc_t {
synchronized* t_; synchronized* t_;
@ -156,11 +144,10 @@ private:
std::tie(s_, a_) = *it; std::tie(s_, a_) = *it;
t_->allocs_.erase(it); t_->allocs_.erase(it);
} }
if (a_ == nullptr) {
a_ = static_cast<alloc_policy*>(page_pool_alloc::alloc(sizeof(alloc_policy)));
}
} }
::new (a_) alloc_policy; if (a_ == nullptr) {
a_ = new alloc_policy;
}
} }
~alloc_t() { ~alloc_t() {
@ -188,11 +175,14 @@ private:
} }
public: public:
~synchronized() {
clear();
}
void clear() { void clear() {
IPC_UNUSED_ auto guard = ipc::detail::unique_lock(lc_); IPC_UNUSED_ auto guard = ipc::detail::unique_lock(lc_);
for (auto& pair : allocs_) { for (auto& pair : allocs_) {
pair.second->~AllocP(); delete pair.second;
page_pool_alloc::free(pair.second, sizeof(alloc_policy));
} }
} }