Avoid copying the mutex in KqueueHandler

gansm · Jul 24, 2023 · f02cf27 · f02cf27
1 parent 84a8dcc
commit f02cf27
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/final/eventloop/kqueue_timer.cpp b/final/eventloop/kqueue_timer.cpp
@@ -98,6 +98,17 @@ static std::vector<struct kevent> time_events{};
 class KqueueHandler
 {
   public:
+    // Constructor
+    KqueueHandler() = default;
+
+    // Copy constructor - no mutex copies
+    KqueueHandler (const KqueueHandler&)
+    { }
+
+    // Move constructor - no mutex copies
+    KqueueHandler (KqueueHandler&&) noexcept
+    { }
+
     // Overloaded operator
     void operator () (Monitor* monitor, short revents)
     {
@@ -152,7 +163,7 @@ class KqueueHandler
 
   private:
     // Data members
-    std::mutex timer_nodes_mutex{};
+    mutable std::mutex timer_nodes_mutex{};
 };
 
 

diff --git a/final/eventloop/posix_timer.cpp b/final/eventloop/posix_timer.cpp
@@ -126,7 +126,7 @@ class SigAlrmHandler
     operator HandlerReturnType () const noexcept
     {
       // Converts a member function pointer to a function pointer
-      return invoke;
+      return &invoke;
     };
 
   private:
@@ -285,6 +285,18 @@ class SigAlrmHandlerInstaller
     }
 
   private:
+    // Disable copy constructor
+    SigAlrmHandlerInstaller (const SigAlrmHandlerInstaller&) = delete;
+
+    // Disable move constructor
+    SigAlrmHandlerInstaller (SigAlrmHandlerInstaller&&) noexcept = delete;
+
+      // Disable copy assignment operator (=)
+    auto operator = (const SigAlrmHandlerInstaller&) -> SigAlrmHandlerInstaller& = delete;
+
+    // Disable move assignment operator (=)
+    auto operator = (SigAlrmHandlerInstaller&&) noexcept -> SigAlrmHandlerInstaller& = delete;
+
     // Data member
     struct sigaction original_signal_handle{};
 };