Green-Sky/solanaceae_ngc_ft1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix round robin and reduce num empty spins to improve perf

Browse Source
This commit is contained in:
Green Sky 2024-07-07 15:37:49 +02:00
parent fab3d42ee9
commit 11dee5870c
No known key found for this signature in database
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solanaceae/ngc_ft1_sha1/chunk_picker.cpp
View File

@ -73,8 +73,8 @@ std::vector<ChunkPicker::ContentChunkR> ChunkPicker::updateChunkRequests(
assert(objreg.valid(participating_in_last)); assert(objreg.valid(participating_in_last));
auto it = participating_unfinished.find(participating_in_last); auto it = participating_unfinished.find(participating_in_last);
// hard limit robin rounds to array size time 100 // hard limit robin rounds to array size time 20
for (size_t i = 0; req_ret.size() < num_requests && i < participating_unfinished.size()*100; i++) { for (size_t i = 0; req_ret.size() < num_requests && i < participating_unfinished.size()*20; i++) {
if (it == participating_unfinished.end()) { if (it == participating_unfinished.end()) {
it = participating_unfinished.begin(); it = participating_unfinished.begin();
} }
@ -172,6 +172,12 @@ std::vector<ChunkPicker::ContentChunkR> ChunkPicker::updateChunkRequests(
} }
} }
if (it == participating_unfinished.end() || ++it == participating_unfinished.end()) {
participating_in_last = entt::null;
} else {
participating_in_last = it->first;
}
if (req_ret.size() < num_requests) { if (req_ret.size() < num_requests) {
std::cerr << "CP: could not fulfil, " << group_number << ":" << peer_number << " only has " << req_ret.size() << " candidates\n"; std::cerr << "CP: could not fulfil, " << group_number << ":" << peer_number << " only has " << req_ret.size() << " candidates\n";
} }