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

Remove NetQuery::set_chain_ids.

Browse Source
This commit is contained in:
levlam 2022-04-17 23:21:56 +03:00
parent 402f75153b
commit 1a2efed26d
4 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
td/telegram/MessagesManager.cpp
View File

@ -1857,9 +1857,11 @@ class ToggleDialogIsBlockedQuery final : public Td::ResultHandler {
auto input_peer = td_->messages_manager_->get_input_peer(dialog_id, AccessRights::Know);
CHECK(input_peer != nullptr && input_peer->get_id() != telegram_api::inputPeerEmpty::ID);
auto query = is_blocked ? G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer)))
: G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_peer)));
query->set_chain_ids({{dialog_id, MessageContentType::Photo}, {dialog_id, MessageContentType::Text}});
vector<ChainId> chain_ids{{dialog_id, MessageContentType::Photo}, {dialog_id, MessageContentType::Text}};
auto query = is_blocked ? G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer)),
std::move(chain_ids))
: G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_peer)),
std::move(chain_ids));
send_query(std::move(query));
}

37
td/telegram/net/NetQuery.cpp
View File

@ -25,10 +25,43 @@ int64 NetQuery::get_my_id() {
return G()->get_my_id();
}
void NetQuery::set_chain_ids(vector<ChainId> &&chain_ids) {
void NetQuery::debug(string state, bool may_be_lost) {
may_be_lost_ = may_be_lost;
VLOG(net_query) << *this << " " << tag("state", state);
{
auto guard = lock();
auto &data = get_data_unsafe();
data.state_ = std::move(state);
data.state_timestamp_ = Time::now();
data.state_change_count_++;
}
}
NetQuery::NetQuery(State state, uint64 id, BufferSlice &&query, BufferSlice &&answer, DcId dc_id, Type type,
AuthFlag auth_flag, GzipFlag gzip_flag, int32 tl_constructor, int32 total_timeout_limit,
NetQueryStats *stats, vector<ChainId> chain_ids)
: state_(state)
, type_(type)
, auth_flag_(auth_flag)
, gzip_flag_(gzip_flag)
, dc_id_(dc_id)
, status_()
, id_(id)
, query_(std::move(query))
, answer_(std::move(answer))
, tl_constructor_(tl_constructor)
, total_timeout_limit_(total_timeout_limit) {
CHECK(id_ != 0);
chain_ids_ = transform(chain_ids, [](ChainId chain_id) { return chain_id.get() == 0 ? 1 : chain_id.get(); });
td::unique(chain_ids_);
// LOG(ERROR) << chain_ids_;
auto &data = get_data_unsafe();
data.my_id_ = get_my_id();
data.start_timestamp_ = data.state_timestamp_ = Time::now();
LOG(INFO) << *this;
if (stats) {
nq_counter_ = stats->register_query(this);
}
}
void NetQuery::on_net_write(size_t size) {

37
td/telegram/net/NetQuery.h
View File

@ -23,7 +23,6 @@
#include "td/utils/Span.h"
#include "td/utils/Status.h"
#include "td/utils/StringBuilder.h"
#include "td/utils/Time.h"
#include "td/utils/tl_parsers.h"
#include "td/utils/TsList.h"
@ -242,17 +241,7 @@ class NetQuery final : public TsListNode<NetQueryDebug> {
get_data_unsafe().send_failed_count_++;
}
void debug(string state, bool may_be_lost = false) {
may_be_lost_ = may_be_lost;
VLOG(net_query) << *this << " " << tag("state", state);
{
auto guard = lock();
auto &data = get_data_unsafe();
data.state_ = std::move(state);
data.state_timestamp_ = Time::now();
data.state_change_count_++;
}
}
void debug(string state, bool may_be_lost = false);
void set_callback(ActorShared<NetQueryCallback> callback) {
callback_ = std::move(callback);
@ -281,7 +270,6 @@ class NetQuery final : public TsListNode<NetQueryDebug> {
Span<uint64> get_chain_ids() const {
return chain_ids_;
}
void set_chain_ids(vector<ChainId> &&chain_ids);
void set_in_sequence_dispatcher(bool in_sequence_dispacher) {
in_sequence_dispacher_ = in_sequence_dispacher;
@ -358,27 +346,8 @@ class NetQuery final : public TsListNode<NetQueryDebug> {
bool need_resend_on_503_ = true; // for NetQueryDispatcher and to be set by caller
NetQuery(State state, uint64 id, BufferSlice &&query, BufferSlice &&answer, DcId dc_id, Type type, AuthFlag auth_flag,
GzipFlag gzip_flag, int32 tl_constructor, int32 total_timeout_limit, NetQueryStats *stats)
: state_(state)
, type_(type)
, auth_flag_(auth_flag)
, gzip_flag_(gzip_flag)
, dc_id_(dc_id)
, status_()
, id_(id)
, query_(std::move(query))
, answer_(std::move(answer))
, tl_constructor_(tl_constructor)
, total_timeout_limit_(total_timeout_limit) {
CHECK(id_ != 0);
auto &data = get_data_unsafe();
data.my_id_ = get_my_id();
data.start_timestamp_ = data.state_timestamp_ = Time::now();
LOG(INFO) << *this;
if (stats) {
nq_counter_ = stats->register_query(this);
}
}
GzipFlag gzip_flag, int32 tl_constructor, int32 total_timeout_limit, NetQueryStats *stats,
vector<ChainId> chain_ids);
};
inline StringBuilder &operator<<(StringBuilder &stream, const NetQuery &net_query) {

6
td/telegram/net/NetQueryCreator.cpp
View File

@ -76,10 +76,10 @@ NetQueryPtr NetQueryCreator::create(uint64 id, const telegram_api::Function &fun
}
}
}
auto query = object_pool_.create(NetQuery::State::Query, id, std::move(slice), BufferSlice(), dc_id, type, auth_flag,
gzip_flag, tl_constructor, total_timeout_limit, net_query_stats_.get());
auto query =
object_pool_.create(NetQuery::State::Query, id, std::move(slice), BufferSlice(), dc_id, type, auth_flag,
gzip_flag, tl_constructor, total_timeout_limit, net_query_stats_.get(), std::move(chain_ids));
query->set_cancellation_token(query.generation());
query->set_chain_ids(std::move(chain_ids));
return query;
}