move timeout to utils

repertory/librepertory/src/comm/packet/packet_client.cpp

@@ -93,7 +93,7 @@ auto packet_client::check_version(std::uint32_t client_version,
     boost::asio::io_context ctx{};
     client cli(ctx);
 
-    timeout connect_timeout(
+    utils::timeout connect_timeout(
         [&cli]() {
           event_system::instance().raise<packet_client_timeout>("connect",
                                                                 function_name);
@@ -131,7 +131,7 @@ auto packet_client::connect(client &cli) -> bool {
   REPERTORY_USES_FUNCTION_NAME();
 
   try {
-    timeout connect_timeout(
+    utils::timeout connect_timeout(
         [&cli]() {
           event_system::instance().raise<packet_client_timeout>("connect",
                                                                 function_name);
@@ -257,7 +257,7 @@ void packet_client::put_client(std::shared_ptr<client> &cli) {
 void packet_client::read_data(client &cli, data_buffer &buffer) const {
   REPERTORY_USES_FUNCTION_NAME();
 
-  timeout read_timeout(
+  utils::timeout read_timeout(
       [&cli]() {
         event_system::instance().raise<packet_client_timeout>("response",
                                                               function_name);
@@ -401,7 +401,7 @@ auto packet_client::send(std::string_view method, packet &request,
 void packet_client::write_data(client &cli, const packet &request) const {
   REPERTORY_USES_FUNCTION_NAME();
 
-  timeout write_timeout(
+  utils::timeout write_timeout(
       [&cli]() {
         event_system::instance().raise<packet_client_timeout>("request",
                                                               function_name);

repertory/librepertory/src/comm/packet/packet_server.cpp

@@ -114,8 +114,9 @@ auto packet_server::handshake(std::shared_ptr<connection> conn) const -> bool {
       }
     };
 
-    timeout write_timeout(timeout_handler, std::chrono::milliseconds(
-                                               server_handshake_timeout_ms));
+    utils::timeout write_timeout(
+        timeout_handler,
+        std::chrono::milliseconds(server_handshake_timeout_ms));
 
     auto bytes_written = boost::asio::write(
         conn->socket, boost::asio::buffer(boost::asio::buffer(buffer)));
@@ -124,8 +125,9 @@ auto packet_server::handshake(std::shared_ptr<connection> conn) const -> bool {
     if (bytes_written == buffer.size()) {
       conn->buffer.resize(to_read);
 
-      timeout read_timeout(timeout_handler, std::chrono::milliseconds(
-                                                server_handshake_timeout_ms));
+      utils::timeout read_timeout(
+          timeout_handler,
+          std::chrono::milliseconds(server_handshake_timeout_ms));
 
       std::uint32_t total_read{};
       while ((total_read < to_read) && conn->socket.is_open()) {

repertory/librepertory/src/drives/winfsp/winfsp_drive.cpp

@@ -136,7 +136,7 @@ auto winfsp_drive::winfsp_service::OnStart(ULONG /*Argc*/, PWSTR * /*Argv*/)
 auto winfsp_drive::winfsp_service::OnStop() -> NTSTATUS {
   REPERTORY_USES_FUNCTION_NAME();
 
-  timeout stop_timeout(
+  utils::timeout stop_timeout(
       []() {
         event_system::instance().raise<drive_stop_timed_out>(function_name);
         app_config::set_stop_requested();

support/include/utils/timeout.hpp

@@ -22,7 +22,9 @@
 #ifndef REPERTORY_INCLUDE_UTILS_TIMEOUT_HPP_
 #define REPERTORY_INCLUDE_UTILS_TIMEOUT_HPP_
 
-namespace repertory {
+#include "utils/config.hpp"
+
+namespace repertory::utils {
 class timeout final {
 public:
   using callback_t = std::function<void()>;
@@ -52,6 +54,6 @@ public:
 
   void reset();
 };
-} // namespace repertory
+} // namespace repertory::utils
 
 #endif // REPERTORY_INCLUDE_UTILS_TIMEOUT_HPP_

support/src/utils/timeout.cpp

@@ -21,7 +21,7 @@
 */
 #include "utils/timeout.hpp"
 
-namespace repertory {
+namespace repertory::utils {
 timeout::timeout(callback_t timeout_callback,
                  std::chrono::system_clock::duration duration)
     : duration_(duration),
@@ -79,4 +79,4 @@ void timeout::reset() {
   mutex_lock lock(timeout_mutex_);
   timeout_notify_.notify_all();
 }
-} // namespace repertory
+} // namespace repertory::utils