mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-19 05:45:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin-core/gui#226: Add "Last Block" and "Last Tx" rows to peer details area

Browse Source 
70d3c5d0b9 gui: add "Last Block" (CNodeStats::nLastBlockTime) to peer details (Jon Atack)
a21be7c401 gui: add "Last Tx" (CNodeStats::nLastTXTime) to peer details (Jon Atack)
4dc2fd6c37 qt: add RPCConsole::TimeDurationField helper, call systime only once (Jon Atack)

Pull request description:

  - add `RPCConsole::TimeDurationField` helper to replace repeated code and call system time only once in `RPCConsole::updateDetailWidget`
  - add "Last Tx" (`CNodeStats::nLastTXTime`) field to peer details
  - add "Last Block" (`CNodeStats::nLastBlockTime`) field to peer details

ACKs for top commit:
  hebasto:
    re-ACK 70d3c5d0b9

Tree-SHA512: 2611b71fd358ba9ffb6a6206275c08ecb5e683b6f87d022faaaba9802a15030430113afdb434814a9ae2681d04429aa733164bc110b64337ceaae12a0420f4f1
This commit is contained in:
MarcoFalke 2021-02-25 14:48:48 +01:00
commit e49117470b
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
3 changed files with 97 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/qt/forms/debugwindow.ui
View File

@ -1079,7 +1079,7 @@
<item row="1" column="0">
<widget class="QLabel" name="peerConnectionTypeLabel">
<property name="toolTip">
<string>The direction and type of peer connection: %1</string>
<string>The direction and type of peer connection: %1</string>
</property>
<property name="text">
<string>Direction/Type</string>
@ -1342,14 +1342,17 @@
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_15">
<widget class="QLabel" name="peerLastBlockLabel">
<property name="toolTip">
<string>Elapsed time since a novel block passing initial validity checks was received from this peer.</string>
</property>
<property name="text">
<string>Last Send</string>
<string>Last Block</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLabel" name="peerLastSend">
<widget class="QLabel" name="peerLastBlock">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1365,14 +1368,17 @@
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_19">
<widget class="QLabel" name="peerLastTxLabel">
<property name="toolTip">
<string>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</string>
</property>
<property name="text">
<string>Last Receive</string>
<string>Last Tx</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLabel" name="peerLastRecv">
<widget class="QLabel" name="peerLastTx">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1388,14 +1394,14 @@
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_18">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Sent</string>
<string>Last Send</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="peerBytesSent">
<widget class="QLabel" name="peerLastSend">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1411,14 +1417,14 @@
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_20">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Received</string>
<string>Last Receive</string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="peerBytesRecv">
<widget class="QLabel" name="peerLastRecv">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1434,14 +1440,14 @@
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="label_26">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Ping Time</string>
<string>Sent</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="peerPingTime">
<widget class="QLabel" name="peerBytesSent">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1457,17 +1463,14 @@
</widget>
</item>
<item row="17" column="0">
<widget class="QLabel" name="peerPingWaitLabel">
<property name="toolTip">
<string>The duration of a currently outstanding ping.</string>
</property>
<widget class="QLabel" name="label_20">
<property name="text">
<string>Ping Wait</string>
<string>Received</string>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QLabel" name="peerPingWait">
<widget class="QLabel" name="peerBytesRecv">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1483,14 +1486,14 @@
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="peerMinPingLabel">
<widget class="QLabel" name="label_26">
<property name="text">
<string>Min Ping</string>
<string>Ping Time</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="QLabel" name="peerMinPing">
<widget class="QLabel" name="peerPingTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1506,14 +1509,17 @@
</widget>
</item>
<item row="19" column="0">
<widget class="QLabel" name="label_timeoffset">
<widget class="QLabel" name="peerPingWaitLabel">
<property name="toolTip">
<string>The duration of a currently outstanding ping.</string>
</property>
<property name="text">
<string>Time Offset</string>
<string>Ping Wait</string>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="QLabel" name="timeoffset">
<widget class="QLabel" name="peerPingWait">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1529,17 +1535,14 @@
</widget>
</item>
<item row="20" column="0">
<widget class="QLabel" name="peerMappedASLabel">
<property name="toolTip">
<string>The mapped Autonomous System used for diversifying peer selection.</string>
</property>
<widget class="QLabel" name="peerMinPingLabel">
<property name="text">
<string>Mapped AS</string>
<string>Min Ping</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="QLabel" name="peerMappedAS">
<widget class="QLabel" name="peerMinPing">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
@ -1555,6 +1558,55 @@
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="label_timeoffset">
<property name="text">
<string>Time Offset</string>
</property>
</widget>
</item>
<item row="21" column="1">
<widget class="QLabel" name="timeoffset">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>N/A</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="22" column="0">
<widget class="QLabel" name="peerMappedASLabel">
<property name="toolTip">
<string>The mapped Autonomous System used for diversifying peer selection.</string>
</property>
<property name="text">
<string>Mapped AS</string>
</property>
</widget>
</item>
<item row="22" column="1">
<widget class="QLabel" name="peerMappedAS">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>N/A</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="23" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>

9
src/qt/rpcconsole.cpp
View File

@ -1120,11 +1120,14 @@ void RPCConsole::updateDetailWidget()
if (stats->nodeStats.m_bip152_highbandwidth_from) bip152_hb_settings += (bip152_hb_settings == "" ? "From" : "/From");
if (bip152_hb_settings == "") bip152_hb_settings = "No";
ui->peerHighBandwidth->setText(bip152_hb_settings);
ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastSend) : tr("never"));
ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastRecv) : tr("never"));
const int64_t time_now{GetSystemTimeInSeconds()};
ui->peerConnTime->setText(GUIUtil::formatDurationStr(time_now - stats->nodeStats.nTimeConnected));
ui->peerLastBlock->setText(TimeDurationField(time_now, stats->nodeStats.nLastBlockTime));
ui->peerLastTx->setText(TimeDurationField(time_now, stats->nodeStats.nLastTXTime));
ui->peerLastSend->setText(TimeDurationField(time_now, stats->nodeStats.nLastSend));
ui->peerLastRecv->setText(TimeDurationField(time_now, stats->nodeStats.nLastRecv));
ui->peerBytesSent->setText(GUIUtil::formatBytes(stats->nodeStats.nSendBytes));
ui->peerBytesRecv->setText(GUIUtil::formatBytes(stats->nodeStats.nRecvBytes));
ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected));
ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.m_ping_usec));
ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.m_min_ping_usec));
ui->timeoffset->setText(GUIUtil::formatTimeOffset(stats->nodeStats.nTimeOffset));

5
src/qt/rpcconsole.h
View File

@ -168,6 +168,11 @@ private:
/** Update UI with latest network info from model. */
void updateNetworkState();
/** Helper for the output of a time duration field. Inputs are UNIX epoch times. */
QString TimeDurationField(uint64_t time_now, uint64_t time_at_event) const {
return time_at_event ? GUIUtil::formatDurationStr(time_now - time_at_event) : tr("Never");
}
private Q_SLOTS:
void updateAlerts(const QString& warnings);
};