diff options
Diffstat (limited to 'src/bench')
| -rw-r--r-- | src/bench/bench.cpp | 14 | ||||
| -rw-r--r-- | src/bench/coin_selection.cpp | 8 | ||||
| -rw-r--r-- | src/bench/mempool_eviction.cpp | 2 | ||||
| -rw-r--r-- | src/bench/verify_script.cpp | 2 |
4 files changed, 11 insertions, 15 deletions
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index aa9dfef577..1bd9d06b80 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -9,9 +9,7 @@ #include <iomanip> #include <sys/time.h> -using namespace benchmark; - -std::map<std::string, BenchFunction> BenchRunner::benchmarks; +std::map<std::string, benchmark::BenchFunction> benchmark::BenchRunner::benchmarks; static double gettimedouble(void) { struct timeval tv; @@ -19,29 +17,29 @@ static double gettimedouble(void) { return tv.tv_usec * 0.000001 + tv.tv_sec; } -BenchRunner::BenchRunner(std::string name, BenchFunction func) +benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func) { benchmarks.insert(std::make_pair(name, func)); } void -BenchRunner::RunAll(double elapsedTimeForOne) +benchmark::BenchRunner::RunAll(double elapsedTimeForOne) { perf_init(); std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "," << "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n"; - for (std::map<std::string,BenchFunction>::iterator it = benchmarks.begin(); + for (std::map<std::string,benchmark::BenchFunction>::iterator it = benchmarks.begin(); it != benchmarks.end(); ++it) { State state(it->first, elapsedTimeForOne); - BenchFunction& func = it->second; + benchmark::BenchFunction& func = it->second; func(state); } perf_fini(); } -bool State::KeepRunning() +bool benchmark::State::KeepRunning() { if (count & countMask) { ++count; diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index c961151f53..29fbd34631 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -8,9 +8,7 @@ #include <boost/foreach.hpp> #include <set> -using namespace std; - -static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput>& vCoins) +static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<COutput>& vCoins) { int nInput = 0; @@ -36,7 +34,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, vector<COutput static void CoinSelection(benchmark::State& state) { const CWallet wallet; - vector<COutput> vCoins; + std::vector<COutput> vCoins; LOCK(wallet.cs_wallet); while (state.KeepRunning()) { @@ -50,7 +48,7 @@ static void CoinSelection(benchmark::State& state) addCoin(1000 * COIN, wallet, vCoins); addCoin(3 * COIN, wallet, vCoins); - set<pair<const CWalletTx*, unsigned int> > setCoinsRet; + std::set<std::pair<const CWalletTx*, unsigned int> > setCoinsRet; CAmount nValueRet; bool success = wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet); assert(success); diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index d04c036841..5790d51a82 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -18,7 +18,7 @@ static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool) unsigned int sigOpCost = 4; LockPoints lp; pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry( - MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx), + MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, tx.GetValueOut(), spendsCoinbase, sigOpCost, lp)); } diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index bf04f90e0e..23bbadc88d 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -93,7 +93,7 @@ static void VerifyScriptBench(benchmark::State& state) txCredit.vout[0].scriptPubKey.data(), txCredit.vout[0].scriptPubKey.size(), txCredit.vout[0].nValue, - (const unsigned char*)&stream[0], stream.size(), 0, flags, nullptr); + (const unsigned char*)stream.data(), stream.size(), 0, flags, nullptr); assert(csuccess == 1); #endif } |