From 400c97cebd7dcac59e43ba6ae47096dbeb7552b7 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 22 Jan 2025 13:29:08 -0600 Subject: [PATCH] refactor --- .../librepertory/include/file_manager/cache_size_mgr.hpp | 5 +++++ repertory/librepertory/include/file_manager/file_manager.hpp | 5 +++++ repertory/librepertory/src/file_manager/cache_size_mgr.cpp | 2 +- repertory/librepertory/src/file_manager/file_manager.cpp | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/repertory/librepertory/include/file_manager/cache_size_mgr.hpp b/repertory/librepertory/include/file_manager/cache_size_mgr.hpp index 1959f1bb..7da3f278 100644 --- a/repertory/librepertory/include/file_manager/cache_size_mgr.hpp +++ b/repertory/librepertory/include/file_manager/cache_size_mgr.hpp @@ -28,6 +28,11 @@ namespace repertory { class app_config; class cache_size_mgr final { +private: + static constexpr const std::chrono::seconds cache_wait_secs{ + 5s, + }; + public: cache_size_mgr(const cache_size_mgr &) = delete; cache_size_mgr(cache_size_mgr &&) = delete; diff --git a/repertory/librepertory/include/file_manager/file_manager.hpp b/repertory/librepertory/include/file_manager/file_manager.hpp index 728b0e36..5acd2ae9 100644 --- a/repertory/librepertory/include/file_manager/file_manager.hpp +++ b/repertory/librepertory/include/file_manager/file_manager.hpp @@ -39,6 +39,11 @@ class i_provider; class file_manager final : public i_file_manager, public i_upload_manager { E_CONSUMER(); +private: + static constexpr const std::chrono::seconds queue_wait_secs{ + 5s, + }; + public: file_manager(app_config &config, i_provider &provider); diff --git a/repertory/librepertory/src/file_manager/cache_size_mgr.cpp b/repertory/librepertory/src/file_manager/cache_size_mgr.cpp index 0a3da1d7..8b9ef623 100644 --- a/repertory/librepertory/src/file_manager/cache_size_mgr.cpp +++ b/repertory/librepertory/src/file_manager/cache_size_mgr.cpp @@ -70,7 +70,7 @@ auto cache_size_mgr::expand(std::uint64_t size) -> api_error { max_cache_size); last_cache_size = cache_size_; } - notify_.wait_for(lock, 5s); + notify_.wait_for(lock, cache_wait_secs); } notify_.notify_all(); diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp index d9ee0f38..0731a8ca 100644 --- a/repertory/librepertory/src/file_manager/file_manager.cpp +++ b/repertory/librepertory/src/file_manager/file_manager.cpp @@ -1027,7 +1027,7 @@ void file_manager::upload_completed(const file_upload_completed &evt) { evt.get_api_path(), evt.get_source(), err); queue_upload(evt.get_api_path(), evt.get_source(), true); - upload_notify_.wait_for(upload_lock, 5s); + upload_notify_.wait_for(upload_lock, queue_wait_secs); } } } @@ -1091,7 +1091,7 @@ void file_manager::upload_handler() { } if (should_wait) { - upload_notify_.wait_for(upload_lock, 5s); + upload_notify_.wait_for(upload_lock, queue_wait_secs); } upload_notify_.notify_all();