Skip to content

Commit e6fc63e

Browse files
committed
refactor: Convert min ping time from double to int64_t
1 parent b054c46 commit e6fc63e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
556556

557557
// 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 :)
558558
stats.m_ping_usec = nPingUsecTime;
559-
stats.dMinPing = (((double)nMinPingUsecTime) / 1e6);
559+
stats.m_min_ping_usec = nMinPingUsecTime;
560560
stats.dPingWait = (((double)nPingUsecWait) / 1e6);
561561

562562
// Leave string empty if addrLocal invalid (not filled in yet)

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ class CNodeStats
598598
bool m_legacyWhitelisted;
599599
int64_t m_ping_usec;
600600
double dPingWait;
601-
double dMinPing;
601+
int64_t m_min_ping_usec;
602602
CAmount minFeeFilter;
603603
// Our address, as reported by the peer
604604
std::string addrLocal;

src/qt/peertablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombine
3232
case PeerTableModel::Subversion:
3333
return pLeft->cleanSubVer.compare(pRight->cleanSubVer) < 0;
3434
case PeerTableModel::Ping:
35-
return pLeft->dMinPing < pRight->dMinPing;
35+
return pLeft->m_min_ping_usec < pRight->m_min_ping_usec;
3636
case PeerTableModel::Sent:
3737
return pLeft->nSendBytes < pRight->nSendBytes;
3838
case PeerTableModel::Received:
@@ -161,7 +161,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
161161
case Subversion:
162162
return QString::fromStdString(rec->nodeStats.cleanSubVer);
163163
case Ping:
164-
return GUIUtil::formatPingTime(rec->nodeStats.dMinPing);
164+
return GUIUtil::formatPingTime(rec->nodeStats.m_min_ping_usec);
165165
case Sent:
166166
return GUIUtil::formatBytes(rec->nodeStats.nSendBytes);
167167
case Received:

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
11111111
ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected));
11121112
ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.m_ping_usec));
11131113
ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait));
1114-
ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.dMinPing));
1114+
ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.m_min_ping_usec));
11151115
ui->timeoffset->setText(GUIUtil::formatTimeOffset(stats->nodeStats.nTimeOffset));
11161116
ui->peerVersion->setText(QString("%1").arg(QString::number(stats->nodeStats.nVersion)));
11171117
ui->peerSubversion->setText(QString::fromStdString(stats->nodeStats.cleanSubVer));

src/rpc/net.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ static UniValue getpeerinfo(const JSONRPCRequest& request)
167167
obj.pushKV("timeoffset", stats.nTimeOffset);
168168
if (stats.m_ping_usec > 0)
169169
obj.pushKV("pingtime", stats.m_ping_usec / 1e6);
170-
if (stats.dMinPing < static_cast<double>(std::numeric_limits<int64_t>::max())/1e6)
171-
obj.pushKV("minping", stats.dMinPing);
170+
if (stats.m_min_ping_usec < std::numeric_limits<int64_t>::max())
171+
obj.pushKV("minping", stats.m_min_ping_usec / 1e6);
172172
if (stats.dPingWait > 0.0)
173173
obj.pushKV("pingwait", stats.dPingWait);
174174
obj.pushKV("version", stats.nVersion);

0 commit comments

Comments
 (0)