aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2022-05-16 14:09:48 -0400
committerCarl Dong <contact@carldong.me>2022-07-15 11:30:47 -0400
commitbd4407817e523e3c5b347bc6be25ed007cb27034 (patch)
treeec52a13e96674053432e31f74d24765d32cb74f3 /src/validation.cpp
parentc84390b741ab7b61c9f702d8b447c8cadc1257c8 (diff)
downloadbitcoin-bd4407817e523e3c5b347bc6be25ed007cb27034.tar.xz
DumpMempool: Use std::chrono instead of weird int64_t arthmetics
This makes it so that DumpMempool doesn't depend on MICRO anymore
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index 4c694a2c21..48535d32a9 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -47,12 +47,14 @@
#include <util/rbf.h>
#include <util/strencodings.h>
#include <util/system.h>
+#include <util/time.h>
#include <util/trace.h>
#include <util/translation.h>
#include <validationinterface.h>
#include <warnings.h>
#include <algorithm>
+#include <chrono>
#include <deque>
#include <numeric>
#include <optional>
@@ -4726,7 +4728,7 @@ bool LoadMempool(CTxMemPool& pool, CChainState& active_chainstate, FopenFn mocka
bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool skip_file_commit)
{
- int64_t start = GetTimeMicros();
+ auto start = SteadyClock::now();
std::map<uint256, CAmount> mapDeltas;
std::vector<TxMempoolInfo> vinfo;
@@ -4744,7 +4746,7 @@ bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool s
unbroadcast_txids = pool.GetUnbroadcastTxs();
}
- int64_t mid = GetTimeMicros();
+ auto mid = SteadyClock::now();
try {
FILE* filestr{mockable_fopen_function(gArgs.GetDataDirNet() / "mempool.dat.new", "wb")};
@@ -4776,8 +4778,11 @@ bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool s
if (!RenameOver(gArgs.GetDataDirNet() / "mempool.dat.new", gArgs.GetDataDirNet() / "mempool.dat")) {
throw std::runtime_error("Rename failed");
}
- int64_t last = GetTimeMicros();
- LogPrintf("Dumped mempool: %gs to copy, %gs to dump\n", (mid-start)*MICRO, (last-mid)*MICRO);
+ auto last = SteadyClock::now();
+
+ LogPrintf("Dumped mempool: %gs to copy, %gs to dump\n",
+ Ticks<SecondsDouble>(mid - start),
+ Ticks<SecondsDouble>(last - mid));
} catch (const std::exception& e) {
LogPrintf("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
return false;