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

small refactors

Browse Source
This commit is contained in:
Green Sky 2024-07-09 11:40:01 +02:00
parent 60e6f91541
commit 02d58928f4
No known key found for this signature in database
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solanaceae/ngc_ft1_sha1/chunk_picker.cpp
View File

@ -16,14 +16,14 @@
// ps produce an index only once // ps produce an index only once
// simply scans from the beginning, requesting chunks in that order // simply scans from the beginning, requesting chunks in that order
struct PickerStrategySimpleFirst { struct PickerStrategySequential {
const BitSet& chunk_candidates; const BitSet& chunk_candidates;
const size_t total_chunks; const size_t total_chunks;
// TODO: optimize simple and start at first chunk we dont have // TODO: optimize sequential and start at first chunk we dont have
size_t i {0u}; size_t i {0u};
PickerStrategySimpleFirst( PickerStrategySequential(
const BitSet& chunk_candidates_, const BitSet& chunk_candidates_,
const size_t total_chunks_ const size_t total_chunks_
) : ) :
@ -83,14 +83,15 @@ struct PickerStrategyRandom {
} }
}; };
// switches randomly between random and simple first // switches randomly between random and sequential
struct PickerStrategyRandomFirst { struct PickerStrategyRandomSequential {
PickerStrategyRandom psr; PickerStrategyRandom psr;
PickerStrategySimpleFirst pssf; PickerStrategySequential pssf;
// TODO: configurable
std::bernoulli_distribution d{0.5f}; std::bernoulli_distribution d{0.5f};
PickerStrategyRandomFirst( PickerStrategyRandomSequential(
const BitSet& chunk_candidates_, const BitSet& chunk_candidates_,
const size_t total_chunks_, const size_t total_chunks_,
std::default_random_engine& rng_ std::default_random_engine& rng_
@ -319,18 +320,19 @@ std::vector<ChunkPicker::ContentChunkR> ChunkPicker::updateChunkRequests(
// TODO: trim off round up to 8, since they are now always set // TODO: trim off round up to 8, since they are now always set
// now select (globaly) unrequested other have // now select (globaly) unrequested other have
// TODO: how do we prioratize within a file? // TODO: how do we prioritize within a file?
// - first (walk from start (or readhead?)) // - sequential (walk from start (or readhead?))
// - random (choose random start pos and walk) // - random (choose random start pos and walk)
// - random/sequential (randomly choose between the 2)
// - rarest (keep track of rarity and sort by that) // - rarest (keep track of rarity and sort by that)
// - steaming (use readhead to determain time critical chunks, potentially over requesting, first (relative to stream head) otherwise // - steaming (use readhead to determain time critical chunks, potentially over requesting, first (relative to stream head) otherwise
// maybe look into libtorrens deadline stuff // maybe look into libtorrens deadline stuff
// - arbitrary priority maps/functions (and combine with above in rations) // - arbitrary priority maps/functions (and combine with above in rations)
// TODO: configurable
//PickerStrategySimpleFirst ps(chunk_candidates, total_chunks); //PickerStrategySimpleFirst ps(chunk_candidates, total_chunks);
//PickerStrategyRandom ps(chunk_candidates, total_chunks, _rng); //PickerStrategyRandom ps(chunk_candidates, total_chunks, _rng);
// TODO: configurable PickerStrategyRandomSequential ps(chunk_candidates, total_chunks, _rng);
PickerStrategyRandomFirst ps(chunk_candidates, total_chunks, _rng);
size_t out_chunk_idx {0}; size_t out_chunk_idx {0};
while (ps.gen(out_chunk_idx) && req_ret.size() < num_requests) { while (ps.gen(out_chunk_idx) && req_ret.size() < num_requests) {
// out_chunk_idx is a potential candidate we can request form peer // out_chunk_idx is a potential candidate we can request form peer
@ -340,7 +342,7 @@ std::vector<ChunkPicker::ContentChunkR> ChunkPicker::updateChunkRequests(
return x.object == o && x.chunk_index == out_chunk_idx; return x.object == o && x.chunk_index == out_chunk_idx;
}) != req_ret.cend()) { }) != req_ret.cend()) {
// already in return array // already in return array
// how did we get here? should we fast exit? if simple-first strat, we would want to // how did we get here? should we fast exit? if sequential strat, we would want to
continue; // skip continue; // skip
} }

4
solanaceae/ngc_ft1_sha1/participation.cpp
View File

@ -20,7 +20,7 @@ bool addParticipation(Contact3Handle c, ObjectHandle o) {
was_new = was_new || inserted; was_new = was_new || inserted;
} }
std::cout << "added " << (was_new?"new ":"") << "participant\n"; //std::cout << "added " << (was_new?"new ":"") << "participant\n";
return was_new; return was_new;
} }
@ -43,6 +43,6 @@ void removeParticipation(Contact3Handle c, ObjectHandle o) {
} }
} }
std::cout << "removed participant\n"; //std::cout << "removed participant\n";
} }