tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add crash in get_saved_animations_hash debug.

Browse Source 
GitOrigin-RevId: a4e2f469c4ddcb91101d93490bb1c6fade3837f7
This commit is contained in:
levlam 2018-08-05 17:03:08 +03:00
parent f15105bd9a
commit 3616f205bb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
td/telegram/AnimationsManager.cpp
View File

@ -394,7 +394,7 @@ void AnimationsManager::reload_saved_animations(bool force) {
(next_saved_animations_load_time_ < Time::now() || force)) { (next_saved_animations_load_time_ < Time::now() || force)) {
LOG_IF(INFO, force) << "Reload saved animations"; LOG_IF(INFO, force) << "Reload saved animations";
next_saved_animations_load_time_ = -1; next_saved_animations_load_time_ = -1;
td_->create_handler<GetSavedGifsQuery>()->send(get_saved_animations_hash()); td_->create_handler<GetSavedGifsQuery>()->send(get_saved_animations_hash("reload_saved_animations"));
} }
} }
@ -497,8 +497,9 @@ void AnimationsManager::on_get_saved_animations(
on_load_saved_animations_finished(std::move(saved_animation_ids)); on_load_saved_animations_finished(std::move(saved_animation_ids));
LOG_IF(ERROR, get_saved_animations_hash() != saved_animations->hash_) LOG_IF(ERROR, get_saved_animations_hash("on_get_saved_animations") != saved_animations->hash_)
<< "Saved animations hash mismatch: " << saved_animations->hash_ << " vs " << get_saved_animations_hash(); << "Saved animations hash mismatch: " << saved_animations->hash_ << " vs "
<< get_saved_animations_hash("on_get_saved_animations 2");
} }
void AnimationsManager::on_get_saved_animations_failed(Status error) { void AnimationsManager::on_get_saved_animations_failed(Status error) {
@ -511,7 +512,7 @@ void AnimationsManager::on_get_saved_animations_failed(Status error) {
} }
} }
int32 AnimationsManager::get_saved_animations_hash() const { int32 AnimationsManager::get_saved_animations_hash(const char *source) const {
vector<uint32> numbers; vector<uint32> numbers;
numbers.reserve(saved_animation_ids_.size() * 2); numbers.reserve(saved_animation_ids_.size() * 2);
for (auto animation_id : saved_animation_ids_) { for (auto animation_id : saved_animation_ids_) {
@ -519,7 +520,7 @@ int32 AnimationsManager::get_saved_animations_hash() const {
CHECK(animation != nullptr); CHECK(animation != nullptr);
auto file_view = td_->file_manager_->get_file_view(animation_id); auto file_view = td_->file_manager_->get_file_view(animation_id);
CHECK(file_view.has_remote_location()); CHECK(file_view.has_remote_location());
CHECK(file_view.remote_location().is_document()); CHECK(file_view.remote_location().is_document()) << source << " " << file_view.remote_location();
auto id = static_cast<uint64>(file_view.remote_location().get_id()); auto id = static_cast<uint64>(file_view.remote_location().get_id());
numbers.push_back(static_cast<uint32>(id >> 32)); numbers.push_back(static_cast<uint32>(id >> 32));
numbers.push_back(static_cast<uint32>(id & 0xFFFFFFFF)); numbers.push_back(static_cast<uint32>(id & 0xFFFFFFFF));

2
td/telegram/AnimationsManager.h
View File

@ -99,7 +99,7 @@ class AnimationsManager : public Actor {
FileId on_get_animation(std::unique_ptr<Animation> new_animation, bool replace); FileId on_get_animation(std::unique_ptr<Animation> new_animation, bool replace);
int32 get_saved_animations_hash() const; int32 get_saved_animations_hash(const char *source) const;
void add_saved_animation_inner(FileId animation_id, Promise<Unit> &&promise); void add_saved_animation_inner(FileId animation_id, Promise<Unit> &&promise);