minor build fixes

kentslaney · Dec 13, 2023 · c936fdf · c936fdf
1 parent b7305ca
commit c936fdf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/include/ClientPool.h b/include/ClientPool.h
@@ -11,14 +11,14 @@ void duplicate_strings(const char* const * strs, const size_t n,
                        std::vector<std::array<char, N> >& out, std::vector<char*>& refs) {
     out.resize(n);
     refs.resize(n);
-    for (int i = 0; i < n; i++) {
+    for (size_t i = 0; i < n; i++) {
         if (strs == NULL || strs[i] == NULL) {
           out[i][0] = '\0';
           refs[i] = NULL;
           continue;
         }
         std::snprintf(out[i].data(), N, "%s", strs[i]);
-        refs[i] = &out[i];
+        refs[i] = out[i].data();
     }
 }
 

diff --git a/include/LockPool.h b/include/LockPool.h
@@ -83,7 +83,7 @@ class LockPool : OrderedLock {
     m_waiting = unlock();
   }
 
-  size_t workerIndex(const std::mutex** worker) {
+  size_t workerIndex(std::mutex** worker) {
     return worker - m_thread_workers.data();
   }
 };

diff --git a/src/ClientPool.cpp b/src/ClientPool.cpp
@@ -11,7 +11,7 @@ ClientPool::ClientPool(): m_initial_clients(1), m_max_clients(4), m_max_growth(4
   memset(m_opt_value, 0, sizeof m_opt_value);
 }
 
-ClientPool::ClientPool() {
+ClientPool::~ClientPool() {
 }
 
 void ClientPool::config(config_options_t opt, int val) {
@@ -75,7 +75,7 @@ int ClientPool::setup(Client* c) {
       c->config(static_cast<config_options_t>(i), m_opt_value[i]);
     }
   }
-  c->init(m_hosts.data(), m_ports.data(), m_hosts.size(), m_aliases.data());
+  return c->init(m_hosts.data(), m_ports.data(), m_hosts.size(), m_aliases.data());
 }
 
 // if called outside acquire, needs to own m_acquiring_growth
@@ -93,6 +93,8 @@ int ClientPool::growPool(size_t by) {
       rv.store(err, std::memory_order_relaxed);
     }
   });
+  // adds workers with non-zero return values
+  // if changed, acquire should probably raise rather than hang
   addWorkers(by);
   return rv;
 }