redundancies

kentslaney · Dec 21, 2023 · 550ef71 · 550ef71
1 parent 07964a8
commit 550ef71
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 30 deletions.
diff --git a/include/LockPool.h b/include/LockPool.h
@@ -5,23 +5,13 @@
 #include <queue>
 #include <deque>
 #include <vector>
-#include <atomic>
-#include <memory>
-#include <list>
-#include <algorithm>
-
-#include <cstdarg>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include <stdio.h>
-#include <assert.h>
 
 namespace douban {
 namespace mc {
 
 // https://stackoverflow.com/a/14792685/3476782
 class OrderedLock {
-  std::list<std::condition_variable*> m_fifo_locks;
+  std::queue<std::condition_variable*> m_fifo_locks;
 protected:
   std::mutex m_fifo_access;
   bool m_locked;
@@ -32,10 +22,9 @@ class OrderedLock {
     std::unique_lock<std::mutex> acquire(m_fifo_access);
     if (m_locked) {
       std::condition_variable signal;
-      m_fifo_locks.emplace_back(&signal);
+      m_fifo_locks.emplace(&signal);
       signal.wait(acquire);
-      m_fifo_locks.pop_front();
-      assert(acquire.owns_lock());
+      m_fifo_locks.pop();
     } else {
       m_locked = true;
     }
@@ -86,9 +75,7 @@ class LockPool : public OrderedLock {
     std::transform(
       muxes, muxes + n, std::back_inserter(m_thread_workers),
       static_cast<std::mutex*(*)(std::mutex&)>(std::addressof<std::mutex>));
-    for (int i = n; i > 0; i--) {
-      unlock();
-    }
+    unlock();
   }
 
   int acquireWorker() {
@@ -98,7 +85,6 @@ class LockPool : public OrderedLock {
     if (!m_available.empty()) {
       unlock();
     }
-    assert(m_available.size() <= m_thread_workers.size());
     return res;
   }
 

diff --git a/src/ClientPool.cpp b/src/ClientPool.cpp
@@ -1,5 +1,6 @@
 //#include <execution>
 //#include <thread>
+#include <atomic>
 #include <array>
 #include "ClientPool.h"
 

diff --git a/tests/test_client_pool.cpp b/tests/test_client_pool.cpp
@@ -39,13 +39,13 @@ TEST(test_client_pool, simple_set_get) {
   for (unsigned int j = 0; j < n_ops; j++) {
     gen_random(key, data_size);
     gen_random(value, data_size);
-    auto c = pool->_acquire();
-    c->c.set(&keys, data_lens, flags, exptime, NULL, 0, &values, data_lens, 1, &m_results, &nResults);
-    c->c.destroyMessageResult();
-    c->c.get(&keys, data_lens, 1, &r_results, &nResults);
+    auto c = pool->acquire();
+    c->set(&keys, data_lens, flags, exptime, NULL, 0, &values, data_lens, 1, &m_results, &nResults);
+    c->destroyMessageResult();
+    c->get(&keys, data_lens, 1, &r_results, &nResults);
     ASSERT_N_STREQ(r_results[0]->data_block, values, data_size);
-    c->c.destroyRetrievalResult();
-    pool->_release(c);
+    c->destroyRetrievalResult();
+    pool->release(c);
   }
 
   delete pool;
@@ -81,13 +81,13 @@ TEST(test_client_pool, threaded_set_get) {
       for (unsigned int j = 0; j < n_ops; j++) {
         gen_random(key, data_size);
         gen_random(value, data_size);
-        auto c = pool->_acquire();
-        c->c.set(&keys, data_lens, flags, exptime, NULL, 0, &values, data_lens, 1, &m_results, &nResults);
-        c->c.destroyMessageResult();
-        c->c.get(&keys, data_lens, 1, &r_results, &nResults);
+        auto c = pool->acquire();
+        c->set(&keys, data_lens, flags, exptime, NULL, 0, &values, data_lens, 1, &m_results, &nResults);
+        c->destroyMessageResult();
+        c->get(&keys, data_lens, 1, &r_results, &nResults);
         ASSERT_N_STREQ(r_results[0]->data_block, values, data_size);
-        c->c.destroyRetrievalResult();
-        pool->_release(c);
+        c->destroyRetrievalResult();
+        pool->release(c);
       }
     });
   }