From 6fdda46869c64fccab9de06b0707afc866db63e0 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 28 Dec 2024 08:28:42 -0600 Subject: [PATCH] refactor --- .../include/file_manager/direct_open_file.hpp | 2 + .../file_manager/ring_buffer_open_file.hpp | 2 + .../src/file_manager/direct_open_file.cpp | 93 +++++++++--------- .../file_manager/ring_buffer_open_file.cpp | 94 +++++++++---------- 4 files changed, 91 insertions(+), 100 deletions(-) diff --git a/repertory/librepertory/include/file_manager/direct_open_file.hpp b/repertory/librepertory/include/file_manager/direct_open_file.hpp index bb6381b6..8de2b7e0 100644 --- a/repertory/librepertory/include/file_manager/direct_open_file.hpp +++ b/repertory/librepertory/include/file_manager/direct_open_file.hpp @@ -70,6 +70,8 @@ private: void reader_thread(); + void update_position(std::size_t count, bool is_forward); + public: auto close() -> bool override; diff --git a/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp b/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp index e63cd335..684897aa 100644 --- a/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp +++ b/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp @@ -71,6 +71,8 @@ private: void reader_thread(); + void update_position(std::size_t count, bool is_forward); + public: [[nodiscard]] static auto can_handle_file(std::uint64_t file_size, std::size_t chunk_size, diff --git a/repertory/librepertory/src/file_manager/direct_open_file.cpp b/repertory/librepertory/src/file_manager/direct_open_file.cpp index 8c3266ad..3e0e7f26 100644 --- a/repertory/librepertory/src/file_manager/direct_open_file.cpp +++ b/repertory/librepertory/src/file_manager/direct_open_file.cpp @@ -139,32 +139,7 @@ auto direct_open_file::download_chunk(std::size_t chunk, } void direct_open_file::forward(std::size_t count) { - mutex_lock chunk_lock(chunk_mtx_); - if ((ring_pos_ + count) > (total_chunks_ - 1U)) { - count = (total_chunks_ - 1U) - ring_pos_; - } - - if ((ring_pos_ + count) <= ring_end_) { - ring_pos_ += count; - } else { - auto added = count - (ring_end_ - ring_pos_); - if (added >= ring_state_.size()) { - ring_state_.set(0U, ring_state_.size(), false); - ring_pos_ += count; - ring_begin_ += added; - } else { - for (std::size_t idx = 0U; idx < added; ++idx) { - ring_state_[(ring_begin_ + idx) % ring_state_.size()] = false; - } - ring_begin_ += added; - ring_pos_ += count; - } - - ring_end_ = - std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); - } - - chunk_notify_.notify_all(); + return update_position(count, true); } auto direct_open_file::get_read_state() const -> boost::dynamic_bitset<> { @@ -178,30 +153,7 @@ auto direct_open_file::get_read_state(std::size_t chunk) const -> bool { } void direct_open_file::reverse(std::size_t count) { - mutex_lock chunk_lock(chunk_mtx_); - count = std::min(ring_pos_, count); - - if ((ring_pos_ - count) >= ring_begin_) { - ring_pos_ -= count; - } else { - auto removed = count - (ring_pos_ - ring_begin_); - if (removed >= ring_state_.size()) { - ring_state_.set(0U, ring_state_.size(), false); - ring_pos_ -= count; - ring_begin_ = ring_pos_; - } else { - for (std::size_t idx = 0U; idx < removed; ++idx) { - ring_state_[(ring_end_ - idx) % ring_state_.size()] = false; - } - ring_begin_ -= removed; - ring_pos_ -= count; - } - - ring_end_ = - std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); - } - - chunk_notify_.notify_all(); + return update_position(count, false); } auto direct_open_file::read(std::size_t read_size, std::uint64_t read_offset, @@ -320,4 +272,45 @@ void direct_open_file::set_api_path(const std::string &api_path) { open_file_base::set_api_path(api_path); chunk_notify_.notify_all(); } + +void direct_open_file::update_position(std::size_t count, bool is_forward) { + mutex_lock chunk_lock(chunk_mtx_); + + if (is_forward) { + if ((ring_pos_ + count) > (total_chunks_ - 1U)) { + count = (total_chunks_ - 1U) - ring_pos_; + } + } else { + count = std::min(ring_pos_, count); + } + + if (is_forward ? (ring_pos_ + count) <= ring_end_ + : (ring_pos_ - count) >= ring_begin_) { + ring_pos_ += is_forward ? count : -count; + } else { + auto delta = is_forward ? count - (ring_end_ - ring_pos_) + : count - (ring_pos_ - ring_begin_); + + if (delta >= ring_state_.size()) { + ring_state_.set(0U, ring_state_.size(), false); + ring_pos_ += is_forward ? count : -count; + ring_begin_ += is_forward ? delta : -delta; + } else { + for (std::size_t idx = 0U; idx < delta; ++idx) { + if (is_forward) { + ring_state_[(ring_begin_ + idx) % ring_state_.size()] = false; + } else { + ring_state_[(ring_end_ - idx) % ring_state_.size()] = false; + } + } + ring_begin_ += is_forward ? delta : -delta; + ring_pos_ += is_forward ? count : -count; + } + + ring_end_ = + std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); + } + + chunk_notify_.notify_all(); +} } // namespace repertory diff --git a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp index 9f61a586..4712bad8 100644 --- a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp +++ b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp @@ -214,32 +214,7 @@ auto ring_buffer_open_file::download_chunk(std::size_t chunk, } void ring_buffer_open_file::forward(std::size_t count) { - mutex_lock chunk_lock(chunk_mtx_); - if ((ring_pos_ + count) > (total_chunks_ - 1U)) { - count = (total_chunks_ - 1U) - ring_pos_; - } - - if ((ring_pos_ + count) <= ring_end_) { - ring_pos_ += count; - } else { - auto added = count - (ring_end_ - ring_pos_); - if (added >= ring_state_.size()) { - ring_state_.set(0U, ring_state_.size(), false); - ring_pos_ += count; - ring_begin_ += added; - } else { - for (std::size_t idx = 0U; idx < added; ++idx) { - ring_state_[(ring_begin_ + idx) % ring_state_.size()] = false; - } - ring_begin_ += added; - ring_pos_ += count; - } - - ring_end_ = - std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); - } - - chunk_notify_.notify_all(); + update_position(count, true); } auto ring_buffer_open_file::get_read_state() const -> boost::dynamic_bitset<> { @@ -387,30 +362,7 @@ void ring_buffer_open_file::reader_thread() { } void ring_buffer_open_file::reverse(std::size_t count) { - mutex_lock chunk_lock(chunk_mtx_); - count = std::min(ring_pos_, count); - - if ((ring_pos_ - count) >= ring_begin_) { - ring_pos_ -= count; - } else { - auto removed = count - (ring_pos_ - ring_begin_); - if (removed >= ring_state_.size()) { - ring_state_.set(0U, ring_state_.size(), false); - ring_pos_ -= count; - ring_begin_ = ring_pos_; - } else { - for (std::size_t idx = 0U; idx < removed; ++idx) { - ring_state_[(ring_end_ - idx) % ring_state_.size()] = false; - } - ring_begin_ -= removed; - ring_pos_ -= count; - } - - ring_end_ = - std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); - } - - chunk_notify_.notify_all(); + update_position(count, false); } void ring_buffer_open_file::set(std::size_t first_chunk, @@ -442,4 +394,46 @@ void ring_buffer_open_file::set_api_path(const std::string &api_path) { open_file_base::set_api_path(api_path); chunk_notify_.notify_all(); } + +void ring_buffer_open_file::update_position(std::size_t count, + bool is_forward) { + mutex_lock chunk_lock(chunk_mtx_); + + if (is_forward) { + if ((ring_pos_ + count) > (total_chunks_ - 1U)) { + count = (total_chunks_ - 1U) - ring_pos_; + } + } else { + count = std::min(ring_pos_, count); + } + + if (is_forward ? (ring_pos_ + count) <= ring_end_ + : (ring_pos_ - count) >= ring_begin_) { + ring_pos_ += is_forward ? count : -count; + } else { + auto delta = is_forward ? count - (ring_end_ - ring_pos_) + : count - (ring_pos_ - ring_begin_); + + if (delta >= ring_state_.size()) { + ring_state_.set(0U, ring_state_.size(), false); + ring_pos_ += is_forward ? count : -count; + ring_begin_ += is_forward ? delta : -delta; + } else { + for (std::size_t idx = 0U; idx < delta; ++idx) { + if (is_forward) { + ring_state_[(ring_begin_ + idx) % ring_state_.size()] = false; + } else { + ring_state_[(ring_end_ - idx) % ring_state_.size()] = false; + } + } + ring_begin_ += is_forward ? delta : -delta; + ring_pos_ += is_forward ? count : -count; + } + + ring_end_ = + std::min(total_chunks_ - 1U, ring_begin_ + ring_state_.size() - 1U); + } + + chunk_notify_.notify_all(); +} } // namespace repertory