From 0aeaa0f1f197c775ba7dbe922fc4b50ee04924d8 Mon Sep 17 00:00:00 2001
From: mutouyun <orz@orzz.org>
Date: Tue, 11 Aug 2020 22:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=201.=20=E6=97=A0=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E8=80=85=E6=97=B6,=20send=20=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20true;=202.=20Windows=20+=20MSVC=20?=
 =?UTF-8?q?=E4=B8=8B=E5=88=86=E9=85=8D=E5=99=A8=E7=9A=84=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ipc.cpp                    |  8 ++++++++
 src/memory/allocator_wrapper.h |  6 ++++--
 src/memory/wrapper.h           | 21 +++------------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/ipc.cpp b/src/ipc.cpp
index 6e94f54..04f4a01 100644
--- a/src/ipc.cpp
+++ b/src/ipc.cpp
@@ -394,6 +394,14 @@ static bool send(F&& gen_push, ipc::handle_t h, void const * data, std::size_t s
         ipc::error("fail: send, queue_of(h) == nullptr\n");
         return false;
     }
+    if (que->elems() == nullptr) {
+        ipc::error("fail: send, queue_of(h)->elems() == nullptr\n");
+        return false;
+    }
+    if (que->elems()->connections(std::memory_order_relaxed) == que->connected_id()) {
+        // there is no receiver on this connection
+        return false;
+    }
     // calc a new message id
     auto acc = info_of(h)->acc();
     if (acc == nullptr) {
diff --git a/src/memory/allocator_wrapper.h b/src/memory/allocator_wrapper.h
index 5e58f31..1635a21 100755
--- a/src/memory/allocator_wrapper.h
+++ b/src/memory/allocator_wrapper.h
@@ -20,7 +20,7 @@ struct rebind {
     using alloc_t = AllocP;
 };
 
-template <template <typename U> class AllocT, typename T>
+template <typename T, template <typename> class AllocT>
 struct rebind<T, AllocT<T>> {
     template <typename U>
     using alloc_t = AllocT<U>;
@@ -65,7 +65,9 @@ public:
 public:
     // the other type of std_allocator
     template <typename U>
-    struct rebind { typedef allocator_wrapper< U, typename detail::rebind<T, AllocP>::template alloc_t<U> > other; };
+    struct rebind { 
+        using other = allocator_wrapper< U, typename detail::rebind<T, AllocP>::template alloc_t<U> >;
+    };
 
     constexpr size_type max_size(void) const noexcept {
         return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
diff --git a/src/memory/wrapper.h b/src/memory/wrapper.h
index 65fc858..f511843 100755
--- a/src/memory/wrapper.h
+++ b/src/memory/wrapper.h
@@ -2,7 +2,7 @@
 
 #include <tuple>
 #include <thread>
-#include <set>          // std::set
+#include <deque>        // std::deque
 #include <functional>   // std::function
 #include <utility>      // std::forward
 #include <cstddef>
@@ -40,16 +40,7 @@ public:
     using alloc_policy = AllocP;
 
 protected:
-    template <typename T>
-    struct fixed_alloc_t : public fixed_alloc<sizeof(T)> {};
-
-    template <typename T>
-    using allocator = ipc::mem::allocator_wrapper<T, fixed_alloc_t<T>>;
-
-    std::multiset<alloc_policy, std::less<alloc_policy>, 
-                  allocator<alloc_policy>
-    > master_allocs_;
-
+    std::deque<alloc_policy> master_allocs_;
     ipc::spin_lock master_lock_;
 
     template <typename F>
@@ -60,11 +51,6 @@ protected:
     }
 
 public:
-    void swap(limited_recycler & rhs) {
-        IPC_UNUSED_ auto guard = ipc::detail::unique_lock(master_lock_);
-        master_allocs_.swap(rhs.master_allocs_);
-    }
-
     void try_recover(alloc_policy & alc) {
         IPC_UNUSED_ auto guard = ipc::detail::unique_lock(master_lock_);
         if (master_allocs_.empty()) return;
@@ -76,7 +62,7 @@ public:
         if (master_allocs_.size() >= 32) {
             take_first_do([](alloc_policy &) {}); // erase first
         }
-        master_allocs_.emplace(std::move(alc));
+        master_allocs_.emplace_back(std::move(alc));
     }
 
     IPC_CONSTEXPR_ auto try_replenish(alloc_policy&, std::size_t) noexcept {}
@@ -131,7 +117,6 @@ class empty_recycler {
 public:
     using alloc_policy = AllocP;
 
-    IPC_CONSTEXPR_ void swap(empty_recycler&)                     noexcept {}
     IPC_CONSTEXPR_ void try_recover(alloc_policy&)                noexcept {}
     IPC_CONSTEXPR_ auto try_replenish(alloc_policy&, std::size_t) noexcept {}
     IPC_CONSTEXPR_ void collect(alloc_policy&&)                   noexcept {}