Merge pull request #27 from 5cript/fix/scope_exit

Fixed ScopeExit class.
5cript · Dec 1, 2024 · c47f730 · c47f730
2 parents a8eda5b + a20be7a
commit c47f730
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git a/docs_source/sphinx/http/server.md b/docs_source/sphinx/http/server.md
@@ -43,7 +43,7 @@ int main()
 
     // stop the thread_pool on scope exit to guarantee that all asynchronous tasks are finished before the server is
     // destroyed.
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};
@@ -141,7 +141,7 @@ int main()
 
     // stop the thread_pool on scope exit to guarantee that all asynchronous tasks are finished before the server is
     // destroyed.
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};

diff --git a/examples/100_continue/main.cpp b/examples/100_continue/main.cpp
@@ -21,7 +21,7 @@ int main()
 
     // Create server.
     Roar::Server server{{.executor = pool.executor()}};
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};

diff --git a/examples/most_minimal/main.cpp b/examples/most_minimal/main.cpp
@@ -16,7 +16,7 @@ int main()
 
     // stop the thread_pool on scope exit to guarantee that all asynchronous tasks are finished before the server is
     // destroyed.
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};

diff --git a/examples/serve_directory/main.cpp b/examples/serve_directory/main.cpp
@@ -22,7 +22,7 @@ int main()
 
     // Create server.
     Roar::Server server{{.executor = pool.executor()}};
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};

diff --git a/examples/simple_server/main.cpp b/examples/simple_server/main.cpp
@@ -34,7 +34,7 @@ int main()
         .executor = pool.executor(),
         .onError = onAsynchronousError,
     }};
-    const auto shutdownPool = Roar::ScopeExit{[&pool]() {
+    const auto shutdownPool = Roar::ScopeExit{[&pool]() noexcept {
         pool.stop();
         pool.join();
     }};

diff --git a/include/roar/utility/scope_exit.hpp b/include/roar/utility/scope_exit.hpp
@@ -1,25 +1,52 @@
 #pragma once
 
+#include <boost/preprocessor/cat.hpp>
+
 #include <functional>
+#include <type_traits>
 #include <utility>
 
+#define ROAR_SE_UNIQUE_IDENTIFIER BOOST_PP_CAT(roar_se_unique_identifier_, __COUNTER__)
+
 namespace Roar
 {
-    template <typename EF>
     class ScopeExit
     {
       public:
-        ScopeExit(EF&& func)
-            : onExit_(std::forward<EF>(func))
+        template <typename FunctionT>
+        requires std::is_nothrow_invocable_v<FunctionT>
+        explicit ScopeExit(FunctionT&& func)
+            : onExit_(std::forward<FunctionT>(func))
         {}
         ~ScopeExit()
         {
-            onExit_();
+            if (onExit_)
+                onExit_();
+        }
+        ScopeExit(ScopeExit&& other) = delete;
+        ScopeExit& operator=(ScopeExit&& other) = delete;
+        ScopeExit(const ScopeExit&) = delete;
+        ScopeExit& operator=(const ScopeExit&) = delete;
+        void disarm()
+        {
+            onExit_ = {};
         }
 
       private:
         std::function<void()> onExit_;
     };
-    template <typename T>
-    ScopeExit(T) -> ScopeExit<T>;
+
+    namespace Detail
+    {
+        struct MakeScopeExitImpl
+        {
+            template <typename FunctionT>
+            auto operator->*(FunctionT&& fn) const
+            {
+                return ScopeExit{std::forward<FunctionT>(fn)};
+            }
+        };
+    }
+
+#define ROAR_ON_SCOPE_EXIT auto ROAR_SE_UNIQUE_IDENTIFIER = ::Roar::Detail::MakeScopeExitImpl{}->*[&]() noexcept
 }