derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-stats,misc: Rename Stats namespace as statistics

Browse Source 
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::Stats became ::statistics.

"statistics" was chosen over "stats" to avoid generating
conflicts with the already existing variables (there are
way too many "stats" in the codebase), which would make
this patch even more disturbing for the users.

Change-Id: If877b12d7dac356f86e3b3d941bf7558a4fd8719
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45421
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Daniel R. Carvalho
2021-05-06 20:00:51 -03:00
committed by Daniel Carvalho
parent fa505f1c23
commit 98ac080ec4
228 changed files with 3078 additions and 2970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/dev/net/etherdevice.cc
View File

@@ -30,133 +30,133 @@
#include "sim/stats.hh"
EtherDevice::EtherDeviceStats::EtherDeviceStats(Stats::Group *parent)
: Stats::Group(parent, "EtherDevice"),
ADD_STAT(postedInterrupts, Stats::units::Count::get(),
EtherDevice::EtherDeviceStats::EtherDeviceStats(statistics::Group *parent)
: statistics::Group(parent, "EtherDevice"),
ADD_STAT(postedInterrupts, statistics::units::Count::get(),
"Number of posts to CPU"),
ADD_STAT(txBytes, Stats::units::Byte::get(),
ADD_STAT(txBytes, statistics::units::Byte::get(),
"Bytes Transmitted"),
ADD_STAT(rxBytes, Stats::units::Byte::get(), "Bytes Received"),
ADD_STAT(txPackets, Stats::units::Count::get(),
ADD_STAT(rxBytes, statistics::units::Byte::get(), "Bytes Received"),
ADD_STAT(txPackets, statistics::units::Count::get(),
"Number of Packets Transmitted"),
ADD_STAT(rxPackets, Stats::units::Count::get(),
ADD_STAT(rxPackets, statistics::units::Count::get(),
"Number of Packets Received"),
ADD_STAT(txBandwidth, Stats::units::Rate<
Stats::units::Bit, Stats::units::Second>::get(),
ADD_STAT(txBandwidth, statistics::units::Rate<
statistics::units::Bit, statistics::units::Second>::get(),
"Transmit Bandwidth",
txBytes * Stats::constant(8) / simSeconds),
ADD_STAT(rxBandwidth, Stats::units::Rate<
Stats::units::Bit, Stats::units::Second>::get(),
txBytes * statistics::constant(8) / simSeconds),
ADD_STAT(rxBandwidth, statistics::units::Rate<
statistics::units::Bit, statistics::units::Second>::get(),
"Receive Bandwidth",
rxBytes * Stats::constant(8) / simSeconds),
ADD_STAT(txIpChecksums, Stats::units::Count::get(),
rxBytes * statistics::constant(8) / simSeconds),
ADD_STAT(txIpChecksums, statistics::units::Count::get(),
"Number of tx IP Checksums done by device"),
ADD_STAT(rxIpChecksums, Stats::units::Count::get(),
ADD_STAT(rxIpChecksums, statistics::units::Count::get(),
"Number of rx IP Checksums done by device"),
ADD_STAT(txTcpChecksums, Stats::units::Count::get(),
ADD_STAT(txTcpChecksums, statistics::units::Count::get(),
"Number of tx TCP Checksums done by device"),
ADD_STAT(rxTcpChecksums, Stats::units::Count::get(),
ADD_STAT(rxTcpChecksums, statistics::units::Count::get(),
"Number of rx TCP Checksums done by device"),
ADD_STAT(txUdpChecksums, Stats::units::Count::get(),
ADD_STAT(txUdpChecksums, statistics::units::Count::get(),
"Number of tx UDP Checksums done by device"),
ADD_STAT(rxUdpChecksums, Stats::units::Count::get(),
ADD_STAT(rxUdpChecksums, statistics::units::Count::get(),
"Number of rx UDP Checksums done by device"),
ADD_STAT(descDmaReads, Stats::units::Count::get(),
ADD_STAT(descDmaReads, statistics::units::Count::get(),
"Number of descriptors the device read w/ DMA"),
ADD_STAT(descDmaWrites, Stats::units::Count::get(),
ADD_STAT(descDmaWrites, statistics::units::Count::get(),
"Number of descriptors the device wrote w/ DMA"),
ADD_STAT(descDmaRdBytes, Stats::units::Count::get(),
ADD_STAT(descDmaRdBytes, statistics::units::Count::get(),
"Number of descriptor bytes read w/ DMA"),
ADD_STAT(descDmaWrBytes, Stats::units::Count::get(),
ADD_STAT(descDmaWrBytes, statistics::units::Count::get(),
"Number of descriptor bytes write w/ DMA"),
ADD_STAT(totBandwidth, Stats::units::Rate<
Stats::units::Bit, Stats::units::Second>::get(),
ADD_STAT(totBandwidth, statistics::units::Rate<
statistics::units::Bit, statistics::units::Second>::get(),
"Total Bandwidth",
txBandwidth + rxBandwidth),
ADD_STAT(totPackets, Stats::units::Count::get(), "Total Packets",
ADD_STAT(totPackets, statistics::units::Count::get(), "Total Packets",
txPackets + rxPackets),
ADD_STAT(totBytes, Stats::units::Byte::get(), "Total Bytes",
ADD_STAT(totBytes, statistics::units::Byte::get(), "Total Bytes",
txBytes + rxBytes),
ADD_STAT(totPacketRate, Stats::units::Rate<
Stats::units::Count, Stats::units::Second>::get(),
ADD_STAT(totPacketRate, statistics::units::Rate<
statistics::units::Count, statistics::units::Second>::get(),
"Total Packet Tranmission Rate",
totPackets / simSeconds),
ADD_STAT(txPacketRate, Stats::units::Rate<
Stats::units::Count, Stats::units::Second>::get(),
ADD_STAT(txPacketRate, statistics::units::Rate<
statistics::units::Count, statistics::units::Second>::get(),
"Packet Tranmission Rate",
txPackets / simSeconds),
ADD_STAT(rxPacketRate, Stats::units::Rate<
Stats::units::Count, Stats::units::Second>::get(),
ADD_STAT(rxPacketRate, statistics::units::Rate<
statistics::units::Count, statistics::units::Second>::get(),
"Packet Reception Rate",
rxPackets / simSeconds),
ADD_STAT(postedSwi, Stats::units::Count::get(),
ADD_STAT(postedSwi, statistics::units::Count::get(),
"Number of software interrupts posted to CPU"),
ADD_STAT(totalSwi, Stats::units::Count::get(),
ADD_STAT(totalSwi, statistics::units::Count::get(),
"Total number of Swi written to ISR"),
ADD_STAT(coalescedSwi, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedSwi, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of Swi's coalesced into each post",
totalSwi / postedInterrupts),
ADD_STAT(postedRxIdle, Stats::units::Count::get(),
ADD_STAT(postedRxIdle, statistics::units::Count::get(),
"Number of rxIdle interrupts posted to CPU"),
ADD_STAT(totalRxIdle, Stats::units::Count::get(),
ADD_STAT(totalRxIdle, statistics::units::Count::get(),
"Total number of RxIdle written to ISR"),
ADD_STAT(coalescedRxIdle, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedRxIdle, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of RxIdle's coalesced into each post",
totalRxIdle / postedInterrupts),
ADD_STAT(postedRxOk, Stats::units::Count::get(),
ADD_STAT(postedRxOk, statistics::units::Count::get(),
"Number of RxOk interrupts posted to CPU"),
ADD_STAT(totalRxOk, Stats::units::Count::get(),
ADD_STAT(totalRxOk, statistics::units::Count::get(),
"Total number of RxOk written to ISR"),
ADD_STAT(coalescedRxOk, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedRxOk, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of RxOk's coalesced into each post",
totalRxOk / postedInterrupts),
ADD_STAT(postedRxDesc, Stats::units::Count::get(),
ADD_STAT(postedRxDesc, statistics::units::Count::get(),
"Number of RxDesc interrupts posted to CPU"),
ADD_STAT(totalRxDesc, Stats::units::Count::get(),
ADD_STAT(totalRxDesc, statistics::units::Count::get(),
"Total number of RxDesc written to ISR"),
ADD_STAT(coalescedRxDesc, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedRxDesc, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of RxDesc's coalesced into each post",
totalRxDesc / postedInterrupts),
ADD_STAT(postedTxOk, Stats::units::Count::get(),
ADD_STAT(postedTxOk, statistics::units::Count::get(),
"Number of TxOk interrupts posted to CPU"),
ADD_STAT(totalTxOk, Stats::units::Count::get(),
ADD_STAT(totalTxOk, statistics::units::Count::get(),
"Total number of TxOk written to ISR"),
ADD_STAT(coalescedTxOk, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedTxOk, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of TxOk's coalesced into each post",
totalTxOk / postedInterrupts),
ADD_STAT(postedTxIdle, Stats::units::Count::get(),
ADD_STAT(postedTxIdle, statistics::units::Count::get(),
"Number of TxIdle interrupts posted to CPU"),
ADD_STAT(totalTxIdle, Stats::units::Count::get(),
ADD_STAT(totalTxIdle, statistics::units::Count::get(),
"Total number of TxIdle written to ISR"),
ADD_STAT(coalescedTxIdle, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedTxIdle, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of TxIdle's coalesced into each post",
totalTxIdle / postedInterrupts),
ADD_STAT(postedTxDesc, Stats::units::Count::get(),
ADD_STAT(postedTxDesc, statistics::units::Count::get(),
"Number of TxDesc interrupts posted to CPU"),
ADD_STAT(totalTxDesc, Stats::units::Count::get(),
ADD_STAT(totalTxDesc, statistics::units::Count::get(),
"Total number of TxDesc written to ISR"),
ADD_STAT(coalescedTxDesc, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedTxDesc, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of TxDesc's coalesced into each post",
totalTxDesc / postedInterrupts),
ADD_STAT(postedRxOrn, Stats::units::Count::get(),
ADD_STAT(postedRxOrn, statistics::units::Count::get(),
"Number of RxOrn posted to CPU"),
ADD_STAT(totalRxOrn, Stats::units::Count::get(),
ADD_STAT(totalRxOrn, statistics::units::Count::get(),
"Total number of RxOrn written to ISR"),
ADD_STAT(coalescedRxOrn, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedRxOrn, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of RxOrn's coalesced into each post",
totalRxOrn / postedInterrupts),
ADD_STAT(coalescedTotal, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(coalescedTotal, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average number of interrupts coalesced into each post"),
ADD_STAT(droppedPackets, Stats::units::Count::get(),
ADD_STAT(droppedPackets, statistics::units::Count::get(),
"Number of packets dropped")
{

102
src/dev/net/etherdevice.hh
View File

@@ -52,78 +52,78 @@ class EtherDevice : public PciDevice
{}
protected:
struct EtherDeviceStats : public Stats::Group
struct EtherDeviceStats : public statistics::Group
{
EtherDeviceStats(Stats::Group *parent);
EtherDeviceStats(statistics::Group *parent);
Stats::Scalar postedInterrupts;
statistics::Scalar postedInterrupts;
Stats::Scalar txBytes;
Stats::Scalar rxBytes;
statistics::Scalar txBytes;
statistics::Scalar rxBytes;
Stats::Scalar txPackets;
Stats::Scalar rxPackets;
statistics::Scalar txPackets;
statistics::Scalar rxPackets;
Stats::Formula txBandwidth;
Stats::Formula rxBandwidth;
statistics::Formula txBandwidth;
statistics::Formula rxBandwidth;
Stats::Scalar txIpChecksums;
Stats::Scalar rxIpChecksums;
statistics::Scalar txIpChecksums;
statistics::Scalar rxIpChecksums;
Stats::Scalar txTcpChecksums;
Stats::Scalar rxTcpChecksums;
statistics::Scalar txTcpChecksums;
statistics::Scalar rxTcpChecksums;
Stats::Scalar txUdpChecksums;
Stats::Scalar rxUdpChecksums;
statistics::Scalar txUdpChecksums;
statistics::Scalar rxUdpChecksums;
Stats::Scalar descDmaReads;
Stats::Scalar descDmaWrites;
statistics::Scalar descDmaReads;
statistics::Scalar descDmaWrites;
Stats::Scalar descDmaRdBytes;
Stats::Scalar descDmaWrBytes;
statistics::Scalar descDmaRdBytes;
statistics::Scalar descDmaWrBytes;
Stats::Formula totBandwidth;
Stats::Formula totPackets;
Stats::Formula totBytes;
Stats::Formula totPacketRate;
statistics::Formula totBandwidth;
statistics::Formula totPackets;
statistics::Formula totBytes;
statistics::Formula totPacketRate;
Stats::Formula txPacketRate;
Stats::Formula rxPacketRate;
statistics::Formula txPacketRate;
statistics::Formula rxPacketRate;
Stats::Scalar postedSwi;
Stats::Scalar totalSwi;
Stats::Formula coalescedSwi;
statistics::Scalar postedSwi;
statistics::Scalar totalSwi;
statistics::Formula coalescedSwi;
Stats::Scalar postedRxIdle;
Stats::Scalar totalRxIdle;
Stats::Formula coalescedRxIdle;
statistics::Scalar postedRxIdle;
statistics::Scalar totalRxIdle;
statistics::Formula coalescedRxIdle;
Stats::Scalar postedRxOk;
Stats::Scalar totalRxOk;
Stats::Formula coalescedRxOk;
statistics::Scalar postedRxOk;
statistics::Scalar totalRxOk;
statistics::Formula coalescedRxOk;
Stats::Scalar postedRxDesc;
Stats::Scalar totalRxDesc;
Stats::Formula coalescedRxDesc;
statistics::Scalar postedRxDesc;
statistics::Scalar totalRxDesc;
statistics::Formula coalescedRxDesc;
Stats::Scalar postedTxOk;
Stats::Scalar totalTxOk;
Stats::Formula coalescedTxOk;
statistics::Scalar postedTxOk;
statistics::Scalar totalTxOk;
statistics::Formula coalescedTxOk;
Stats::Scalar postedTxIdle;
Stats::Scalar totalTxIdle;
Stats::Formula coalescedTxIdle;
statistics::Scalar postedTxIdle;
statistics::Scalar totalTxIdle;
statistics::Formula coalescedTxIdle;
Stats::Scalar postedTxDesc;
Stats::Scalar totalTxDesc;
Stats::Formula coalescedTxDesc;
statistics::Scalar postedTxDesc;
statistics::Scalar totalTxDesc;
statistics::Formula coalescedTxDesc;
Stats::Scalar postedRxOrn;
Stats::Scalar totalRxOrn;
Stats::Formula coalescedRxOrn;
statistics::Scalar postedRxOrn;
statistics::Scalar totalRxOrn;
statistics::Formula coalescedRxOrn;
Stats::Formula coalescedTotal;
Stats::Scalar droppedPackets;
statistics::Formula coalescedTotal;
statistics::Scalar droppedPackets;
} etherDeviceStats;
};

14
src/dev/net/sinic.cc
View File

@@ -98,16 +98,16 @@ Device::Device(const Params &p)
Device::~Device()
{}
Device::DeviceStats::DeviceStats(Stats::Group *parent)
: Stats::Group(parent, "SinicDevice"),
ADD_STAT(totalVnicDistance, Stats::units::Count::get(),
Device::DeviceStats::DeviceStats(statistics::Group *parent)
: statistics::Group(parent, "SinicDevice"),
ADD_STAT(totalVnicDistance, statistics::units::Count::get(),
"Total vnic distance"),
ADD_STAT(numVnicDistance, Stats::units::Count::get(),
ADD_STAT(numVnicDistance, statistics::units::Count::get(),
"Number of vnic distance measurements"),
ADD_STAT(maxVnicDistance, Stats::units::Count::get(),
ADD_STAT(maxVnicDistance, statistics::units::Count::get(),
"Maximum vnic distance"),
ADD_STAT(avgVnicDistance, Stats::units::Rate<
Stats::units::Count, Stats::units::Count>::get(),
ADD_STAT(avgVnicDistance, statistics::units::Rate<
statistics::units::Count, statistics::units::Count>::get(),
"Average vnic distance", totalVnicDistance / numVnicDistance),
_maxVnicDistance(0)
{

12
src/dev/net/sinic.hh
View File

@@ -277,14 +277,14 @@ class Device : public Base
* Statistics
*/
private:
struct DeviceStats : public Stats::Group
struct DeviceStats : public statistics::Group
{
DeviceStats(Stats::Group *parent);
DeviceStats(statistics::Group *parent);
Stats::Scalar totalVnicDistance;
Stats::Scalar numVnicDistance;
Stats::Scalar maxVnicDistance;
Stats::Formula avgVnicDistance;
statistics::Scalar totalVnicDistance;
statistics::Scalar numVnicDistance;
statistics::Scalar maxVnicDistance;
statistics::Formula avgVnicDistance;
int _maxVnicDistance;
} sinicDeviceStats;