From 6ec8ca9a9e4e30f50b339842194f2061256b7094 Mon Sep 17 00:00:00 2001 From: mutouyun Date: Fri, 25 Jan 2019 13:17:43 +0800 Subject: [PATCH] test... --- src/memory/wrapper.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/memory/wrapper.h b/src/memory/wrapper.h index 4df0de9..12e4339 100644 --- a/src/memory/wrapper.h +++ b/src/memory/wrapper.h @@ -139,8 +139,8 @@ public: private: spin_lock lc_; - std::multimap, - page_allocator>> allocs_; + std::multimap, + page_allocator>*/> allocs_; struct alloc_t { synchronized* t_; @@ -156,11 +156,12 @@ private: std::tie(s_, a_) = *it; t_->allocs_.erase(it); } - if (a_ == nullptr) { - a_ = static_cast(page_pool_alloc::alloc(sizeof(alloc_policy))); - } +// if (a_ == nullptr) { +// a_ = static_cast(page_pool_alloc::alloc(sizeof(alloc_policy))); +// } } - ::new (a_) alloc_policy; +// ::new (a_) alloc_policy; + a_ = new alloc_policy; } ~alloc_t() { @@ -196,7 +197,8 @@ public: IPC_UNUSED_ auto guard = ipc::detail::unique_lock(lc_); for (auto& pair : allocs_) { pair.second->~AllocP(); - page_pool_alloc::free(pair.second, sizeof(alloc_policy)); +// page_pool_alloc::free(pair.second, sizeof(alloc_policy)); + delete pair.second; } }