From 73e5a672b8b250b83c3ef8615329e1511408ef74 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 31 Oct 2021 10:36:16 +0100
Subject: [PATCH] Fix problem with counting the PoolGuard

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 src/ipc/context.rs | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/ipc/context.rs b/src/ipc/context.rs
index f8f7c30b..beff8e25 100644
--- a/src/ipc/context.rs
+++ b/src/ipc/context.rs
@@ -88,7 +88,6 @@ pub struct PooledContext {
     contexts: Vec<PoolGuard<Context>>,
 }
 
-#[derive(Clone)]
 pub struct PoolGuard<T>
 where
     T: Clone,
@@ -117,6 +116,20 @@ where
     }
 }
 
+impl<T> Clone for PoolGuard<T>
+where
+    T: Clone,
+{
+    fn clone(&self) -> Self {
+        self.acquire();
+
+        Self {
+            inner: self.inner.clone(),
+            count: Arc::clone(&self.count),
+        }
+    }
+}
+
 impl<T> Drop for PoolGuard<T>
 where
     T: Clone,
@@ -137,19 +150,18 @@ where
         }
     }
 
-    /// Acquires the context by adding 1 to the count and
-    /// returning the cloned variant
+    /// Acquires the context by adding 1 to the count
     #[tracing::instrument(level = "trace", skip_all)]
-    pub(crate) fn acquire(&self) -> Self {
-        self.count.fetch_add(1, Ordering::Relaxed);
-
-        self.clone()
+    pub(crate) fn acquire(&self) {
+        let count = self.count.fetch_add(1, Ordering::Relaxed);
+        tracing::trace!(count);
     }
 
     /// Releases the connection by subtracting from the stored count
     #[tracing::instrument(level = "trace", skip_all)]
     pub(crate) fn release(&self) {
-        self.count.fetch_sub(1, Ordering::Relaxed);
+        let count = self.count.fetch_sub(1, Ordering::Relaxed);
+        tracing::trace!(count);
     }
 
     pub(crate) fn count(&self) -> usize {
@@ -173,6 +185,6 @@ impl PooledContext {
             .iter()
             .min_by_key(|c| c.count())
             .unwrap()
-            .acquire()
+            .clone()
     }
 }