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

Implement find_unloadable_messages with traverse_messages.

Browse Source
This commit is contained in:
levlam 2023-05-02 21:54:11 +03:00
parent d6ccdfeac6
commit e9ee762f60
2 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
td/telegram/MessagesManager.cpp
View File

@ -11624,25 +11624,23 @@ vector<MessageId> MessagesManager::find_dialog_messages(const Dialog *d,
return message_ids; return message_ids;
} }
void MessagesManager::find_unloadable_messages(const Dialog *d, int32 unload_before_date, vector<MessageId> MessagesManager::find_unloadable_messages(const Dialog *d, int32 unload_before_date,
const OrderedMessage *ordered_message, vector<MessageId> &message_ids,
bool &has_left_to_unload_messages) const { bool &has_left_to_unload_messages) const {
if (ordered_message == nullptr) { vector<MessageId> message_ids;
return; d->ordered_messages.traverse_messages(
} [&](MessageId message_id) {
if (message_ids.size() >= MAX_UNLOADED_MESSAGES) { if (message_ids.size() >= MAX_UNLOADED_MESSAGES) {
has_left_to_unload_messages = true; has_left_to_unload_messages = true;
return; return false;
} }
return true;
find_unloadable_messages(d, unload_before_date, ordered_message->left.get(), message_ids, },
has_left_to_unload_messages); [&](MessageId message_id) {
const Message *m = get_message(d, message_id);
const Message *m = get_message(d, ordered_message->message_id);
CHECK(m != nullptr); CHECK(m != nullptr);
if (can_unload_message(d, m)) { if (can_unload_message(d, m)) {
if (m->last_access_date <= unload_before_date) { if (m->last_access_date <= unload_before_date) {
message_ids.push_back(ordered_message->message_id); message_ids.push_back(message_id);
} else { } else {
has_left_to_unload_messages = true; has_left_to_unload_messages = true;
} }
@ -11650,11 +11648,11 @@ void MessagesManager::find_unloadable_messages(const Dialog *d, int32 unload_bef
if (has_left_to_unload_messages && m->date > unload_before_date) { if (has_left_to_unload_messages && m->date > unload_before_date) {
// we aren't interested in unloading too new messages // we aren't interested in unloading too new messages
return; return false;
} }
return true;
find_unloadable_messages(d, unload_before_date, ordered_message->right.get(), message_ids, });
has_left_to_unload_messages); return message_ids;
} }
void MessagesManager::delete_dialog_messages_by_sender(DialogId dialog_id, DialogId sender_dialog_id, void MessagesManager::delete_dialog_messages_by_sender(DialogId dialog_id, DialogId sender_dialog_id,
@ -11919,10 +11917,9 @@ void MessagesManager::unload_dialog(DialogId dialog_id) {
return; return;
} }
vector<MessageId> to_unload_message_ids;
bool has_left_to_unload_messages = false; bool has_left_to_unload_messages = false;
find_unloadable_messages(d, G()->unix_time_cached() - get_unload_dialog_delay() + 2, auto to_unload_message_ids =
d->ordered_messages.messages_.get(), to_unload_message_ids, has_left_to_unload_messages); find_unloadable_messages(d, G()->unix_time_cached() - get_unload_dialog_delay() + 2, has_left_to_unload_messages);
vector<int64> unloaded_message_ids; vector<int64> unloaded_message_ids;
vector<unique_ptr<Message>> unloaded_messages; vector<unique_ptr<Message>> unloaded_messages;

4
td/telegram/MessagesManager.h
View File

@ -2055,8 +2055,8 @@ class MessagesManager final : public Actor {
std::function<int32(MessageId)> get_get_message_date(const Dialog *d) const; std::function<int32(MessageId)> get_get_message_date(const Dialog *d) const;
void find_unloadable_messages(const Dialog *d, int32 unload_before_date, const OrderedMessage *ordered_message, vector<MessageId> find_unloadable_messages(const Dialog *d, int32 unload_before_date,
vector<MessageId> &message_ids, bool &has_left_to_unload_messages) const; bool &has_left_to_unload_messages) const;
void on_pending_message_views_timeout(DialogId dialog_id); void on_pending_message_views_timeout(DialogId dialog_id);