From 8fee0251f9de8511d14dc6a86b460691cc9568c7 Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 13 Jul 2024 00:48:47 +0300 Subject: [PATCH] Remove unused start_part result value. --- td/telegram/files/FileDownloader.cpp | 5 ++--- td/telegram/files/FileDownloader.h | 5 +++-- td/telegram/files/FileLoader.cpp | 18 +----------------- td/telegram/files/FileLoader.h | 4 +--- td/telegram/files/FileUploader.cpp | 5 ++--- td/telegram/files/FileUploader.h | 3 +-- 6 files changed, 10 insertions(+), 30 deletions(-) diff --git a/td/telegram/files/FileDownloader.cpp b/td/telegram/files/FileDownloader.cpp index ed111a4dd..ecd64d1be 100644 --- a/td/telegram/files/FileDownloader.cpp +++ b/td/telegram/files/FileDownloader.cpp @@ -18,7 +18,6 @@ #include "td/utils/as.h" #include "td/utils/base64.h" #include "td/utils/buffer.h" -#include "td/utils/common.h" #include "td/utils/crypto.h" #include "td/utils/format.h" #include "td/utils/logging.h" @@ -223,7 +222,7 @@ Result FileDownloader::should_restart_part(Part part, const NetQueryPtr &n return false; } -Result> FileDownloader::start_part(Part part, int32 part_count, int64 streaming_offset) { +Result FileDownloader::start_part(Part part, int32 part_count, int64 streaming_offset) { if (encryption_key_.is_secret()) { part.size = (part.size + 15) & ~15; // fix for last part } @@ -282,7 +281,7 @@ Result> FileDownloader::start_part(Part part, int32 } } net_query->file_type_ = narrow_cast(remote_.file_type_); - return std::make_pair(std::move(net_query), false); + return std::move(net_query); } Status FileDownloader::check_net_query(NetQueryPtr &net_query) { diff --git a/td/telegram/files/FileDownloader.h b/td/telegram/files/FileDownloader.h index ee13c0d8d..6ca6c0c87 100644 --- a/td/telegram/files/FileDownloader.h +++ b/td/telegram/files/FileDownloader.h @@ -22,6 +22,7 @@ #include namespace td { + class FileDownloader final : public FileLoader { public: class Callback { @@ -87,8 +88,7 @@ class FileDownloader final : public FileLoader { Status on_ok(int64 size) final TD_WARN_UNUSED_RESULT; void on_error(Status status) final; Result should_restart_part(Part part, const NetQueryPtr &net_query) final TD_WARN_UNUSED_RESULT; - Result> start_part(Part part, int32 part_count, - int64 streaming_offset) final TD_WARN_UNUSED_RESULT; + Result start_part(Part part, int32 part_count, int64 streaming_offset) final TD_WARN_UNUSED_RESULT; Result process_part(Part part, NetQueryPtr net_query) final TD_WARN_UNUSED_RESULT; void on_progress(Progress progress) final; Status process_check_query(NetQueryPtr net_query) final; @@ -102,4 +102,5 @@ class FileDownloader final : public FileLoader { Status check_net_query(NetQueryPtr &net_query); }; + } // namespace td diff --git a/td/telegram/files/FileLoader.cpp b/td/telegram/files/FileLoader.cpp index 388d46c46..4ace79f26 100644 --- a/td/telegram/files/FileLoader.cpp +++ b/td/telegram/files/FileLoader.cpp @@ -7,7 +7,6 @@ #include "td/telegram/files/FileLoader.h" #include "td/telegram/files/FileLoaderUtils.h" -#include "td/telegram/files/ResourceManager.h" #include "td/telegram/Global.h" #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/UniqueId.h" @@ -18,8 +17,6 @@ #include "td/utils/misc.h" #include "td/utils/ScopeGuard.h" -#include - namespace td { void FileLoader::set_resource_manager(ActorShared resource_manager) { @@ -192,9 +189,6 @@ Status FileLoader::do_loop() { after_start_parts(); }; while (true) { - if (blocking_id_ != 0) { - break; - } if (resource_state_.unused() < narrow_cast(parts_manager_.get_part_size())) { VLOG(file_loader) << "Receive only " << resource_state_.unused() << " resource"; break; @@ -206,15 +200,8 @@ Status FileLoader::do_loop() { VLOG(file_loader) << "Start part " << tag("id", part.id) << tag("size", part.size); resource_state_.start_use(static_cast(part.size)); - TRY_RESULT(query_flag, start_part(part, parts_manager_.get_part_count(), parts_manager_.get_streaming_offset())); - NetQueryPtr query; - bool is_blocking; - std::tie(query, is_blocking) = std::move(query_flag); + TRY_RESULT(query, start_part(part, parts_manager_.get_part_count(), parts_manager_.get_streaming_offset())); uint64 unique_id = UniqueId::next(); - if (is_blocking) { - CHECK(blocking_id_ == 0); - blocking_id_ = unique_id; - } part_map_[unique_id] = std::make_pair(part, query->cancel_slot_.get_signal_new()); // part_map_[unique_id] = std::make_pair(part, query.get_weak()); @@ -259,9 +246,6 @@ void FileLoader::on_result(NetQueryPtr query) { return; } auto unique_id = get_link_token(); - if (unique_id == blocking_id_) { - blocking_id_ = 0; - } if (UniqueId::extract_key(unique_id) == COMMON_QUERY_KEY) { on_common_query(std::move(query)); return loop(); diff --git a/td/telegram/files/FileLoader.h b/td/telegram/files/FileLoader.h index 160448de9..4393c7096 100644 --- a/td/telegram/files/FileLoader.h +++ b/td/telegram/files/FileLoader.h @@ -61,8 +61,7 @@ class FileLoader : public FileLoaderActor { virtual Status before_start_parts() { return Status::OK(); } - virtual Result> start_part(Part part, int part_count, - int64 streaming_offset) TD_WARN_UNUSED_RESULT = 0; + virtual Result start_part(Part part, int part_count, int64 streaming_offset) TD_WARN_UNUSED_RESULT = 0; virtual void after_start_parts() { } virtual Result process_part(Part part, NetQueryPtr net_query) TD_WARN_UNUSED_RESULT = 0; @@ -106,7 +105,6 @@ class FileLoader : public FileLoaderActor { ActorShared resource_manager_; ResourceState resource_state_; PartsManager parts_manager_; - uint64 blocking_id_{0}; std::map>> part_map_; bool ordered_flag_ = false; OrderedEventsProcessor> ordered_parts_; diff --git a/td/telegram/files/FileUploader.cpp b/td/telegram/files/FileUploader.cpp index d7fe81090..27eeab4c5 100644 --- a/td/telegram/files/FileUploader.cpp +++ b/td/telegram/files/FileUploader.cpp @@ -14,7 +14,6 @@ #include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" -#include "td/utils/common.h" #include "td/utils/crypto.h" #include "td/utils/format.h" #include "td/utils/logging.h" @@ -249,7 +248,7 @@ void FileUploader::after_start_parts() { try_release_fd(); } -Result> FileUploader::start_part(Part part, int32 part_count, int64 streaming_offset) { +Result FileUploader::start_part(Part part, int32 part_count, int64 streaming_offset) { auto padded_size = part.size; if (encryption_key_.is_secret()) { padded_size = (padded_size + 15) & ~15; @@ -287,7 +286,7 @@ Result> FileUploader::start_part(Part part, int32 p net_query = G()->net_query_creator().create(query, {}, DcId::main(), NetQuery::Type::Upload); } net_query->file_type_ = narrow_cast(file_type_); - return std::make_pair(std::move(net_query), false); + return std::move(net_query); } Result FileUploader::process_part(Part part, NetQueryPtr net_query) { diff --git a/td/telegram/files/FileUploader.h b/td/telegram/files/FileUploader.h index de711d2d6..1de0826dc 100644 --- a/td/telegram/files/FileUploader.h +++ b/td/telegram/files/FileUploader.h @@ -67,8 +67,7 @@ class FileUploader final : public FileLoader { void on_error(Status status) final; Status before_start_parts() final; void after_start_parts() final; - Result> start_part(Part part, int32 part_count, - int64 streaming_offset) final TD_WARN_UNUSED_RESULT; + Result start_part(Part part, int32 part_count, int64 streaming_offset) final TD_WARN_UNUSED_RESULT; Result process_part(Part part, NetQueryPtr net_query) final TD_WARN_UNUSED_RESULT; void on_progress(Progress progress) final; Result on_update_local_location(const LocalFileLocation &location,