Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/bitcoin/node/chasers/chaser_validate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class BCN_API chaser_validate
bool is_silent_mature(bool residual) NOEXCEPT;
bool is_silent_empty() const NOEXCEPT;
std::string log_rate(const std::string& name, size_t signatures,
size_t milliseconds, bool device) const NOEXCEPT;
size_t milliseconds, bool gpu) const NOEXCEPT;

// This is not thread safe.
network::threadpool validation_threadpool_;
Expand Down
22 changes: 11 additions & 11 deletions src/chasers/chaser_validate_batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
const auto ecdsa = query.ecdsa_records(bank);
if (is_nonzero(ecdsa))
{
bool device{};
bool use_gpu{ gpu_ };
header_links fails{};
const auto start = network::logger::now();
if (!query.verify_ecdsa_signatures(cancel, fails, device, bank, gpu_))
if (!query.verify_ecdsa_signatures(cancel, use_gpu, fails, bank))
{
LOGN("Batch verify ecdsa canceled (" << ecdsa << ").");
return network::error::operation_canceled;
Expand All @@ -138,7 +138,7 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
if (!startup)
{
LOGN(log_rate("Verify ecdsa.....", ecdsa,
duration_cast<milliseconds>(elapsed).count(), device));
duration_cast<milliseconds>(elapsed).count(), use_gpu));
}

if (!mark_invalids(prevalids, fails, startup))
Expand All @@ -148,10 +148,10 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
const auto schnorr = query.schnorr_records(bank);
if (is_nonzero(schnorr))
{
bool device{};
bool use_gpu{ gpu_ };
header_links fails{};
const auto start = network::logger::now();
if (!query.verify_schnorr_signatures(cancel, fails, device, bank, gpu_))
if (!query.verify_schnorr_signatures(cancel, use_gpu, fails, bank))
{
LOGN("Batch verify schnorr canceled (" << schnorr << ").");
return network::error::operation_canceled;
Expand All @@ -162,7 +162,7 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
if (!startup)
{
LOGN(log_rate("Verify schnorr...", schnorr,
duration_cast<milliseconds>(elapsed).count(), device));
duration_cast<milliseconds>(elapsed).count(), use_gpu));
}

if (!mark_invalids(prevalids, fails, startup))
Expand Down Expand Up @@ -301,11 +301,11 @@ bool chaser_validate::is_silent_empty() const NOEXCEPT
}

std::string chaser_validate::log_rate(const std::string& name,
size_t signatures, size_t milliseconds, bool device) const NOEXCEPT
size_t signatures, size_t milliseconds, bool gpu) const NOEXCEPT
{
const auto rate = (signatures * 1000u) / greater(milliseconds, one);
return std::format("{} ({} / {} ms) = {} sps on {}", name, signatures,
milliseconds, rate, device ? "device" : "cpu");
milliseconds, rate, gpu ? "gpu" : "cpu");
}

// Silent batch.
Expand Down Expand Up @@ -387,10 +387,10 @@ void chaser_validate::process_silent_batch(bool residual) NOEXCEPT
code chaser_validate::do_process_silent_batch(bool bank) NOEXCEPT
{
auto& query = archive();
bool device{};
bool use_gpu{ gpu_ };
const auto rows = query.silent_records(bank);
const auto start = network::logger::now();
const auto ec = query.compute_silents(stopping_, device, bank, gpu_);
const auto ec = query.compute_silents(stopping_, use_gpu, bank);
if (ec == database::error::query_canceled)
{
LOGN("Batch silent canceled (" << rows << ").");
Expand All @@ -405,7 +405,7 @@ code chaser_validate::do_process_silent_batch(bool bank) NOEXCEPT
const auto elapsed = network::logger::now() - start;
fire(events::silent_secs, duration_cast<seconds>(elapsed).count());
LOGN(log_rate("Compute silent...", rows,
duration_cast<milliseconds>(elapsed).count(), device));
duration_cast<milliseconds>(elapsed).count(), use_gpu));
}

// Purge presilents before silents.
Expand Down
Loading