mirror of
https://github.com/dashpay/dash.git
synced 2024-12-30 22:35:51 +01:00
77c46e07dc
153d9dd9acffa95bb97a4b1579bd20237fdc9c52 refactor: replace qLowerBound & qUpperBound with std:: upper_bound & lower_bound (fanquake) 59373e3e94015316bcaa03a7b9c2e6f442641720 refactor: replace qSort with std::sort (fanquake) fea33cbbdfb4673033f3414bf1613591ff654aac refactor: replace qStableSort with std::stable_sort (fanquake) Pull request description: `qStablesort`, `qSort`, `qLowerBound` and `qUpperBound` have been marked as obsolete since at least Qt 5.9: [Obsolete Members for QtAlgorithms](https://doc.qt.io/qt-5.9/qtalgorithms-obsolete.html). This pull request replaces their usage with the suggested `std::` replacements. This also removes some warning spam when compiling against newer Qt (5.13.0 via brew): ```bash CXX qt/libbitcoinqt_a-walletcontroller.o qt/transactiontablemodel.cpp:96:52: warning: 'qLowerBound<QList<TransactionRecord>::iterator, uint256, TxLessThan>' is deprecated: Use std::lower_bound [-Wdeprecated-declarations] QList<TransactionRecord>::iterator lower = qLowerBound( qt/transactiontablemodel.cpp:98:52: warning: 'qUpperBound<QList<TransactionRecord>::iterator, uint256, TxLessThan>' is deprecated: Use std::upper_bound [-Wdeprecated-declarations] QList<TransactionRecord>::iterator upper = qUpperBound( ``` ```bash CXX qt/libbitcoinqt_a-moc_walletcontroller.o qt/bantablemodel.cpp:64:13: warning: 'qStableSort<QList<CCombinedBan>::iterator, BannedNodeLessThan>' is deprecated: Use std::stable_sort [-Wdeprecated-declarations] qStableSort(cachedBanlist.begin(), cachedBanlist.end(), BannedNodeLessThan(sortColumn, sortOrder)); ``` ```bash CXX qt/libbitcoinqt_a-sendcoinsentry.o qt/recentrequeststablemodel.cpp:205:5: warning: 'qSort<QList<RecentRequestEntry>::iterator, RecentRequestEntryLessThan>' is deprecated: Use std::sort [-Wdeprecated-declarations] qSort(list.begin(), list.end(), RecentRequestEntryLessThan(column, order)); ``` ACKs for top commit: hebasto: ACK 153d9dd9acffa95bb97a4b1579bd20237fdc9c52 promag: ACK 153d9dd9acffa95bb97a4b1579bd20237fdc9c52. jonasschnelli: utACK 153d9dd9acffa95bb97a4b1579bd20237fdc9c52 Tree-SHA512: 22f7290ed798ce8b0f5f313405377845d4c8e48dc8687be7464e27fff53363b451a40e9e18910a8c3b4b9d4dcc236a366c92e7d171fcb8576c48f149a1886c26
249 lines
6.6 KiB
C++
249 lines
6.6 KiB
C++
// Copyright (c) 2011-2015 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <qt/peertablemodel.h>
|
|
|
|
#include <qt/clientmodel.h>
|
|
#include <qt/guiconstants.h>
|
|
#include <qt/guiutil.h>
|
|
|
|
#include <interfaces/node.h>
|
|
#include <validation.h> // for cs_main
|
|
#include <sync.h>
|
|
|
|
#include <algorithm>
|
|
|
|
#include <QDebug>
|
|
#include <QList>
|
|
#include <QTimer>
|
|
|
|
bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombinedStats &right) const
|
|
{
|
|
const CNodeStats *pLeft = &(left.nodeStats);
|
|
const CNodeStats *pRight = &(right.nodeStats);
|
|
|
|
if (order == Qt::DescendingOrder)
|
|
std::swap(pLeft, pRight);
|
|
|
|
switch(column)
|
|
{
|
|
case PeerTableModel::NetNodeId:
|
|
return pLeft->nodeid < pRight->nodeid;
|
|
case PeerTableModel::Address:
|
|
return pLeft->addrName.compare(pRight->addrName) < 0;
|
|
case PeerTableModel::Subversion:
|
|
return pLeft->cleanSubVer.compare(pRight->cleanSubVer) < 0;
|
|
case PeerTableModel::Ping:
|
|
return pLeft->dMinPing < pRight->dMinPing;
|
|
case PeerTableModel::Sent:
|
|
return pLeft->nSendBytes < pRight->nSendBytes;
|
|
case PeerTableModel::Received:
|
|
return pLeft->nRecvBytes < pRight->nRecvBytes;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
// private implementation
|
|
class PeerTablePriv
|
|
{
|
|
public:
|
|
/** Local cache of peer information */
|
|
QList<CNodeCombinedStats> cachedNodeStats;
|
|
/** Column to sort nodes by */
|
|
int sortColumn;
|
|
/** Order (ascending or descending) to sort nodes by */
|
|
Qt::SortOrder sortOrder;
|
|
/** Index of rows by node ID */
|
|
std::map<NodeId, int> mapNodeRows;
|
|
|
|
/** Pull a full list of peers from vNodes into our cache */
|
|
void refreshPeers(interfaces::Node& node)
|
|
{
|
|
{
|
|
cachedNodeStats.clear();
|
|
|
|
interfaces::Node::NodesStats nodes_stats;
|
|
node.getNodesStats(nodes_stats);
|
|
cachedNodeStats.reserve(nodes_stats.size());
|
|
|
|
for (auto& node_stats : nodes_stats)
|
|
{
|
|
CNodeCombinedStats stats;
|
|
stats.nodeStats = std::get<0>(node_stats);
|
|
stats.fNodeStateStatsAvailable = std::get<1>(node_stats);
|
|
stats.nodeStateStats = std::get<2>(node_stats);
|
|
cachedNodeStats.append(stats);
|
|
}
|
|
}
|
|
|
|
if (sortColumn >= 0)
|
|
// sort cacheNodeStats (use stable sort to prevent rows jumping around unnecessarily)
|
|
std::stable_sort(cachedNodeStats.begin(), cachedNodeStats.end(), NodeLessThan(sortColumn, sortOrder));
|
|
|
|
// build index map
|
|
mapNodeRows.clear();
|
|
int row = 0;
|
|
for (const CNodeCombinedStats& stats : cachedNodeStats)
|
|
mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
|
|
}
|
|
|
|
int size() const
|
|
{
|
|
return cachedNodeStats.size();
|
|
}
|
|
|
|
CNodeCombinedStats *index(int idx)
|
|
{
|
|
if (idx >= 0 && idx < cachedNodeStats.size())
|
|
return &cachedNodeStats[idx];
|
|
|
|
return 0;
|
|
}
|
|
};
|
|
|
|
PeerTableModel::PeerTableModel(interfaces::Node& node, ClientModel *parent) :
|
|
QAbstractTableModel(parent),
|
|
m_node(node),
|
|
clientModel(parent),
|
|
timer(0)
|
|
{
|
|
columns << tr("NodeId") << tr("Node/Service") << tr("Ping") << tr("Sent") << tr("Received") << tr("User Agent");
|
|
priv.reset(new PeerTablePriv());
|
|
// default to unsorted
|
|
priv->sortColumn = -1;
|
|
|
|
// set up timer for auto refresh
|
|
timer = new QTimer(this);
|
|
connect(timer, SIGNAL(timeout()), SLOT(refresh()));
|
|
timer->setInterval(MODEL_UPDATE_DELAY);
|
|
|
|
// load initial data
|
|
refresh();
|
|
}
|
|
|
|
PeerTableModel::~PeerTableModel()
|
|
{
|
|
// Intentionally left empty
|
|
}
|
|
|
|
void PeerTableModel::startAutoRefresh()
|
|
{
|
|
timer->start();
|
|
}
|
|
|
|
void PeerTableModel::stopAutoRefresh()
|
|
{
|
|
timer->stop();
|
|
}
|
|
|
|
int PeerTableModel::rowCount(const QModelIndex &parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
return priv->size();
|
|
}
|
|
|
|
int PeerTableModel::columnCount(const QModelIndex &parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
return columns.length();
|
|
}
|
|
|
|
QVariant PeerTableModel::data(const QModelIndex &index, int role) const
|
|
{
|
|
if(!index.isValid())
|
|
return QVariant();
|
|
|
|
CNodeCombinedStats *rec = static_cast<CNodeCombinedStats*>(index.internalPointer());
|
|
|
|
if (role == Qt::DisplayRole) {
|
|
switch(index.column())
|
|
{
|
|
case NetNodeId:
|
|
return (qint64)rec->nodeStats.nodeid;
|
|
case Address:
|
|
// prepend to peer address down-arrow symbol for inbound connection and up-arrow for outbound connection
|
|
return QString(rec->nodeStats.fInbound ? "↓ " : "↑ ") + QString::fromStdString(rec->nodeStats.addrName);
|
|
case Subversion:
|
|
return QString::fromStdString(rec->nodeStats.cleanSubVer);
|
|
case Ping:
|
|
return GUIUtil::formatPingTime(rec->nodeStats.dMinPing);
|
|
case Sent:
|
|
return GUIUtil::formatBytes(rec->nodeStats.nSendBytes);
|
|
case Received:
|
|
return GUIUtil::formatBytes(rec->nodeStats.nRecvBytes);
|
|
}
|
|
} else if (role == Qt::TextAlignmentRole) {
|
|
switch (index.column()) {
|
|
case Ping:
|
|
case Sent:
|
|
case Received:
|
|
return QVariant(Qt::AlignRight | Qt::AlignVCenter);
|
|
default:
|
|
return QVariant();
|
|
}
|
|
}
|
|
|
|
return QVariant();
|
|
}
|
|
|
|
QVariant PeerTableModel::headerData(int section, Qt::Orientation orientation, int role) const
|
|
{
|
|
if(orientation == Qt::Horizontal)
|
|
{
|
|
if(role == Qt::DisplayRole && section < columns.size())
|
|
{
|
|
return columns[section];
|
|
}
|
|
}
|
|
return QVariant();
|
|
}
|
|
|
|
Qt::ItemFlags PeerTableModel::flags(const QModelIndex &index) const
|
|
{
|
|
if(!index.isValid())
|
|
return 0;
|
|
|
|
Qt::ItemFlags retval = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
|
|
return retval;
|
|
}
|
|
|
|
QModelIndex PeerTableModel::index(int row, int column, const QModelIndex &parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
CNodeCombinedStats *data = priv->index(row);
|
|
|
|
if (data)
|
|
return createIndex(row, column, data);
|
|
return QModelIndex();
|
|
}
|
|
|
|
const CNodeCombinedStats *PeerTableModel::getNodeStats(int idx)
|
|
{
|
|
return priv->index(idx);
|
|
}
|
|
|
|
void PeerTableModel::refresh()
|
|
{
|
|
Q_EMIT layoutAboutToBeChanged();
|
|
priv->refreshPeers(m_node);
|
|
Q_EMIT layoutChanged();
|
|
}
|
|
|
|
int PeerTableModel::getRowByNodeId(NodeId nodeid)
|
|
{
|
|
std::map<NodeId, int>::iterator it = priv->mapNodeRows.find(nodeid);
|
|
if (it == priv->mapNodeRows.end())
|
|
return -1;
|
|
|
|
return it->second;
|
|
}
|
|
|
|
void PeerTableModel::sort(int column, Qt::SortOrder order)
|
|
{
|
|
priv->sortColumn = column;
|
|
priv->sortOrder = order;
|
|
refresh();
|
|
}
|