external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Optimize importing out queues

Browse source
This commit is contained in:
SpyCheese 2023-07-31 18:12:09 +03:00
parent 44ba040934
commit 5c02459fd8
22 changed files with 588 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

38
validator/impl/collator.cpp
View file

@ -632,27 +632,45 @@ bool Collator::request_neighbor_msg_queues() {
}
neighbors_.emplace_back(*shard_ptr);
}
std::vector<BlockIdExt> top_blocks;
unsigned i = 0;
for (block::McShardDescr& descr : neighbors_) {
LOG(DEBUG) << "neighbor #" << i << " : " << descr.blk_.to_str();
++pending;
send_closure_later(manager, &ValidatorManager::wait_out_msg_queue_proof, descr.blk_, shard_, priority(), timeout,
[self = get_self(), i](td::Result<Ref<OutMsgQueueProof>> res) {
LOG(DEBUG) << "got msg queue for neighbor #" << i;
send_closure_later(std::move(self), &Collator::got_neighbor_msg_queue, i, std::move(res));
});
top_blocks.push_back(descr.blk_);
++i;
}
++pending;
td::actor::send_closure_later(
manager, &ValidatorManager::wait_neighbor_msg_queue_proofs, shard_, std::move(top_blocks), timeout,
[self = get_self()](td::Result<std::map<BlockIdExt, Ref<OutMsgQueueProof>>> res) {
td::actor::send_closure_later(std::move(self), &Collator::got_neighbor_msg_queues, std::move(res));
});
return true;
}
void Collator::got_neighbor_msg_queue(unsigned i, td::Result<Ref<OutMsgQueueProof>> R) {
void Collator::got_neighbor_msg_queues(td::Result<std::map<BlockIdExt, Ref<OutMsgQueueProof>>> R) {
--pending;
if (R.is_error()) {
fatal_error(R.move_as_error());
fatal_error(R.move_as_error_prefix("failed to get neighbor msg queues: "));
return;
}
LOG(INFO) << "neighbor output queues fetched";
auto res = R.move_as_ok();
unsigned i = 0;
for (block::McShardDescr& descr : neighbors_) {
LOG(DEBUG) << "neighbor #" << i << " : " << descr.blk_.to_str();
auto it = res.find(descr.blk_);
if (it == res.end()) {
fatal_error(PSTRING() << "no msg queue from neighbor #" << i);
return;
}
got_neighbor_msg_queue(i, it->second);
++i;
}
check_pending();
}
void Collator::got_neighbor_msg_queue(unsigned i, Ref<OutMsgQueueProof> res) {
BlockIdExt block_id = neighbors_.at(i).blk_;
if (res->block_state_proof_.not_null() && !block_id.is_masterchain()) {
block_state_proofs_.emplace(block_id.root_hash, res->block_state_proof_);
@ -732,10 +750,6 @@ void Collator::got_neighbor_msg_queue(unsigned i, td::Result<Ref<OutMsgQueueProo
}
}
} while (false);
if (!pending) {
LOG(INFO) << "all neighbor output queues fetched";
}
check_pending();
}
bool Collator::unpack_merge_last_state() {