GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a70911492f into merged_master (Bitcoin PR bitcoin/bitcoin#26749)

Browse source 
includes a FIXME for rpc_psbt.py that must have happened in the merge of
bitcoin/bitcoin#27200
This commit is contained in:
Byron Hambly 2025-04-11 20:23:28 +02:00
commit e268f3a7eb
8 changed files with 54 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/bench/checkqueue.cpp
View file

@ -29,8 +29,6 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
struct PrevectorJob {
prevector<PREVECTOR_SIZE, uint8_t> p;
// ELEMENTS: fix unused member function warnings
// PrevectorJob() = default;
explicit PrevectorJob(FastRandomContext& insecure_rand){
p.resize(insecure_rand.randrange(PREVECTOR_SIZE*2));
}
@ -38,10 +36,6 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
{
return true;
}
/*void swap(PrevectorJob& x) noexcept
{
p.swap(x.p);
};*/
};
CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE};
// The main thread should be counted to prevent thread oversubscription, and
@ -61,8 +55,8 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
bench.minEpochIterations(10).batch(BATCH_SIZE * BATCHES).unit("job").run([&] {
// Make insecure_rand here so that each iteration is identical.
CCheckQueueControl<PrevectorJob> control(&queue);
for (const auto& vChecks : vBatches) {
control.Add(vChecks);
for (auto vChecks : vBatches) {
control.Add(std::move(vChecks));
}
// control waits for completion by RAII, but
// it is done explicitly here for clarity