matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign: Rename aggrStreamStats as aggrGuidStats

Browse Source 
New name reflects actual usage; aggrPortStats can be added later.
This commit is contained in:
Srivats P 2017-01-10 18:50:22 +05:30
parent 5120f6c525
commit c702d7692b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/streamstatsmodel.cpp
View File

@ -110,7 +110,7 @@ QVariant StreamStatsModel::data(const QModelIndex &index, int role) const
Guid guid = guidList_.at(index.row()); Guid guid = guidList_.at(index.row());
if (role == Qt::ForegroundRole) { if (role == Qt::ForegroundRole) {
if ((index.column() == kAggrPktLoss) if ((index.column() == kAggrPktLoss)
&& aggrStreamStats_.value(guid).pktLoss) && aggrGuidStats_.value(guid).pktLoss)
return QBrush(QColor("red")); return QBrush(QColor("red"));
} }
@ -121,11 +121,11 @@ QVariant StreamStatsModel::data(const QModelIndex &index, int role) const
int stat = index.column() % kMaxAggrStreamStats; int stat = index.column() % kMaxAggrStreamStats;
switch (stat) { switch (stat) {
case kAggrRxPkts: case kAggrRxPkts:
return QString("%L1").arg(aggrStreamStats_.value(guid).rxPkts); return QString("%L1").arg(aggrGuidStats_.value(guid).rxPkts);
case kAggrTxPkts: case kAggrTxPkts:
return QString("%L1").arg(aggrStreamStats_.value(guid).txPkts); return QString("%L1").arg(aggrGuidStats_.value(guid).txPkts);
case kAggrPktLoss: case kAggrPktLoss:
return QString("%L1").arg(aggrStreamStats_.value(guid).pktLoss); return QString("%L1").arg(aggrGuidStats_.value(guid).pktLoss);
default: default:
break; break;
}; };
@ -163,7 +163,7 @@ void StreamStatsModel::clearStats()
guidList_.clear(); guidList_.clear();
portList_.clear(); portList_.clear();
streamStats_.clear(); streamStats_.clear();
aggrStreamStats_.clear(); aggrGuidStats_.clear();
#if QT_VERSION >= 0x040600 #if QT_VERSION >= 0x040600
endResetModel(); endResetModel();
@ -187,16 +187,16 @@ void StreamStatsModel::appendStreamStatsList(
PortGroupPort pgp = PortGroupPort(portGroupId, s.port_id().id()); PortGroupPort pgp = PortGroupPort(portGroupId, s.port_id().id());
Guid guid = s.stream_guid().id(); Guid guid = s.stream_guid().id();
StreamStats &ss = streamStats_[guid][pgp]; StreamStats &ss = streamStats_[guid][pgp];
AggrStreamStats &aggrStats = aggrStreamStats_[guid]; AggrGuidStats &aggrGuid = aggrGuidStats_[guid];
ss.rxPkts = s.rx_pkts(); ss.rxPkts = s.rx_pkts();
ss.txPkts = s.tx_pkts(); ss.txPkts = s.tx_pkts();
ss.rxBytes = s.rx_bytes(); ss.rxBytes = s.rx_bytes();
ss.txBytes = s.tx_bytes(); ss.txBytes = s.tx_bytes();
aggrStats.rxPkts += ss.rxPkts; aggrGuid.rxPkts += ss.rxPkts;
aggrStats.txPkts += ss.txPkts; aggrGuid.txPkts += ss.txPkts;
aggrStats.pktLoss += ss.txPkts - ss.rxPkts; aggrGuid.pktLoss += ss.txPkts - ss.rxPkts;
if (!portList_.contains(pgp)) if (!portList_.contains(pgp))
portList_.append(pgp); portList_.append(pgp);

4
client/streamstatsmodel.h
View File

@ -56,7 +56,7 @@ private:
quint64 rxBytes; quint64 rxBytes;
quint64 txBytes; quint64 txBytes;
}; };
struct AggrStreamStats { struct AggrGuidStats {
quint64 rxPkts; quint64 rxPkts;
quint64 txPkts; quint64 txPkts;
qint64 pktLoss; qint64 pktLoss;
@ -64,7 +64,7 @@ private:
QList<Guid> guidList_; QList<Guid> guidList_;
QList<PortGroupPort> portList_; QList<PortGroupPort> portList_;
QHash<Guid, QHash<PortGroupPort, StreamStats> > streamStats_; QHash<Guid, QHash<PortGroupPort, StreamStats> > streamStats_;
QHash<Guid, AggrStreamStats> aggrStreamStats_; QHash<Guid, AggrGuidStats> aggrGuidStats_;
}; };
#endif #endif