andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

FileLoadManager: hangup bugfix

Browse Source 
GitOrigin-RevId: 7d8a922dfd3e07769507123e39df66d7ea3d00d3
This commit is contained in:
Arseny Smirnov 2018-06-07 14:37:42 +03:00
parent 2897cb80d4
commit 50a5098b0f
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/files/FileLoadManager.cpp
View File

@ -154,7 +154,7 @@ void FileLoadManager::update_local_file_location(QueryId id, const LocalFileLoca
} }
send_closure(node->loader_, &FileLoaderActor::update_local_file_location, local); send_closure(node->loader_, &FileLoaderActor::update_local_file_location, local);
} }
void FileLoadManager::close() { void FileLoadManager::hangup() {
nodes_container_.for_each([](auto id, auto &node) { node.loader_.reset(); }); nodes_container_.for_each([](auto id, auto &node) { node.loader_.reset(); });
stop_flag_ = true; stop_flag_ = true;
loop(); loop();

4
td/telegram/files/FileLoadManager.h
View File

@ -55,9 +55,6 @@ class FileLoadManager final : public Actor {
void update_local_file_location(QueryId id, const LocalFileLocation &local); void update_local_file_location(QueryId id, const LocalFileLocation &local);
void get_content(const FullLocalFileLocation &local_location, Promise<BufferSlice> promise); void get_content(const FullLocalFileLocation &local_location, Promise<BufferSlice> promise);
// just stops actor and all queries. no callbacks will be called
void close();
private: private:
struct Node { struct Node {
QueryId query_id_; QueryId query_id_;
@ -78,6 +75,7 @@ class FileLoadManager final : public Actor {
void start_up() override; void start_up() override;
void loop() override; void loop() override;
void hangup() override;
void hangup_shared() override; void hangup_shared() override;
void close_node(NodeId node_id); void close_node(NodeId node_id);

2
td/telegram/files/FileManager.cpp
View File

@ -463,8 +463,6 @@ void FileManager::init_actor() {
"FileGenerateManager", G()->get_slow_net_scheduler_id(), context_->create_reference()); "FileGenerateManager", G()->get_slow_net_scheduler_id(), context_->create_reference());
} }
FileManager::~FileManager() { FileManager::~FileManager() {
// NB: As FileLoadManager callback is just "this" pointer, this event must be processed immediately.
send_closure(std::move(file_load_manager_), &FileLoadManager::close);
} }
string FileManager::fix_file_extension(Slice file_name, Slice file_type, Slice file_extension) { string FileManager::fix_file_extension(Slice file_name, Slice file_type, Slice file_extension) {