Skip to content

Commit 7a810b1

Browse files
committed
refactor: Convert ping wait time from double to int64_t
1 parent e6fc63e commit 7a810b1

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
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;
559559
stats.m_min_ping_usec = nMinPingUsecTime;
560-
stats.dPingWait = (((double)nPingUsecWait) / 1e6);
560+
stats.m_ping_wait_usec = nPingUsecWait;
561561

562562
// Leave string empty if addrLocal invalid (not filled in yet)
563563
CService addrLocalUnlocked = GetAddrLocal();

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ class CNodeStats
597597
NetPermissionFlags m_permissionFlags;
598598
bool m_legacyWhitelisted;
599599
int64_t m_ping_usec;
600-
double dPingWait;
600+
int64_t m_ping_wait_usec;
601601
int64_t m_min_ping_usec;
602602
CAmount minFeeFilter;
603603
// Our address, as reported by the peer

src/qt/guiutil.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -773,11 +773,6 @@ QString formatServicesStr(quint64 mask)
773773
return QObject::tr("None");
774774
}
775775

776-
QString formatPingTime(double dPingTime)
777-
{
778-
return (dPingTime == std::numeric_limits<int64_t>::max()/1e6 || dPingTime == 0) ? QObject::tr("N/A") : QString(QObject::tr("%1 ms")).arg(QString::number((int)(dPingTime * 1000), 10));
779-
}
780-
781776
QString formatPingTime(int64_t ping_usec)
782777
{
783778
return (ping_usec == std::numeric_limits<int64_t>::max() || ping_usec == 0) ? QObject::tr("N/A") : QString(QObject::tr("%1 ms")).arg(QString::number((int)(ping_usec / 1000), 10));

src/qt/guiutil.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,6 @@ namespace GUIUtil
202202
/* Format CNodeStats.nServices bitmask into a user-readable string */
203203
QString formatServicesStr(quint64 mask);
204204

205-
/* Format a CNodeCombinedStats.dPingTime into a user-readable string or display N/A, if 0*/
206-
QString formatPingTime(double dPingTime);
207-
208205
/* Format a CNodeStats.m_ping_usec into a user-readable string or display N/A, if 0*/
209206
QString formatPingTime(int64_t ping_usec);
210207

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
11101110
ui->peerBytesRecv->setText(GUIUtil::formatBytes(stats->nodeStats.nRecvBytes));
11111111
ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected));
11121112
ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.m_ping_usec));
1113-
ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait));
1113+
ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.m_ping_wait_usec));
11141114
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)));

src/rpc/net.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ static UniValue getpeerinfo(const JSONRPCRequest& request)
169169
obj.pushKV("pingtime", stats.m_ping_usec / 1e6);
170170
if (stats.m_min_ping_usec < std::numeric_limits<int64_t>::max())
171171
obj.pushKV("minping", stats.m_min_ping_usec / 1e6);
172-
if (stats.dPingWait > 0.0)
173-
obj.pushKV("pingwait", stats.dPingWait);
172+
if (stats.m_ping_wait_usec > 0)
173+
obj.pushKV("pingwait", stats.m_ping_wait_usec / 1e6);
174174
obj.pushKV("version", stats.nVersion);
175175
// Use the sanitized form of subver here, to avoid tricksy remote peers from
176176
// corrupting or modifying the JSON output by putting special characters in

0 commit comments

Comments
 (0)