From b1ddf9d3a7c739b9cdfdfe55fa34c6d2ccbadab5 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 23 Nov 2022 16:32:09 +0300 Subject: [PATCH] Minor fixes. --- td/telegram/ContactsManager.cpp | 1 + td/telegram/DialogDb.cpp | 10 ++-------- td/telegram/MessageDb.cpp | 10 ++-------- td/telegram/MessageThreadDb.cpp | 13 ++++--------- td/telegram/UpdatesManager.cpp | 14 +++++++------- td/telegram/VoiceNotesManager.cpp | 1 + tddb/td/db/TQueue.cpp | 1 + tdnet/td/net/SslCtx.cpp | 3 ++- tdnet/td/net/SslStream.cpp | 1 + tdutils/td/utils/FloodControlFast.h | 2 +- 10 files changed, 22 insertions(+), 34 deletions(-) diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index d4a6e7025..fb3002b3f 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -38,6 +38,7 @@ #include "td/telegram/PasswordManager.h" #include "td/telegram/Photo.h" #include "td/telegram/Photo.hpp" +#include "td/telegram/PhotoSize.h" #include "td/telegram/PremiumGiftOption.hpp" #include "td/telegram/SecretChatLayer.h" #include "td/telegram/SecretChatsManager.h" diff --git a/td/telegram/DialogDb.cpp b/td/telegram/DialogDb.cpp index 0d81a8859..e26911c89 100644 --- a/td/telegram/DialogDb.cpp +++ b/td/telegram/DialogDb.cpp @@ -476,15 +476,9 @@ class DialogDbAsync final : public DialogDbAsyncInterface { return; } sync_db_->begin_write_transaction().ensure(); - for (auto &query : pending_writes_) { - query.set_value(Unit()); - } + set_promises(pending_writes_); sync_db_->commit_transaction().ensure(); - pending_writes_.clear(); - for (auto &promise : finished_writes_) { - promise.set_value(Unit()); - } - finished_writes_.clear(); + set_promises(finished_writes_); cancel_timeout(); } diff --git a/td/telegram/MessageDb.cpp b/td/telegram/MessageDb.cpp index 711321b4f..1eb2c70c9 100644 --- a/td/telegram/MessageDb.cpp +++ b/td/telegram/MessageDb.cpp @@ -1236,15 +1236,9 @@ class MessageDbAsync final : public MessageDbAsyncInterface { return; } sync_db_->begin_write_transaction().ensure(); - for (auto &query : pending_writes_) { - query.set_value(Unit()); - } + set_promises(pending_writes_); sync_db_->commit_transaction().ensure(); - pending_writes_.clear(); - for (auto &promise : finished_writes_) { - promise.set_value(Unit()); - } - finished_writes_.clear(); + set_promises(finished_writes_); cancel_timeout(); } void timeout_expired() final { diff --git a/td/telegram/MessageThreadDb.cpp b/td/telegram/MessageThreadDb.cpp index e1b948841..12c250f8a 100644 --- a/td/telegram/MessageThreadDb.cpp +++ b/td/telegram/MessageThreadDb.cpp @@ -10,15 +10,16 @@ #include "td/db/SqliteConnectionSafe.h" #include "td/db/SqliteDb.h" -#include "td/db/SqliteKeyValue.h" #include "td/db/SqliteStatement.h" #include "td/actor/actor.h" #include "td/actor/SchedulerLocalStorage.h" #include "td/utils/common.h" +#include "td/utils/format.h" #include "td/utils/logging.h" #include "td/utils/ScopeGuard.h" +#include "td/utils/Time.h" namespace td { // NB: must happen inside a transaction @@ -317,15 +318,9 @@ class MessageThreadDbAsync final : public MessageThreadDbAsyncInterface { return; } sync_db_->begin_write_transaction().ensure(); - for (auto &query : pending_writes_) { - query.set_value(Unit()); - } + set_promises(pending_writes_); sync_db_->commit_transaction().ensure(); - pending_writes_.clear(); - for (auto &promise : finished_writes_) { - promise.set_value(Unit()); - } - finished_writes_.clear(); + set_promises(finished_writes_); cancel_timeout(); } diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp index 5adb6d184..f911d9e61 100644 --- a/td/telegram/UpdatesManager.cpp +++ b/td/telegram/UpdatesManager.cpp @@ -479,7 +479,7 @@ Promise<> UpdatesManager::set_pts(int32 pts, const char *source) { Promise<> result; if (pts > get_pts() || (0 < pts && pts < get_pts() - 399999)) { // pts can only go up or drop cardinally if (pts < get_pts() - 399999) { - LOG(WARNING) << "Pts decreases from " << get_pts() << " to " << pts << " from " << source; + LOG(WARNING) << "PTS decreases from " << get_pts() << " to " << pts << " from " << source; } else { LOG(INFO) << "Update pts from " << get_pts() << " to " << pts << " from " << source; } @@ -2606,14 +2606,14 @@ void UpdatesManager::process_postponed_pts_updates() { } CHECK(!running_get_difference_); if (skipped_update_count + applied_update_count > 0) { - VLOG(get_difference) << "Pts has changed from " << initial_pts << " to " << old_pts << " after skipping " + VLOG(get_difference) << "PTS has changed from " << initial_pts << " to " << old_pts << " after skipping " << skipped_update_count << ", applying " << applied_update_count << " and keeping " << postponed_pts_updates_.size() << " postponed updates"; } auto passed_time = Time::now() - begin_time; if (passed_time >= UPDATE_APPLY_WARNING_TIME) { - LOG(WARNING) << "Pts has changed from " << initial_pts << " to " << old_pts << " after skipping " + LOG(WARNING) << "PTS has changed from " << initial_pts << " to " << old_pts << " after skipping " << skipped_update_count << ", applying " << applied_update_count << " and keeping " << postponed_pts_updates_.size() << " postponed for " << (Time::now() - get_difference_start_time_) << " updates in " << passed_time; @@ -2669,7 +2669,7 @@ void UpdatesManager::process_pending_pts_updates() { auto passed_time = Time::now() - begin_time; if (passed_time >= UPDATE_APPLY_WARNING_TIME) { - LOG(WARNING) << "Pts has changed from " << initial_pts << " to " << get_pts() << " after applying " + LOG(WARNING) << "PTS has changed from " << initial_pts << " to " << get_pts() << " after applying " << applied_update_count << " and keeping " << pending_pts_updates_.size() << " pending updates in " << passed_time; } @@ -2682,7 +2682,7 @@ void UpdatesManager::process_pending_seq_updates() { } auto begin_time = Time::now(); - int32 iniital_seq = seq_; + int32 initial_seq = seq_; int32 applied_update_count = 0; while (!pending_seq_updates_.empty() && !running_get_difference_) { auto update_it = pending_seq_updates_.begin(); @@ -2726,7 +2726,7 @@ void UpdatesManager::process_pending_seq_updates() { auto passed_time = Time::now() - begin_time; if (passed_time >= UPDATE_APPLY_WARNING_TIME) { - LOG(WARNING) << "Seq has changed from " << iniital_seq << " to " << seq_ << " after applying " + LOG(WARNING) << "Seq has changed from " << initial_seq << " to " << seq_ << " after applying " << applied_update_count << " and keeping " << pending_seq_updates_.size() << " pending updates in " << passed_time; } @@ -2780,7 +2780,7 @@ void UpdatesManager::process_pending_qts_updates() { auto passed_time = Time::now() - begin_time; if (passed_time >= UPDATE_APPLY_WARNING_TIME) { - LOG(WARNING) << "Qts has changed from " << initial_qts << " to " << get_qts() << " after applying " + LOG(WARNING) << "QTS has changed from " << initial_qts << " to " << get_qts() << " after applying " << applied_update_count << " and keeping " << pending_qts_updates_.size() << " pending updates in " << passed_time; } diff --git a/td/telegram/VoiceNotesManager.cpp b/td/telegram/VoiceNotesManager.cpp index 332f45d3c..572e637c2 100644 --- a/td/telegram/VoiceNotesManager.cpp +++ b/td/telegram/VoiceNotesManager.cpp @@ -17,6 +17,7 @@ #include "td/telegram/telegram_api.h" #include "td/telegram/UpdatesManager.h" +#include "td/utils/buffer.h" #include "td/utils/logging.h" namespace td { diff --git a/tddb/td/db/TQueue.cpp b/tddb/td/db/TQueue.cpp index 847665a00..c94d7defa 100644 --- a/tddb/td/db/TQueue.cpp +++ b/tddb/td/db/TQueue.cpp @@ -12,6 +12,7 @@ #include "td/db/binlog/BinlogInterface.h" #include "td/utils/FlatHashMap.h" +#include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/Random.h" #include "td/utils/StorerBase.h" diff --git a/tdnet/td/net/SslCtx.cpp b/tdnet/td/net/SslCtx.cpp index 19bdd961a..4ec0412e6 100644 --- a/tdnet/td/net/SslCtx.cpp +++ b/tdnet/td/net/SslCtx.cpp @@ -4,8 +4,9 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#include "td/net/SslStream.h" +#include "td/net/SslCtx.h" +#include "td/utils/common.h" #include "td/utils/crypto.h" #include "td/utils/FlatHashMap.h" #include "td/utils/logging.h" diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp index 2881a9381..bede94b0f 100644 --- a/tdnet/td/net/SslStream.cpp +++ b/tdnet/td/net/SslStream.cpp @@ -21,6 +21,7 @@ #include #include +#include namespace td { diff --git a/tdutils/td/utils/FloodControlFast.h b/tdutils/td/utils/FloodControlFast.h index 59f32f55d..e5570f6d2 100644 --- a/tdutils/td/utils/FloodControlFast.h +++ b/tdutils/td/utils/FloodControlFast.h @@ -24,7 +24,7 @@ class FloodControlFast { } void add_limit(double duration, double count) { - buckets_.emplace_back(FloodControlBucket(duration, count)); + buckets_.emplace_back(duration, count); } void clear_events() {