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

more consistenly tag cp update and lower cooldown just in case

Browse Source
This commit is contained in:
Green Sky 2024-07-09 14:45:00 +02:00
parent 02d58928f4
commit 699957f79a
No known key found for this signature in database
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
View File

@ -464,7 +464,9 @@ float SHA1_NGCFT1::iterate(float delta) {
std::cout << "destorying empty useless cp\n"; std::cout << "destorying empty useless cp\n";
cp_to_remove.push_back(c); cp_to_remove.push_back(c);
} else { } else {
c.get_or_emplace<ChunkPickerTimer>().timer = 60.f; // most likely will have something soon
// TODO: mark dirty on have instead?
c.get_or_emplace<ChunkPickerTimer>().timer = 10.f;
} }
return; return;
@ -1581,12 +1583,12 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCEXT_ft1_have& e) {
const size_t num_total_chunks = o.get<Components::FT1InfoSHA1>().chunks.size(); const size_t num_total_chunks = o.get<Components::FT1InfoSHA1>().chunks.size();
const auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number); const auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number);
assert(static_cast<bool>(c));
_tox_peer_to_contact[combine_ids(e.group_number, e.peer_number)] = c; // workaround _tox_peer_to_contact[combine_ids(e.group_number, e.peer_number)] = c; // workaround
// we might not know yet // we might not know yet
if (addParticipation(c, o)) { if (addParticipation(c, o)) {
// something happend, update chunk picker // something happend, update chunk picker
assert(static_cast<bool>(c));
c.emplace_or_replace<ChunkPickerUpdateTag>(); c.emplace_or_replace<ChunkPickerUpdateTag>();
} }
@ -1594,6 +1596,10 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCEXT_ft1_have& e) {
if (!remote_have.contains(c)) { if (!remote_have.contains(c)) {
// init // init
remote_have.emplace(c, Components::RemoteHave::Entry{false, num_total_chunks}); remote_have.emplace(c, Components::RemoteHave::Entry{false, num_total_chunks});
// new have? nice
// (always update on biset, not always on have)
c.emplace_or_replace<ChunkPickerUpdateTag>();
} }
auto& remote_have_peer = remote_have.at(c); auto& remote_have_peer = remote_have.at(c);
@ -1666,14 +1672,11 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCEXT_ft1_bitset& e) {
} }
const auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number); const auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number);
assert(static_cast<bool>(c));
_tox_peer_to_contact[combine_ids(e.group_number, e.peer_number)] = c; // workaround _tox_peer_to_contact[combine_ids(e.group_number, e.peer_number)] = c; // workaround
// we might not know yet // we might not know yet
if (addParticipation(c, o)) { addParticipation(c, o);
// something happend, update chunk picker
assert(static_cast<bool>(c));
c.emplace_or_replace<ChunkPickerUpdateTag>();
}
auto& remote_have = o.get_or_emplace<Components::RemoteHave>().others; auto& remote_have = o.get_or_emplace<Components::RemoteHave>().others;
if (!remote_have.contains(c)) { if (!remote_have.contains(c)) {
@ -1703,6 +1706,10 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCEXT_ft1_bitset& e) {
} }
} }
// new have? nice
// (always update on biset, not always on have)
c.emplace_or_replace<ChunkPickerUpdateTag>();
return true; return true;
} }