BlockStorage/repertory
1
0
Fork 0
Code Issues 3 Pull Requests Releases 9 Wiki Activity

move timeout to utils

Browse Source
This commit is contained in:
sgraves76
2025-10-02 12:15:35 -05:00
parent ac97afe46c
commit cb092d124e
5 changed files with 152 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
repertory/librepertory/src/comm/packet/packet_client.cpp
View File

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

10
repertory/librepertory/src/comm/packet/packet_server.cpp
View File

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

2
repertory/librepertory/src/drives/winfsp/winfsp_drive.cpp
View File

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

6
repertory/librepertory/include/utils/timeout.hpp → support/include/utils/timeout.hpp
View File

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

4
repertory/librepertory/src/utils/timeout.cpp → support/src/utils/timeout.cpp
View File

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