rev2

dr3mro · Jan 2, 2025 · 4f92e33 · 4f92e33
1 parent 32a96a6
commit 4f92e33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/database/inuseguard.cpp b/src/database/inuseguard.cpp
@@ -1,14 +1,15 @@
 #include "database/inuseguard.hpp"
 
 #include <atomic>
+#include <chrono>
 #include <condition_variable>
 #include <mutex>
 
 InUseGuard::InUseGuard(std::atomic<bool>& in_use, std::mutex& mtx, std::condition_variable& _cv) : isConnectionInUse_(in_use), mutex_(mtx), conditionVar_(_cv)
 {
     std::unique_lock<std::mutex> lock(mutex_);
 
-    conditionVar_.wait(lock, [this] { return !isConnectionInUse_.load(); });
+    conditionVar_.wait_for(lock, std::chrono::seconds(1), [this]() { return !isConnectionInUse_.load(); });
 
     isConnectionInUse_.store(true);
 }

diff --git a/src/database/inuseguard.hpp b/src/database/inuseguard.hpp
@@ -5,13 +5,13 @@
 class InUseGuard
 {
    public:
+    explicit InUseGuard(std::atomic<bool>& in_use, std::mutex& mtx, std::condition_variable& _cv);
+    InUseGuard()                             = delete;
     InUseGuard(const InUseGuard&)            = default;
     InUseGuard(InUseGuard&&)                 = delete;
     InUseGuard& operator=(const InUseGuard&) = delete;
     InUseGuard& operator=(InUseGuard&&)      = delete;
-    InUseGuard(std::atomic<bool>& in_use, std::mutex& mtx, std::condition_variable& _cv);
-
-    ~InUseGuard();
+    virtual ~InUseGuard();
 
    private:
     std::atomic<bool>&       isConnectionInUse_; /*NOLINT*/