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

Use WaitFreeHashMap for resolved_usernames.

Browse Source
This commit is contained in:
levlam 2022-10-04 14:53:46 +03:00
parent 91ba17c47b
commit af5ddbfa15
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
td/telegram/MessagesManager.cpp
View File

@ -17814,17 +17814,17 @@ vector<DialogId> MessagesManager::search_public_dialogs(const string &query, Pro
for (auto &short_username : get_valid_short_usernames()) { for (auto &short_username : get_valid_short_usernames()) {
if (2 * username.size() > short_username.size() && begins_with(short_username, username)) { if (2 * username.size() > short_username.size() && begins_with(short_username, username)) {
username = short_username.str(); username = short_username.str();
auto it = resolved_usernames_.find(username); auto resolved_username = resolved_usernames_.get(username);
if (it == resolved_usernames_.end()) { if (!resolved_username.dialog_id.is_valid()) {
td_->create_handler<ResolveUsernameQuery>(std::move(promise))->send(username); td_->create_handler<ResolveUsernameQuery>(std::move(promise))->send(username);
return {}; return {};
} }
if (it->second.expires_at < Time::now()) { if (resolved_username.expires_at < Time::now()) {
td_->create_handler<ResolveUsernameQuery>(Promise<>())->send(username); td_->create_handler<ResolveUsernameQuery>(Promise<>())->send(username);
} }
auto dialog_id = it->second.dialog_id; auto dialog_id = resolved_username.dialog_id;
force_create_dialog(dialog_id, "public dialogs search"); force_create_dialog(dialog_id, "public dialogs search");
auto d = get_dialog(dialog_id); auto d = get_dialog(dialog_id);
@ -33256,17 +33256,12 @@ void MessagesManager::on_dialog_linked_channel_updated(DialogId dialog_id, Chann
DialogId MessagesManager::resolve_dialog_username(const string &username) const { DialogId MessagesManager::resolve_dialog_username(const string &username) const {
auto cleaned_username = clean_username(username); auto cleaned_username = clean_username(username);
auto it = resolved_usernames_.find(cleaned_username); auto resolved_username = resolved_usernames_.get(cleaned_username);
if (it != resolved_usernames_.end()) { if (resolved_username.dialog_id.is_valid()) {
return it->second.dialog_id; return resolved_username.dialog_id;
} }
auto it2 = inaccessible_resolved_usernames_.find(cleaned_username); return inaccessible_resolved_usernames_.get(cleaned_username);
if (it2 != inaccessible_resolved_usernames_.end()) {
return it2->second;
}
return DialogId();
} }
DialogId MessagesManager::search_public_dialog(const string &username_to_search, bool force, Promise<Unit> &&promise) { DialogId MessagesManager::search_public_dialog(const string &username_to_search, bool force, Promise<Unit> &&promise) {
@ -33280,17 +33275,14 @@ DialogId MessagesManager::search_public_dialog(const string &username_to_search,
} }
DialogId dialog_id; DialogId dialog_id;
auto it = resolved_usernames_.find(username); auto resolved_username = resolved_usernames_.get(username);
if (it != resolved_usernames_.end()) { if (resolved_username.dialog_id.is_valid()) {
if (it->second.expires_at < Time::now()) { if (resolved_username.expires_at < Time::now()) {
td_->create_handler<ResolveUsernameQuery>(Promise<>())->send(username); td_->create_handler<ResolveUsernameQuery>(Promise<>())->send(username);
} }
dialog_id = it->second.dialog_id; dialog_id = resolved_username.dialog_id;
} else { } else {
auto it2 = inaccessible_resolved_usernames_.find(username); dialog_id = inaccessible_resolved_usernames_.get(username);
if (it2 != inaccessible_resolved_usernames_.end()) {
dialog_id = it2->second;
}
} }
if (dialog_id.is_valid()) { if (dialog_id.is_valid()) {
@ -33447,6 +33439,7 @@ bool MessagesManager::is_update_about_username_change_received(DialogId dialog_i
void MessagesManager::on_dialog_username_updated(DialogId dialog_id, const string &old_username, void MessagesManager::on_dialog_username_updated(DialogId dialog_id, const string &old_username,
const string &new_username) { const string &new_username) {
CHECK(dialog_id.is_valid());
auto d = get_dialog(dialog_id); auto d = get_dialog(dialog_id);
if (d != nullptr) { if (d != nullptr) {
update_dialogs_hints(d); update_dialogs_hints(d);
@ -33480,10 +33473,11 @@ void MessagesManager::on_resolved_username(const string &username, DialogId dial
return; return;
} }
auto it = resolved_usernames_.find(cleaned_username); auto resolved_username = resolved_usernames_.get(cleaned_username);
if (it != resolved_usernames_.end()) { if (resolved_username.dialog_id.is_valid()) {
LOG_IF(ERROR, it->second.dialog_id != dialog_id) LOG_IF(ERROR, resolved_username.dialog_id != dialog_id)
<< "Resolve username \"" << username << "\" to " << dialog_id << ", but have it in " << it->second.dialog_id; << "Resolve username \"" << username << "\" to " << dialog_id << ", but have it in "
<< resolved_username.dialog_id;
return; return;
} }
@ -33491,20 +33485,23 @@ void MessagesManager::on_resolved_username(const string &username, DialogId dial
} }
void MessagesManager::drop_username(const string &username) { void MessagesManager::drop_username(const string &username) {
inaccessible_resolved_usernames_.erase(clean_username(username)); auto cleaned_username = clean_username(username);
if (cleaned_username.empty()) {
auto it = resolved_usernames_.find(clean_username(username));
if (it == resolved_usernames_.end()) {
return; return;
} }
auto dialog_id = it->second.dialog_id; inaccessible_resolved_usernames_.erase(cleaned_username);
if (have_input_peer(dialog_id, AccessRights::Read)) {
CHECK(dialog_id.get_type() != DialogType::SecretChat);
send_get_dialog_query(dialog_id, Auto(), 0, "drop_username");
}
resolved_usernames_.erase(it); auto resolved_username = resolved_usernames_.get(cleaned_username);
if (resolved_username.dialog_id.is_valid()) {
auto dialog_id = resolved_username.dialog_id;
if (have_input_peer(dialog_id, AccessRights::Read)) {
CHECK(dialog_id.get_type() != DialogType::SecretChat);
send_get_dialog_query(dialog_id, Auto(), 0, "drop_username");
}
resolved_usernames_.erase(cleaned_username);
}
} }
const DialogPhoto *MessagesManager::get_dialog_photo(DialogId dialog_id) const { const DialogPhoto *MessagesManager::get_dialog_photo(DialogId dialog_id) const {

4
td/telegram/MessagesManager.h
View File

@ -3649,8 +3649,8 @@ class MessagesManager final : public Actor {
double expires_at; double expires_at;
}; };
FlatHashMap<string, ResolvedUsername> resolved_usernames_; WaitFreeHashMap<string, ResolvedUsername> resolved_usernames_;
FlatHashMap<string, DialogId> inaccessible_resolved_usernames_; WaitFreeHashMap<string, DialogId> inaccessible_resolved_usernames_;
FlatHashSet<string> reload_voice_chat_on_search_usernames_; FlatHashSet<string> reload_voice_chat_on_search_usernames_;
struct GetDialogsTask { struct GetDialogsTask {