aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Woosley <ben.woosley@gmail.com>2020-03-03 08:40:29 -0500
committerBen Woosley <ben.woosley@gmail.com>2020-03-04 13:44:57 -0500
commite6fc63ec7ee637a4b533e4d7b22def05e74e1dff (patch)
tree5025327bd248217f69964ac90dfe182a7e181012
parentb054c46977667953593819248c167545aa3e7a40 (diff)
refactor: Convert min ping time from double to int64_t
-rw-r--r--src/net.cpp2
-rw-r--r--src/net.h2
-rw-r--r--src/qt/peertablemodel.cpp4
-rw-r--r--src/qt/rpcconsole.cpp2
-rw-r--r--src/rpc/net.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp
index a1d1bf5cbf..8177ca3e3b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -556,7 +556,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
// Raw ping time is in microseconds, but show it to user as whole seconds (Bitcoin users should be well used to small numbers with many decimal places by now :)
stats.m_ping_usec = nPingUsecTime;
- stats.dMinPing = (((double)nMinPingUsecTime) / 1e6);
+ stats.m_min_ping_usec = nMinPingUsecTime;
stats.dPingWait = (((double)nPingUsecWait) / 1e6);
// Leave string empty if addrLocal invalid (not filled in yet)
diff --git a/src/net.h b/src/net.h
index 17d1d67dea..7cb7c485fa 100644
--- a/src/net.h
+++ b/src/net.h
@@ -598,7 +598,7 @@ public:
bool m_legacyWhitelisted;
int64_t m_ping_usec;
double dPingWait;
- double dMinPing;
+ int64_t m_min_ping_usec;
CAmount minFeeFilter;
// Our address, as reported by the peer
std::string addrLocal;
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index a497f58b16..a1fc791536 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -32,7 +32,7 @@ bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombine
case PeerTableModel::Subversion:
return pLeft->cleanSubVer.compare(pRight->cleanSubVer) < 0;
case PeerTableModel::Ping:
- return pLeft->dMinPing < pRight->dMinPing;
+ return pLeft->m_min_ping_usec < pRight->m_min_ping_usec;
case PeerTableModel::Sent:
return pLeft->nSendBytes < pRight->nSendBytes;
case PeerTableModel::Received:
@@ -161,7 +161,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
case Subversion:
return QString::fromStdString(rec->nodeStats.cleanSubVer);
case Ping:
- return GUIUtil::formatPingTime(rec->nodeStats.dMinPing);
+ return GUIUtil::formatPingTime(rec->nodeStats.m_min_ping_usec);
case Sent:
return GUIUtil::formatBytes(rec->nodeStats.nSendBytes);
case Received:
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 152d3a415f..896675a493 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1111,7 +1111,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected));
ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.m_ping_usec));
ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait));
- ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.dMinPing));
+ ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.m_min_ping_usec));
ui->timeoffset->setText(GUIUtil::formatTimeOffset(stats->nodeStats.nTimeOffset));
ui->peerVersion->setText(QString("%1").arg(QString::number(stats->nodeStats.nVersion)));
ui->peerSubversion->setText(QString::fromStdString(stats->nodeStats.cleanSubVer));
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 628e85ce01..c1b350526d 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -167,8 +167,8 @@ static UniValue getpeerinfo(const JSONRPCRequest& request)
obj.pushKV("timeoffset", stats.nTimeOffset);
if (stats.m_ping_usec > 0)
obj.pushKV("pingtime", stats.m_ping_usec / 1e6);
- if (stats.dMinPing < static_cast<double>(std::numeric_limits<int64_t>::max())/1e6)
- obj.pushKV("minping", stats.dMinPing);
+ if (stats.m_min_ping_usec < std::numeric_limits<int64_t>::max())
+ obj.pushKV("minping", stats.m_min_ping_usec / 1e6);
if (stats.dPingWait > 0.0)
obj.pushKV("pingwait", stats.dPingWait);
obj.pushKV("version", stats.nVersion);