ce74799a3c
90d4d89 scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL (practicalswift)
Pull request description:
Since C++11 the macro `NULL` may be:
* an integer literal with value zero, or
* a prvalue of type `std::nullptr_t`
By using the C++11 keyword `nullptr` we are guaranteed a prvalue of type `std::nullptr_t`.
For a more thorough discussion, see "A name for the null pointer: nullptr" (Sutter &
Stroustrup), http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
With this patch applied there are no `NULL` macro usages left in the repo:
```
$ git grep NULL -- "*.cpp" "*.h" | egrep -v '(/univalue/|/secp256k1/|/leveldb/|_NULL|NULLDUMMY|torcontrol.*NULL|NULL cert)' | wc -l
0
```
The road towards `nullptr` (C++11) is split into two PRs:
* `NULL` → `nullptr` is handled in PR #10483 (scripted, this PR)
* `0` → `nullptr` is handled in PR #10645 (manual)
Tree-SHA512: 3c395d66f2ad724a8e6fed74b93634de8bfc0c0eafac94e64e5194c939499fefd6e68f047de3083ad0b4eff37df9a8a3a76349aa17d55eabbd8e0412f140a297
106 lines
3.6 KiB
C++
106 lines
3.6 KiB
C++
// Copyright (c) 2015-2016 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "bench.h"
|
|
#include "perf.h"
|
|
|
|
#include <assert.h>
|
|
#include <iostream>
|
|
#include <iomanip>
|
|
#include <sys/time.h>
|
|
|
|
benchmark::BenchRunner::BenchmarkMap &benchmark::BenchRunner::benchmarks() {
|
|
static std::map<std::string, benchmark::BenchFunction> benchmarks_map;
|
|
return benchmarks_map;
|
|
}
|
|
|
|
static double gettimedouble(void) {
|
|
struct timeval tv;
|
|
gettimeofday(&tv, nullptr);
|
|
return tv.tv_usec * 0.000001 + tv.tv_sec;
|
|
}
|
|
|
|
benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func)
|
|
{
|
|
benchmarks().insert(std::make_pair(name, func));
|
|
}
|
|
|
|
void
|
|
benchmark::BenchRunner::RunAll(double elapsedTimeForOne)
|
|
{
|
|
perf_init();
|
|
std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << ","
|
|
<< "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n";
|
|
|
|
for (const auto &p: benchmarks()) {
|
|
State state(p.first, elapsedTimeForOne);
|
|
p.second(state);
|
|
}
|
|
perf_fini();
|
|
}
|
|
|
|
bool benchmark::State::KeepRunning()
|
|
{
|
|
if (count & countMask) {
|
|
++count;
|
|
return true;
|
|
}
|
|
double now;
|
|
uint64_t nowCycles;
|
|
if (count == 0) {
|
|
lastTime = beginTime = now = gettimedouble();
|
|
lastCycles = beginCycles = nowCycles = perf_cpucycles();
|
|
}
|
|
else {
|
|
now = gettimedouble();
|
|
double elapsed = now - lastTime;
|
|
double elapsedOne = elapsed * countMaskInv;
|
|
if (elapsedOne < minTime) minTime = elapsedOne;
|
|
if (elapsedOne > maxTime) maxTime = elapsedOne;
|
|
|
|
// We only use relative values, so don't have to handle 64-bit wrap-around specially
|
|
nowCycles = perf_cpucycles();
|
|
uint64_t elapsedOneCycles = (nowCycles - lastCycles) * countMaskInv;
|
|
if (elapsedOneCycles < minCycles) minCycles = elapsedOneCycles;
|
|
if (elapsedOneCycles > maxCycles) maxCycles = elapsedOneCycles;
|
|
|
|
if (elapsed*128 < maxElapsed) {
|
|
// If the execution was much too fast (1/128th of maxElapsed), increase the count mask by 8x and restart timing.
|
|
// The restart avoids including the overhead of this code in the measurement.
|
|
countMask = ((countMask<<3)|7) & ((1LL<<60)-1);
|
|
countMaskInv = 1./(countMask+1);
|
|
count = 0;
|
|
minTime = std::numeric_limits<double>::max();
|
|
maxTime = std::numeric_limits<double>::min();
|
|
minCycles = std::numeric_limits<uint64_t>::max();
|
|
maxCycles = std::numeric_limits<uint64_t>::min();
|
|
return true;
|
|
}
|
|
if (elapsed*16 < maxElapsed) {
|
|
uint64_t newCountMask = ((countMask<<1)|1) & ((1LL<<60)-1);
|
|
if ((count & newCountMask)==0) {
|
|
countMask = newCountMask;
|
|
countMaskInv = 1./(countMask+1);
|
|
}
|
|
}
|
|
}
|
|
lastTime = now;
|
|
lastCycles = nowCycles;
|
|
++count;
|
|
|
|
if (now - beginTime < maxElapsed) return true; // Keep going
|
|
|
|
--count;
|
|
|
|
assert(count != 0 && "count == 0 => (now == 0 && beginTime == 0) => return above");
|
|
|
|
// Output results
|
|
double average = (now-beginTime)/count;
|
|
int64_t averageCycles = (nowCycles-beginCycles)/count;
|
|
std::cout << std::fixed << std::setprecision(15) << name << "," << count << "," << minTime << "," << maxTime << "," << average << ","
|
|
<< minCycles << "," << maxCycles << "," << averageCycles << "\n";
|
|
std::cout.copyfmt(std::ios(nullptr));
|
|
|
|
return false;
|
|
}
|