cta/CTA#130 Helgrind gets spurious when using `std::mutex` in the catalogue.

Removed last use of std::mutex from the rdbms library

rdbms/ConnPool.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "common/exception/Exception.hpp"
+#include "common/threading/MutexLocker.hpp"
 #include "rdbms/ConnPool.hpp"
 
 #include <iostream>
@@ -56,10 +57,10 @@ void ConnPool::createConns(const uint64_t nbConns) {
 // getConn
 //------------------------------------------------------------------------------
 PooledConn ConnPool::getConn() {
-  std::unique_lock<std::mutex> lock(m_connsMutex);
+  threading::MutexLocker locker(m_connsMutex);
 
   while(m_conns.size() == 0 && m_nbConnsOnLoan == m_maxNbConns) {
-    m_connsCv.wait(lock);
+    m_connsCv.wait(locker);
   }
 
   if(m_conns.size() == 0) {
@@ -99,7 +100,7 @@ void ConnPool::returnConn(std::unique_ptr<Conn> conn) {
         // connection, if there is one, has been lost.  Delete all the connections
         // currently in the pool because their underlying TCP/IP connections may
         // also have been lost.
-        std::unique_lock<std::mutex> lock(m_connsMutex);
+        threading::MutexLocker locker(m_connsMutex);
         while(!m_conns.empty()) {
           m_conns.pop_front();
         }
@@ -107,17 +108,17 @@ void ConnPool::returnConn(std::unique_ptr<Conn> conn) {
           throw exception::Exception("Would have reached -1 connections on loan");
         }
         m_nbConnsOnLoan--;
-        m_connsCv.notify_one();
+        m_connsCv.signal();
         return;
       }
 
-      std::unique_lock<std::mutex> lock(m_connsMutex);
+      threading::MutexLocker locker(m_connsMutex);
       if(0 == m_nbConnsOnLoan) {
         throw exception::Exception("Would have reached -1 connections on loan");
       }
       m_nbConnsOnLoan--;
       m_conns.push_back(std::move(conn));
-      m_connsCv.notify_one();
+      m_connsCv.signal();
 
     // Else the connection is closed
     } else {
@@ -126,7 +127,7 @@ void ConnPool::returnConn(std::unique_ptr<Conn> conn) {
       // connection, if there is one, has been lost.  Delete all the connections
       // currently in the pool because their underlying TCP/IP connections may
       // also have been lost.
-      std::unique_lock<std::mutex> lock(m_connsMutex);
+      threading::MutexLocker locker(m_connsMutex);
       while(!m_conns.empty()) {
         m_conns.pop_front();
       }
@@ -134,7 +135,7 @@ void ConnPool::returnConn(std::unique_ptr<Conn> conn) {
         throw exception::Exception("Would have reached -1 connections on loan");
       }
       m_nbConnsOnLoan--;
-      m_connsCv.notify_one();
+      m_connsCv.signal();
     }
   } catch(exception::Exception &ex) {
     throw exception::Exception(std::string(__FUNCTION__) + " failed: " + ex.getMessage().str());

rdbms/ConnPool.hpp

@@ -18,14 +18,14 @@
 
 #pragma once
 
-#include "Conn.hpp"
-#include "ConnFactory.hpp"
-#include "PooledConn.hpp"
+#include "common/threading/CondVar.hpp"
+#include "common/threading/Mutex.hpp"
+#include "rdbms/Conn.hpp"
+#include "rdbms/ConnFactory.hpp"
+#include "rdbms/PooledConn.hpp"
 
-#include <condition_variable>
 #include <list>
 #include <memory>
-#include <mutex>
 
 namespace cta {
 namespace rdbms {
@@ -91,13 +91,13 @@ private:
   /**
    * Mutex used to serialize access to the database connections within the pool.
    */
-  std::mutex m_connsMutex;
+  threading::Mutex m_connsMutex;
 
   /**
    * Condition variable used by threads returning connections to the pool to
    * notify threads waiting for connections.
    */
-  std::condition_variable m_connsCv;
+  threading::CondVar m_connsCv;
 
   /**
    * The database connections within the pool.