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

cleanup old workaround code

Browse Source
This commit is contained in:
Green Sky 2024-07-09 11:04:19 +02:00
parent 92373d34f7
commit 60e6f91541
No known key found for this signature in database
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
View File

@ -398,8 +398,6 @@ float SHA1_NGCFT1::iterate(float delta) {
// ran regardless of _max_concurrent_in // ran regardless of _max_concurrent_in
{ // new chunk picker code { // new chunk picker code
// HACK: work around missing contact events
std::vector<Contact3Handle> c_offline_to_remove;
std::vector<Contact3Handle> cp_to_remove; std::vector<Contact3Handle> cp_to_remove;
// first, update timers // first, update timers
@ -414,14 +412,14 @@ float SHA1_NGCFT1::iterate(float delta) {
// now check for potentially missing cp // now check for potentially missing cp
auto cput_view = _cr.view<ChunkPickerUpdateTag>(); auto cput_view = _cr.view<ChunkPickerUpdateTag>();
cput_view.each([this, &c_offline_to_remove](const Contact3 cv) { cput_view.each([this, &cp_to_remove](const Contact3 cv) {
Contact3Handle c{_cr, cv}; Contact3Handle c{_cr, cv};
//std::cout << "cput :)\n"; //std::cout << "cput :)\n";
if (!c.any_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) { if (!c.any_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) {
std::cout << "cput uh nuh :(\n"; std::cout << "cput uh nuh :(\n";
c_offline_to_remove.push_back(c); cp_to_remove.push_back(c);
return; return;
} }
@ -433,12 +431,11 @@ float SHA1_NGCFT1::iterate(float delta) {
}); });
// now update all cp that are tagged // now update all cp that are tagged
_cr.view<ChunkPicker, ChunkPickerUpdateTag>().each([this, &_peer_open_requests, &cp_to_remove, &c_offline_to_remove](const Contact3 cv, ChunkPicker& cp) { _cr.view<ChunkPicker, ChunkPickerUpdateTag>().each([this, &_peer_open_requests, &cp_to_remove](const Contact3 cv, ChunkPicker& cp) {
Contact3Handle c{_cr, cv}; Contact3Handle c{_cr, cv};
if (!c.all_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) { if (!c.all_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) {
//cp_to_remove.push_back(c); cp_to_remove.push_back(c);
c_offline_to_remove.push_back(c);
return; return;
} }
@ -501,17 +498,6 @@ float SHA1_NGCFT1::iterate(float delta) {
for (const auto& c : cp_to_remove) { for (const auto& c : cp_to_remove) {
c.remove<ChunkPicker, ChunkPickerTimer>(); c.remove<ChunkPicker, ChunkPickerTimer>();
} }
for (const auto& c : c_offline_to_remove) {
c.remove<ChunkPicker, ChunkPickerTimer>();
for (const auto& [_, o] : _info_to_content) {
removeParticipation(c, o);
if (o.all_of<Components::RemoteHave>()) {
o.get<Components::RemoteHave>().others.erase(c);
}
}
}
} }
if (_peer_open_requests.empty()) { if (_peer_open_requests.empty()) {