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

misc: Switch away from the deprecated UNIT_* macros.

Browse Source 
Expand the macros in place.

Change-Id: I5dba512b99a1204c23a995e112248b86523b77c8
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45560
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2021-05-14 22:20:53 -07:00
parent 85373ed248
commit 4abe9ac08b
72 changed files with 1075 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dev/arm/flash_device.cc
View File

@@ -458,14 +458,18 @@ FlashDevice::getUnknownPages(uint32_t index)
FlashDevice::
FlashDeviceStats::FlashDeviceStats(Stats::Group *parent)
: Stats::Group(parent, "FlashDevice"),
ADD_STAT(totalGCActivations, UNIT_COUNT,
ADD_STAT(totalGCActivations, Stats::Units::Count::get(),
"Number of Garbage collector activations"),
ADD_STAT(writeAccess, UNIT_COUNT, "Histogram of write addresses"),
ADD_STAT(readAccess, UNIT_COUNT, "Histogram of read addresses"),
ADD_STAT(fileSystemAccess, UNIT_COUNT,
ADD_STAT(writeAccess, Stats::Units::Count::get(),
"Histogram of write addresses"),
ADD_STAT(readAccess, Stats::Units::Count::get(),
"Histogram of read addresses"),
ADD_STAT(fileSystemAccess, Stats::Units::Count::get(),
"Histogram of file system accesses"),
ADD_STAT(writeLatency, UNIT_TICK, "Histogram of write latency"),
ADD_STAT(readLatency, UNIT_TICK, "Histogram of read latency")
ADD_STAT(writeLatency, Stats::Units::Tick::get(),
"Histogram of write latency"),
ADD_STAT(readLatency, Stats::Units::Tick::get(),
"Histogram of read latency")
{
using namespace Stats;

3
src/dev/arm/hdlcd.cc
View File

@@ -81,7 +81,8 @@ HDLcd::HDLcd(const HDLcdParams &p)
HDLcd::
HDLcdStats::HDLcdStats(Stats::Group *parent)
: Stats::Group(parent, "HDLcd"),
ADD_STAT(underruns, UNIT_COUNT, "Number of buffer underruns")
ADD_STAT(underruns, Stats::Units::Count::get(),
"Number of buffer underruns")
{
using namespace Stats;

14
src/dev/arm/smmu_v3.cc
View File

@@ -747,12 +747,14 @@ SMMUv3::init()
SMMUv3::SMMUv3Stats::SMMUv3Stats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(steL1Fetches, UNIT_COUNT, "STE L1 fetches"),
ADD_STAT(steFetches, UNIT_COUNT, "STE fetches"),
ADD_STAT(cdL1Fetches, UNIT_COUNT, "CD L1 fetches"),
ADD_STAT(cdFetches, UNIT_COUNT, "CD fetches"),
ADD_STAT(translationTimeDist, UNIT_TICK, "Time to translate address"),
ADD_STAT(ptwTimeDist, UNIT_TICK, "Time to walk page tables")
ADD_STAT(steL1Fetches, Stats::Units::Count::get(), "STE L1 fetches"),
ADD_STAT(steFetches, Stats::Units::Count::get(), "STE fetches"),
ADD_STAT(cdL1Fetches, Stats::Units::Count::get(), "CD L1 fetches"),
ADD_STAT(cdFetches, Stats::Units::Count::get(), "CD fetches"),
ADD_STAT(translationTimeDist, Stats::Units::Tick::get(),
"Time to translate address"),
ADD_STAT(ptwTimeDist, Stats::Units::Tick::get(),
"Time to walk page tables")
{
using namespace Stats;

45
src/dev/arm/smmu_v3_caches.cc
View File

@@ -85,20 +85,23 @@ SMMUv3BaseCache::
SMMUv3BaseCacheStats::SMMUv3BaseCacheStats(
Stats::Group *parent, const std::string &name)
: Stats::Group(parent, name.c_str()),
ADD_STAT(averageLookups,
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
ADD_STAT(averageLookups, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Second>::get(),
"Average number lookups per second"),
ADD_STAT(totalLookups, UNIT_COUNT, "Total number of lookups"),
ADD_STAT(averageMisses,
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
ADD_STAT(totalLookups, Stats::Units::Count::get(),
"Total number of lookups"),
ADD_STAT(averageMisses, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Second>::get(),
"Average number misses per second"),
ADD_STAT(totalMisses, UNIT_COUNT, "Total number of misses"),
ADD_STAT(averageUpdates,
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
ADD_STAT(totalMisses, Stats::Units::Count::get(),
"Total number of misses"),
ADD_STAT(averageUpdates, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Second>::get(),
"Average number updates per second"),
ADD_STAT(totalUpdates, UNIT_COUNT, "Total number of updates"),
ADD_STAT(averageHitRate, UNIT_RATIO, "Average hit rate"),
ADD_STAT(insertions, UNIT_COUNT,
ADD_STAT(totalUpdates, Stats::Units::Count::get(),
"Total number of updates"),
ADD_STAT(averageHitRate, Stats::Units::Ratio::get(), "Average hit rate"),
ADD_STAT(insertions, Stats::Units::Count::get(),
"Number of insertions (not replacements)")
{
using namespace Stats;
@@ -1226,13 +1229,13 @@ WalkCache::pickEntryIdxToReplace(const Set &set,
WalkCache::
WalkCacheStats::WalkCacheStats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(totalLookupsByStageLevel, UNIT_COUNT,
ADD_STAT(totalLookupsByStageLevel, Stats::Units::Count::get(),
"Total number of lookups"),
ADD_STAT(totalMissesByStageLevel, UNIT_COUNT,
ADD_STAT(totalMissesByStageLevel, Stats::Units::Count::get(),
"Total number of misses"),
ADD_STAT(totalUpdatesByStageLevel, UNIT_COUNT,
ADD_STAT(totalUpdatesByStageLevel, Stats::Units::Count::get(),
"Total number of updates"),
ADD_STAT(insertionsByStageLevel, UNIT_COUNT,
ADD_STAT(insertionsByStageLevel, Stats::Units::Count::get(),
"Number of insertions (not replacements)")
{
using namespace Stats;
@@ -1265,7 +1268,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent)
auto avg_lookup = new Stats::Formula(
this,
csprintf("averageLookups_S%dL%d", s+1, l).c_str(),
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
Stats::Units::Rate<Stats::Units::Count,
Stats::Units::Second>::get(),
"Average number lookups per second");
avg_lookup->flags(pdf);
averageLookupsByStageLevel.push_back(avg_lookup);
@@ -1276,7 +1280,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent)
auto avg_misses = new Stats::Formula(
this,
csprintf("averageMisses_S%dL%d", s+1, l).c_str(),
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
Stats::Units::Rate<Stats::Units::Count,
Stats::Units::Second>::get(),
"Average number misses per second");
avg_misses->flags(pdf);
averageMissesByStageLevel.push_back(avg_misses);
@@ -1287,7 +1292,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent)
auto avg_updates = new Stats::Formula(
this,
csprintf("averageUpdates_S%dL%d", s+1, l).c_str(),
UNIT_RATE(Stats::Units::Count, Stats::Units::Second),
Stats::Units::Rate<Stats::Units::Count,
Stats::Units::Second>::get(),
"Average number updates per second");
avg_updates->flags(pdf);
averageUpdatesByStageLevel.push_back(avg_updates);
@@ -1298,8 +1304,7 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent)
auto avg_hitrate = new Stats::Formula(
this,
csprintf("averageHitRate_S%dL%d", s+1, l).c_str(),
UNIT_RATIO,
"Average hit rate");
Stats::Units::Ratio::get(), "Average hit rate");
avg_hitrate->flags(pdf);
averageHitRateByStageLevel.push_back(avg_hitrate);

50
src/dev/arm/ufs_device.cc
View File

@@ -756,56 +756,56 @@ UFSHostDevice::UFSHostDevice(const UFSHostDeviceParams &p) :
UFSHostDevice::
UFSHostDeviceStats::UFSHostDeviceStats(UFSHostDevice *parent)
: Stats::Group(parent, "UFSDiskHost"),
ADD_STAT(currentSCSIQueue, UNIT_COUNT,
ADD_STAT(currentSCSIQueue, Stats::Units::Count::get(),
"Most up to date length of the command queue"),
ADD_STAT(currentReadSSDQueue, UNIT_COUNT,
ADD_STAT(currentReadSSDQueue, Stats::Units::Count::get(),
"Most up to date length of the read SSD queue"),
ADD_STAT(currentWriteSSDQueue, UNIT_COUNT,
ADD_STAT(currentWriteSSDQueue, Stats::Units::Count::get(),
"Most up to date length of the write SSD queue"),
/** Amount of data read/written */
ADD_STAT(totalReadSSD, UNIT_BYTE,
ADD_STAT(totalReadSSD, Stats::Units::Byte::get(),
"Number of bytes read from SSD"),
ADD_STAT(totalWrittenSSD, UNIT_BYTE,
ADD_STAT(totalWrittenSSD, Stats::Units::Byte::get(),
"Number of bytes written to SSD"),
ADD_STAT(totalReadDiskTransactions, UNIT_COUNT,
ADD_STAT(totalReadDiskTransactions, Stats::Units::Count::get(),
"Number of transactions from disk"),
ADD_STAT(totalWriteDiskTransactions, UNIT_COUNT,
ADD_STAT(totalWriteDiskTransactions, Stats::Units::Count::get(),
"Number of transactions to disk"),
ADD_STAT(totalReadUFSTransactions, UNIT_COUNT,
ADD_STAT(totalReadUFSTransactions, Stats::Units::Count::get(),
"Number of transactions from device"),
ADD_STAT(totalWriteUFSTransactions, UNIT_COUNT,
ADD_STAT(totalWriteUFSTransactions, Stats::Units::Count::get(),
"Number of transactions to device"),
/** Average bandwidth for reads and writes */
ADD_STAT(averageReadSSDBW,
UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
ADD_STAT(averageReadSSDBW, Stats::Units::Rate<
Stats::Units::Byte, Stats::Units::Second>::get(),
"Average read bandwidth",
totalReadSSD / simSeconds),
ADD_STAT(averageWriteSSDBW,
UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
ADD_STAT(averageWriteSSDBW, Stats::Units::Rate<
Stats::Units::Byte, Stats::Units::Second>::get(),
"Average write bandwidth",
totalWrittenSSD / simSeconds),
ADD_STAT(averageSCSIQueue,
UNIT_RATE(Stats::Units::Count, Stats::Units::Tick),
ADD_STAT(averageSCSIQueue, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Tick>::get(),
"Average command queue length"),
ADD_STAT(averageReadSSDQueue,
UNIT_RATE(Stats::Units::Count, Stats::Units::Tick),
ADD_STAT(averageReadSSDQueue, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Tick>::get(),
"Average read queue length"),
ADD_STAT(averageWriteSSDQueue,
UNIT_RATE(Stats::Units::Count, Stats::Units::Tick),
ADD_STAT(averageWriteSSDQueue, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Tick>::get(),
"Average write queue length"),
/** Number of doorbells rung*/
ADD_STAT(curDoorbell, UNIT_COUNT,
ADD_STAT(curDoorbell, Stats::Units::Count::get(),
"Most up to date number of doorbells used",
parent->activeDoorbells),
ADD_STAT(maxDoorbell, UNIT_COUNT,
ADD_STAT(maxDoorbell, Stats::Units::Count::get(),
"Maximum number of doorbells utilized"),
ADD_STAT(averageDoorbell,
UNIT_RATE(Stats::Units::Count, Stats::Units::Tick),
ADD_STAT(averageDoorbell, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Tick>::get(),
"Average number of Doorbells used"),
/** Latency*/
ADD_STAT(transactionLatency, UNIT_TICK,
ADD_STAT(transactionLatency, Stats::Units::Tick::get(),
"Histogram of transaction times"),
ADD_STAT(idleTimes, UNIT_TICK, "Histogram of idle times")
ADD_STAT(idleTimes, Stats::Units::Tick::get(), "Histogram of idle times")
{
using namespace Stats;

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

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

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

@@ -98,13 +98,14 @@ Device::~Device()
Device::DeviceStats::DeviceStats(Stats::Group *parent)
: Stats::Group(parent, "SinicDevice"),
ADD_STAT(totalVnicDistance, UNIT_COUNT,
ADD_STAT(totalVnicDistance, Stats::Units::Count::get(),
"Total vnic distance"),
ADD_STAT(numVnicDistance, UNIT_COUNT,
ADD_STAT(numVnicDistance, Stats::Units::Count::get(),
"Number of vnic distance measurements"),
ADD_STAT(maxVnicDistance, UNIT_COUNT, "Maximum vnic distance"),
ADD_STAT(avgVnicDistance,
UNIT_RATE(Stats::Units::Count, Stats::Units::Count),
ADD_STAT(maxVnicDistance, Stats::Units::Count::get(),
"Maximum vnic distance"),
ADD_STAT(avgVnicDistance, Stats::Units::Rate<
Stats::Units::Count, Stats::Units::Count>::get(),
"Average vnic distance", totalVnicDistance / numVnicDistance),
_maxVnicDistance(0)
{

4
src/dev/pci/copy_engine.cc
View File

@@ -431,9 +431,9 @@ CopyEngine::
CopyEngineStats::CopyEngineStats(Stats::Group *parent,
const uint8_t &channel_count)
: Stats::Group(parent, "CopyEngine"),
ADD_STAT(bytesCopied, UNIT_BYTE,
ADD_STAT(bytesCopied, Stats::Units::Byte::get(),
"Number of bytes copied by each engine"),
ADD_STAT(copiesProcessed, UNIT_COUNT,
ADD_STAT(copiesProcessed, Stats::Units::Count::get(),
"Number of copies processed by each engine")
{
bytesCopied

13
src/dev/storage/ide_disk.cc
View File

@@ -391,17 +391,18 @@ IdeDisk::doDmaDataRead()
IdeDisk::
IdeDiskStats::IdeDiskStats(Stats::Group *parent)
: Stats::Group(parent, "IdeDisk"),
ADD_STAT(dmaReadFullPages, UNIT_COUNT,
ADD_STAT(dmaReadFullPages, Stats::Units::Count::get(),
"Number of full page size DMA reads (not PRD)."),
ADD_STAT(dmaReadBytes, UNIT_BYTE,
ADD_STAT(dmaReadBytes, Stats::Units::Byte::get(),
"Number of bytes transfered via DMA reads (not PRD)."),
ADD_STAT(dmaReadTxs, UNIT_COUNT,
ADD_STAT(dmaReadTxs, Stats::Units::Count::get(),
"Number of DMA read transactions (not PRD)."),
ADD_STAT(dmaWriteFullPages, UNIT_COUNT,
ADD_STAT(dmaWriteFullPages, Stats::Units::Count::get(),
"Number of full page size DMA writes."),
ADD_STAT(dmaWriteBytes, UNIT_BYTE,
ADD_STAT(dmaWriteBytes, Stats::Units::Byte::get(),
"Number of bytes transfered via DMA writes."),
ADD_STAT(dmaWriteTxs, UNIT_COUNT, "Number of DMA write transactions.")
ADD_STAT(dmaWriteTxs, Stats::Units::Count::get(),
"Number of DMA write transactions.")
{
}