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

Add some debug logging.

Browse Source 
GitOrigin-RevId: 6bd223bb40b2092f703d62531df13b96cb3e6066
This commit is contained in:
levlam 2018-02-19 23:21:53 +03:00
parent 0c9eb44038
commit 3604f1cf54
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
td/telegram/ContactsManager.cpp
View File

@ -4954,6 +4954,7 @@ void ContactsManager::save_user_to_database(User *u, UserId user_id) {
void ContactsManager::save_user_to_database_impl(User *u, UserId user_id, string value) { void ContactsManager::save_user_to_database_impl(User *u, UserId user_id, string value) {
CHECK(u != nullptr); CHECK(u != nullptr);
CHECK(load_user_from_database_queries_.count(user_id) == 0); CHECK(load_user_from_database_queries_.count(user_id) == 0);
CHECK(!u->is_being_saved);
u->is_being_saved = true; u->is_being_saved = true;
u->is_saved = true; u->is_saved = true;
u->is_status_saved = true; u->is_status_saved = true;

4
td/telegram/MessagesDb.cpp
View File

@ -403,7 +403,7 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
MessageId last_message_id, int32 date) override { MessageId last_message_id, int32 date) override {
int64 left_message_id = first_message_id.get(); int64 left_message_id = first_message_id.get();
int64 right_message_id = last_message_id.get(); int64 right_message_id = last_message_id.get();
CHECK(left_message_id <= right_message_id); CHECK(left_message_id <= right_message_id) << first_message_id << " " << last_message_id;
TRY_RESULT(first_messages, TRY_RESULT(first_messages,
get_messages_inner(get_messages_stmt_.asc_stmt_, dialog_id.get(), left_message_id - 1, 1)); get_messages_inner(get_messages_stmt_.asc_stmt_, dialog_id.get(), left_message_id - 1, 1));
if (!first_messages.empty()) { if (!first_messages.empty()) {
@ -703,7 +703,7 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
Result<MessagesDbMessagesResult> get_messages_impl(GetMessagesStmt &stmt, DialogId dialog_id, Result<MessagesDbMessagesResult> get_messages_impl(GetMessagesStmt &stmt, DialogId dialog_id,
MessageId from_message_id, int32 offset, int32 limit) { MessageId from_message_id, int32 offset, int32 limit) {
CHECK(dialog_id.is_valid()); CHECK(dialog_id.is_valid()) << dialog_id;
CHECK(from_message_id.is_valid()); CHECK(from_message_id.is_valid());
auto message_id = from_message_id.get(); auto message_id = from_message_id.get();

30
td/telegram/MessagesManager.cpp
View File

@ -9214,9 +9214,9 @@ void MessagesManager::fix_message_info_dialog_id(MessageInfo &message_info) cons
} }
MessagesManager::MessageInfo MessagesManager::parse_telegram_api_message( MessagesManager::MessageInfo MessagesManager::parse_telegram_api_message(
tl_object_ptr<telegram_api::Message> message_ptr) const { tl_object_ptr<telegram_api::Message> message_ptr, const char *source) const {
LOG(DEBUG) << "Receive " << to_string(message_ptr); LOG(DEBUG) << "Receive from " << source << " " << to_string(message_ptr);
CHECK(message_ptr != nullptr); CHECK(message_ptr != nullptr) << source;
int32 constructor_id = message_ptr->get_id(); int32 constructor_id = message_ptr->get_id();
MessageInfo message_info; MessageInfo message_info;
@ -9238,7 +9238,7 @@ MessagesManager::MessageInfo MessagesManager::parse_telegram_api_message(
if (message->flags_ & MESSAGE_FLAG_IS_SENT_VIA_BOT) { if (message->flags_ & MESSAGE_FLAG_IS_SENT_VIA_BOT) {
message_info.via_bot_user_id = UserId(message->via_bot_id_); message_info.via_bot_user_id = UserId(message->via_bot_id_);
if (!message_info.via_bot_user_id.is_valid()) { if (!message_info.via_bot_user_id.is_valid()) {
LOG(ERROR) << "Receive invalid " << message_info.via_bot_user_id; LOG(ERROR) << "Receive invalid " << message_info.via_bot_user_id << " from " << source;
message_info.via_bot_user_id = UserId(); message_info.via_bot_user_id = UserId();
} }
} }
@ -9445,7 +9445,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
FullMessageId MessagesManager::on_get_message(tl_object_ptr<telegram_api::Message> message_ptr, bool from_update, FullMessageId MessagesManager::on_get_message(tl_object_ptr<telegram_api::Message> message_ptr, bool from_update,
bool is_channel_message, bool have_previous, bool have_next, bool is_channel_message, bool have_previous, bool have_next,
const char *source) { const char *source) {
return on_get_message(parse_telegram_api_message(std::move(message_ptr)), from_update, is_channel_message, return on_get_message(parse_telegram_api_message(std::move(message_ptr), source), from_update, is_channel_message,
have_previous, have_next, source); have_previous, have_next, source);
} }
@ -13543,6 +13543,11 @@ void MessagesManager::on_get_history_from_database(DialogId dialog_id, MessageId
void MessagesManager::get_history_from_the_end(DialogId dialog_id, bool from_database, bool only_local, void MessagesManager::get_history_from_the_end(DialogId dialog_id, bool from_database, bool only_local,
Promise<Unit> &&promise) { Promise<Unit> &&promise) {
CHECK(dialog_id.is_valid());
if (!have_input_peer(dialog_id, AccessRights::Read)) {
// can't get history in dialogs without read access
return promise.set_value(Unit());
}
const int32 limit = MAX_GET_HISTORY; const int32 limit = MAX_GET_HISTORY;
if (from_database && G()->parameters().use_message_db) { if (from_database && G()->parameters().use_message_db) {
LOG(INFO) << "Get history from the end of " << dialog_id << " from database"; LOG(INFO) << "Get history from the end of " << dialog_id << " from database";
@ -13569,6 +13574,7 @@ void MessagesManager::get_history_from_the_end(DialogId dialog_id, bool from_dat
void MessagesManager::get_history(DialogId dialog_id, MessageId from_message_id, int32 offset, int32 limit, void MessagesManager::get_history(DialogId dialog_id, MessageId from_message_id, int32 offset, int32 limit,
bool from_database, bool only_local, Promise<Unit> &&promise) { bool from_database, bool only_local, Promise<Unit> &&promise) {
CHECK(dialog_id.is_valid());
if (!have_input_peer(dialog_id, AccessRights::Read)) { if (!have_input_peer(dialog_id, AccessRights::Read)) {
// can't get history in dialogs without read access // can't get history in dialogs without read access
return promise.set_value(Unit()); return promise.set_value(Unit());
@ -19690,7 +19696,8 @@ tl_object_ptr<td_api::ChatEventAction> MessagesManager::get_chat_event_action_ob
} }
case telegram_api::channelAdminLogEventActionUpdatePinned::ID: { case telegram_api::channelAdminLogEventActionUpdatePinned::ID: {
auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionUpdatePinned>(action_ptr); auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionUpdatePinned>(action_ptr);
auto message = create_message(parse_telegram_api_message(std::move(action->message_)), true); auto message = create_message(
parse_telegram_api_message(std::move(action->message_), "channelAdminLogEventActionUpdatePinned"), true);
if (message.second == nullptr) { if (message.second == nullptr) {
return make_tl_object<td_api::chatEventMessageUnpinned>(); return make_tl_object<td_api::chatEventMessageUnpinned>();
} }
@ -19698,8 +19705,12 @@ tl_object_ptr<td_api::ChatEventAction> MessagesManager::get_chat_event_action_ob
} }
case telegram_api::channelAdminLogEventActionEditMessage::ID: { case telegram_api::channelAdminLogEventActionEditMessage::ID: {
auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionEditMessage>(action_ptr); auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionEditMessage>(action_ptr);
auto old_message = create_message(parse_telegram_api_message(std::move(action->prev_message_)), true); auto old_message = create_message(
auto new_message = create_message(parse_telegram_api_message(std::move(action->new_message_)), true); parse_telegram_api_message(std::move(action->prev_message_), "prev channelAdminLogEventActionEditMessage"),
true);
auto new_message = create_message(
parse_telegram_api_message(std::move(action->new_message_), "new channelAdminLogEventActionEditMessage"),
true);
if (old_message.second == nullptr || new_message.second == nullptr || old_message.first != new_message.first) { if (old_message.second == nullptr || new_message.second == nullptr || old_message.first != new_message.first) {
LOG(ERROR) << "Failed to get edited message"; LOG(ERROR) << "Failed to get edited message";
return nullptr; return nullptr;
@ -19710,7 +19721,8 @@ tl_object_ptr<td_api::ChatEventAction> MessagesManager::get_chat_event_action_ob
} }
case telegram_api::channelAdminLogEventActionDeleteMessage::ID: { case telegram_api::channelAdminLogEventActionDeleteMessage::ID: {
auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionDeleteMessage>(action_ptr); auto action = move_tl_object_as<telegram_api::channelAdminLogEventActionDeleteMessage>(action_ptr);
auto message = create_message(parse_telegram_api_message(std::move(action->message_)), true); auto message = create_message(
parse_telegram_api_message(std::move(action->message_), "channelAdminLogEventActionDeleteMessage"), true);
if (message.second == nullptr) { if (message.second == nullptr) {
LOG(ERROR) << "Failed to get deleted message"; LOG(ERROR) << "Failed to get deleted message";
return nullptr; return nullptr;

2
td/telegram/MessagesManager.h
View File

@ -1778,7 +1778,7 @@ class MessagesManager : public Actor {
void fix_message_info_dialog_id(MessageInfo &message_info) const; void fix_message_info_dialog_id(MessageInfo &message_info) const;
MessageInfo parse_telegram_api_message(tl_object_ptr<telegram_api::Message> message_ptr) const; MessageInfo parse_telegram_api_message(tl_object_ptr<telegram_api::Message> message_ptr, const char *source) const;
std::pair<DialogId, unique_ptr<Message>> create_message(MessageInfo &&message_info, bool is_channel_message); std::pair<DialogId, unique_ptr<Message>> create_message(MessageInfo &&message_info, bool is_channel_message);

6
tdutils/td/utils/tl_helpers.h
View File

@ -28,7 +28,7 @@
bit_offset_store++ bit_offset_store++
#define END_STORE_FLAGS() \ #define END_STORE_FLAGS() \
CHECK(bit_offset_store < 32); \ CHECK(bit_offset_store < 31); \
td::store(flags_store, storer) td::store(flags_store, storer)
#define BEGIN_PARSE_FLAGS() \ #define BEGIN_PARSE_FLAGS() \
@ -40,7 +40,9 @@
flag = ((flags_parse >> bit_offset_parse) & 1) != 0; \ flag = ((flags_parse >> bit_offset_parse) & 1) != 0; \
bit_offset_parse++ bit_offset_parse++
#define END_PARSE_FLAGS() CHECK(bit_offset_parse < 32) #define END_PARSE_FLAGS() \
CHECK(bit_offset_parse < 31); \
CHECK((flags_parse & ~((1 << bit_offset_parse) - 1)) == 0) << flags_parse << " " << bit_offset_parse;
namespace td { namespace td {
template <class StorerT> template <class StorerT>