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

misc: Collapse all uses of DTRACE(x) to Debug::x.

Browse Source 
Also mark the DTRACE macro as deprecated.

Change-Id: I99d9a9544b539117b375186e3e425d73d3c5cab7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45009
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
Gabe Black
2021-04-29 22:47:31 -07:00
parent 2af00af0f6
commit 41d934cf18
38 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dev/net/i8254xGBe.cc
View File

@@ -1798,7 +1798,7 @@ IGbE::TxDescCache::pktComplete()
tsoPrevSeq = tsoUsedLen;
}
if (DTRACE(EthernetDesc)) {
if (Debug::EthernetDesc) {
IpPtr ip(pktPtr);
if (ip)
DPRINTF(EthernetDesc, "Proccesing Ip packet with Id=%d\n",
@@ -2291,7 +2291,7 @@ IGbE::txWire()
if (etherInt->sendPacket(txFifo.front())) {
if (DTRACE(EthernetSM)) {
if (Debug::EthernetSM) {
IpPtr ip(txFifo.front());
if (ip)
DPRINTF(EthernetSM, "Transmitting Ip packet with Id=%d\n",

4
src/dev/net/ns_gige.cc
View File

@@ -1163,7 +1163,7 @@ NSGigE::rxKick()
rxPacketBufPtr = rxPacket->data;
#if TRACING_ON
if (DTRACE(Ethernet)) {
if (Debug::Ethernet) {
IpPtr ip(rxPacket);
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());
@@ -1360,7 +1360,7 @@ NSGigE::transmit()
txFifo.size());
if (interface->sendPacket(txFifo.front())) {
#if TRACING_ON
if (DTRACE(Ethernet)) {
if (Debug::Ethernet) {
IpPtr ip(txFifo.front());
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());

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

@@ -711,7 +711,7 @@ Device::rxKick()
switch (rxState) {
case rxFifoBlock:
if (DTRACE(EthernetSM)) {
if (Debug::EthernetSM) {
PacketFifo::iterator end = rxFifo.end();
int size = virtualRegs.size();
for (int i = 0; i < size; ++i) {
@@ -965,7 +965,7 @@ Device::transmit()
txFifo.pop();
#if TRACING_ON
if (DTRACE(Ethernet)) {
if (Debug::Ethernet) {
IpPtr ip(packet);
if (ip) {
DPRINTF(Ethernet, "ID is %d\n", ip->id());

2
src/dev/serial/terminal.cc
View File

@@ -324,7 +324,7 @@ void
Terminal::writeData(uint8_t c)
{
#if TRACING_ON == 1
if (DTRACE(Terminal)) {
if (Debug::Terminal) {
static char last = '\0';
if ((c != '\n' && c != '\r') || (last != '\n' && last != '\r')) {

6
src/dev/virtio/base.cc
View File

@@ -105,7 +105,7 @@ VirtDescriptor::updateChain()
void
VirtDescriptor::dump() const
{
if (!DTRACE(VIO))
if (!Debug::VIO)
return;
DPRINTF(VIO, "Descriptor[%i]: "
@@ -122,7 +122,7 @@ VirtDescriptor::dump() const
void
VirtDescriptor::dumpChain() const
{
if (!DTRACE(VIO))
if (!Debug::VIO)
return;
const VirtDescriptor *desc(this);
@@ -314,7 +314,7 @@ VirtQueue::produceDescriptor(VirtDescriptor *desc, uint32_t len)
void
VirtQueue::dump() const
{
if (!DTRACE(VIO))
if (!Debug::VIO)
return;
for (const VirtDescriptor &d : descriptors)

4
src/dev/virtio/fs9p.cc
View File

@@ -194,7 +194,7 @@ void
VirtIO9PBase::dumpMsg(const P9MsgHeader &header, const uint8_t *data, size_t size)
{
#ifndef NDEBUG
if (!DTRACE(VIO9P))
if (!Debug::VIO9P)
return;
const P9MsgInfoMap::const_iterator it_msg(p9_msg_info.find(header.type));
@@ -386,7 +386,7 @@ VirtIO9PDiod::startDiod()
// Start diod
execlp(p.diod.c_str(), p.diod.c_str(),
"-d", DTRACE(VIO9P) ? "1" : "0", // show debug output
"-d", Debug::VIO9P ? "1" : "0", // show debug output
"-f", // start in foreground
"-r", diod_rfd_s.c_str(), // setup read FD
"-w", diod_wfd_s.c_str(), // setup write FD