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

Add source to ttl_unregister_message.

Browse Source 
GitOrigin-RevId: d25685de6cbb92569f29f22e111b612d76e4fcb9
This commit is contained in:
levlam 2018-07-25 16:49:44 +03:00
parent cf1ece71a0
commit c63aaf7cde
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/MessagesManager.cpp
View File

@ -9716,14 +9716,15 @@ void MessagesManager::ttl_register_message(DialogId dialog_id, const Message *me
ttl_update_timeout(now); ttl_update_timeout(now);
} }
void MessagesManager::ttl_unregister_message(DialogId dialog_id, const Message *message, double now) { void MessagesManager::ttl_unregister_message(DialogId dialog_id, const Message *message, double now,
const char *source) {
if (message->ttl_expires_at == 0) { if (message->ttl_expires_at == 0) {
return; return;
} }
TtlNode ttl_node(dialog_id, message->message_id); TtlNode ttl_node(dialog_id, message->message_id);
auto it = ttl_nodes_.find(ttl_node); auto it = ttl_nodes_.find(ttl_node);
CHECK(it != ttl_nodes_.end()); CHECK(it != ttl_nodes_.end()) << dialog_id << " " << message->message_id << " " << source << " " << G()->close_flag();
auto *heap_node = it->as_heap_node(); auto *heap_node = it->as_heap_node();
if (heap_node->in_heap()) { if (heap_node->in_heap()) {
ttl_heap_.erase(heap_node); ttl_heap_.erase(heap_node);
@ -9770,7 +9771,7 @@ void MessagesManager::on_message_ttl_expired(Dialog *d, Message *message) {
CHECK(message != nullptr); CHECK(message != nullptr);
CHECK(message->ttl > 0); CHECK(message->ttl > 0);
CHECK(d->dialog_id.get_type() != DialogType::SecretChat); CHECK(d->dialog_id.get_type() != DialogType::SecretChat);
ttl_unregister_message(d->dialog_id, message, Time::now()); ttl_unregister_message(d->dialog_id, message, Time::now(), "on_message_ttl_expired");
on_message_ttl_expired_impl(d, message); on_message_ttl_expired_impl(d, message);
send_update_message_content(d->dialog_id, message->message_id, message->content.get(), message->date, send_update_message_content(d->dialog_id, message->message_id, message->content.get(), message->date,
message->is_content_secret, "on_message_ttl_expired"); message->is_content_secret, "on_message_ttl_expired");
@ -11761,7 +11762,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
default: default:
UNREACHABLE(); UNREACHABLE();
} }
ttl_unregister_message(d->dialog_id, result.get(), Time::now()); ttl_unregister_message(d->dialog_id, result.get(), Time::now(), "do_delete_message");
return result; return result;
} }
@ -11808,7 +11809,7 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
default: default:
UNREACHABLE(); UNREACHABLE();
} }
ttl_unregister_message(d->dialog_id, m.get(), Time::now()); ttl_unregister_message(d->dialog_id, m.get(), Time::now(), "do_delete_all_dialog_messages");
m = nullptr; m = nullptr;
} }

2
td/telegram/MessagesManager.h
View File

@ -2516,7 +2516,7 @@ class MessagesManager : public Actor {
void ttl_on_view(const Dialog *d, Message *message, double view_date, double now); void ttl_on_view(const Dialog *d, Message *message, double view_date, double now);
bool ttl_on_open(Dialog *d, Message *message, double now, bool is_local_read); bool ttl_on_open(Dialog *d, Message *message, double now, bool is_local_read);
void ttl_register_message(DialogId dialog_id, const Message *message, double now); void ttl_register_message(DialogId dialog_id, const Message *message, double now);
void ttl_unregister_message(DialogId dialog_id, const Message *message, double now); void ttl_unregister_message(DialogId dialog_id, const Message *message, double now, const char *source);
void ttl_loop(double now); void ttl_loop(double now);
void ttl_update_timeout(double now); void ttl_update_timeout(double now);