Skip to content

Commit 4a028cf

Browse files
committed
gui: show maximum mempool size in information window
1 parent bbde6ff commit 4a028cf

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

src/qt/clientmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, QO
5353
connect(timer, &QTimer::timeout, [this] {
5454
// no locking required at this point
5555
// the following calls will acquire the required lock
56-
Q_EMIT mempoolSizeChanged(m_node.getMempoolSize(), m_node.getMempoolDynamicUsage());
56+
Q_EMIT mempoolSizeChanged(m_node.getMempoolSize(), m_node.getMempoolDynamicUsage(), m_node.getMempoolMaxUsage());
5757
Q_EMIT bytesChanged(m_node.getTotalBytesRecv(), m_node.getTotalBytesSent());
5858
});
5959
connect(m_thread, &QThread::finished, timer, &QObject::deleteLater);

src/qt/clientmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class ClientModel : public QObject
113113
Q_SIGNALS:
114114
void numConnectionsChanged(int count);
115115
void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, SyncType header, SynchronizationState sync_state);
116-
void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
116+
void mempoolSizeChanged(long count, size_t mempoolSizeInBytes, size_t mempoolMaxSizeInBytes);
117117
void networkActiveChanged(bool networkActive);
118118
void alertsChanged(const QString &warnings);
119119
void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);

src/qt/rpcconsole.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,16 @@ void RPCConsole::setNumBlocks(int count, const QDateTime& blockDate, double nVer
10001000
}
10011001
}
10021002

1003-
void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
1003+
void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage, size_t maxUsage)
10041004
{
10051005
ui->mempoolNumberTxs->setText(QString::number(numberOfTxs));
10061006

1007-
if (dynUsage < 1000000) {
1008-
ui->mempoolSize->setText(QObject::tr("%1 kB").arg(dynUsage / 1000.0, 0, 'f', 2));
1009-
} else {
1010-
ui->mempoolSize->setText(QObject::tr("%1 MB").arg(dynUsage / 1000000.0, 0, 'f', 2));
1011-
}
1007+
const auto cur_usage_str = dynUsage < 1000000 ?
1008+
QObject::tr("%1 kB").arg(dynUsage / 1000.0, 0, 'f', 2) :
1009+
QObject::tr("%1 MB").arg(dynUsage / 1000000.0, 0, 'f', 2);
1010+
const auto max_usage_str = QObject::tr("%1 MB").arg(maxUsage / 1000000.0, 0, 'f', 2);
1011+
1012+
ui->mempoolSize->setText(cur_usage_str + " / " + max_usage_str);
10121013
}
10131014

10141015
void RPCConsole::on_lineEdit_returnPressed()
@@ -1400,4 +1401,4 @@ void RPCConsole::updateWindowTitle()
14001401
const QString chainType = QString::fromStdString(Params().GetChainTypeString());
14011402
const QString title = tr("Node window - [%1]").arg(chainType);
14021403
this->setWindowTitle(title);
1403-
}
1404+
}

src/qt/rpcconsole.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public Q_SLOTS:
121121
/** Set number of blocks and last block date shown in the UI */
122122
void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, SyncType synctype);
123123
/** Set size (number of transactions and memory usage) of the mempool in the UI */
124-
void setMempoolSize(long numberOfTxs, size_t dynUsage);
124+
void setMempoolSize(long numberOfTxs, size_t dynUsage, size_t maxUsage);
125125
/** Go forward or back in history */
126126
void browseHistory(int offset);
127127
/** Scroll console view to end */

0 commit comments

Comments
 (0)