From b4d6662f713456e97769a1bd578cf9fe6177768e Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 25 Jun 2018 01:51:15 +0300 Subject: [PATCH] Add some debug. GitOrigin-RevId: 29b2efa626ed4a6a0c0eb2ac2cec2fb245e9e6b5 --- td/telegram/SecretChatActor.cpp | 2 +- td/telegram/files/PartsManager.cpp | 7 +++++-- td/telegram/net/NetStatsManager.cpp | 2 +- tdactor/td/actor/impl/Scheduler.cpp | 7 +++++-- tdutils/td/utils/PathView.h | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/td/telegram/SecretChatActor.cpp b/td/telegram/SecretChatActor.cpp index 958ace7c..d23a4189 100644 --- a/td/telegram/SecretChatActor.cpp +++ b/td/telegram/SecretChatActor.cpp @@ -2058,7 +2058,7 @@ Status SecretChatActor::on_inbound_action(secret_api::decryptedMessageActionTypi // Perfect Forward Secrecy void SecretChatActor::on_outbound_action(secret_api::decryptedMessageActionRequestKey &request_key) { - CHECK(pfs_state_.state == PfsState::WaitSendRequest || pfs_state_.state == PfsState::SendRequest); + CHECK(pfs_state_.state == PfsState::WaitSendRequest || pfs_state_.state == PfsState::SendRequest) << pfs_state_; pfs_state_.state = PfsState::WaitRequestResponse; on_pfs_state_changed(); } diff --git a/td/telegram/files/PartsManager.cpp b/td/telegram/files/PartsManager.cpp index 1bfbba23..ebd72bc7 100644 --- a/td/telegram/files/PartsManager.cpp +++ b/td/telegram/files/PartsManager.cpp @@ -169,8 +169,11 @@ Result PartsManager::start_part() { } Status PartsManager::set_known_prefix(size_t size, bool is_ready) { - CHECK(known_prefix_flag_); - CHECK(size >= static_cast(known_prefix_size_)); + CHECK(known_prefix_flag_) << unknown_size_flag_ << " " << size << " " << is_ready << " " << known_prefix_size_ << " " + << expected_size_ << " " << part_count_ << " " << part_status_.size(); + CHECK(size >= static_cast(known_prefix_size_)) + << unknown_size_flag_ << " " << size << " " << is_ready << " " << known_prefix_size_ << " " << expected_size_ + << " " << part_count_ << " " << part_status_.size(); known_prefix_size_ = narrow_cast(size); expected_size_ = max(known_prefix_size_, expected_size_); diff --git a/td/telegram/net/NetStatsManager.cpp b/td/telegram/net/NetStatsManager.cpp index 69259cc3..78d46075 100644 --- a/td/telegram/net/NetStatsManager.cpp +++ b/td/telegram/net/NetStatsManager.cpp @@ -42,7 +42,7 @@ static void parse(NetStatsData &net_stats, T &parser) { } void NetStatsManager::init() { - CHECK(!empty()); + CHECK(!empty()) << G()->close_flag(); class NetStatsInternalCallback : public NetStats::Callback { public: NetStatsInternalCallback(ActorId parent, size_t id) : parent_(std::move(parent)), id_(id) { diff --git a/tdactor/td/actor/impl/Scheduler.cpp b/tdactor/td/actor/impl/Scheduler.cpp index 1e41c967..41aa8600 100644 --- a/tdactor/td/actor/impl/Scheduler.cpp +++ b/tdactor/td/actor/impl/Scheduler.cpp @@ -134,7 +134,9 @@ EventGuard::~EventGuard() { swap_context(info); CHECK(info->is_lite() || save_context_ == info->get_context()); #ifdef TD_DEBUG - CHECK(info->is_lite() || save_log_tag2_ == info->get_name().c_str()); + CHECK(info->is_lite() || save_log_tag2_ == info->get_name().c_str()) + << info->is_lite() << " " << info->empty() << " " << info->is_migrating() << " " << save_log_tag2_ << " " + << info->get_name() << " " << scheduler_->close_flag_; #endif if (event_context_.flags & Scheduler::EventContext::Stop) { scheduler_->do_stop_actor(info); @@ -288,7 +290,8 @@ void Scheduler::register_migrated_actor(ActorInfo *actor_info) { VLOG(actor) << "Register migrated actor: " << tag("name", *actor_info) << tag("ptr", actor_info) << tag("actor_count", actor_count_); actor_count_++; - CHECK(actor_info->is_migrating()); + CHECK(actor_info->is_migrating()) << *actor_info << " " << actor_count_ << " " << sched_id_ << " " + << actor_info->migrate_dest() << " " << actor_info->is_running() << close_flag_; CHECK(sched_id_ == actor_info->migrate_dest()); // CHECK(!actor_info->is_running()); actor_info->finish_migrate(); diff --git a/tdutils/td/utils/PathView.h b/tdutils/td/utils/PathView.h index edb5d7c1..fb0f6bda 100644 --- a/tdutils/td/utils/PathView.h +++ b/tdutils/td/utils/PathView.h @@ -40,7 +40,7 @@ class PathView { } Slice parent_dir() const { - return Slice(path_.begin(), last_slash_ + 1); + return path_.substr(0, last_slash_ + 1); } Slice extension() const { @@ -51,7 +51,7 @@ class PathView { } Slice without_extension() const { - return Slice(path_.begin(), last_dot_); + return path_.substr(0, last_dot_); } Slice file_stem() const {