Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/29398 )
Change subject: sim,dev: Get rid of the global retryTime constant.
......................................................................
sim,dev: Get rid of the global retryTime constant.
This constant isn't in normalized units, ie doesn't scale when the time
value of a Tick changes, is global, has an extremely generic name even
though it's only used by a few ethernet devices, and has an arbitrary
value.
Get rid of it, and replace it with 1ns, what it would typically be
equivalent to when using the default 1ps time scale.
Change-Id: I31d9dad438f854b4152cd53c9a7042a25d13e0a6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29398
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Gabe Black <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/dev/net/etherswitch.cc
M src/dev/net/ethertap.cc
M src/dev/net/ns_gige.cc
M src/sim/core.hh
4 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/net/etherswitch.cc b/src/dev/net/etherswitch.cc
index e7a60a1..972cf56 100644
--- a/src/dev/net/etherswitch.cc
+++ b/src/dev/net/etherswitch.cc
@@ -184,7 +184,7 @@
if (!sendPacket(outputFifo.front())) {
DPRINTF(Ethernet, "output port busy...retry later\n");
if (!txEvent.scheduled())
- parent->schedule(txEvent, curTick() + retryTime);
+ parent->schedule(txEvent, curTick() + SimClock::Int::ns);
} else {
DPRINTF(Ethernet, "packet sent: len=%d\n",
outputFifo.front()->length);
outputFifo.pop();
diff --git a/src/dev/net/ethertap.cc b/src/dev/net/ethertap.cc
index 33bafb7..f4aba21 100644
--- a/src/dev/net/ethertap.cc
+++ b/src/dev/net/ethertap.cc
@@ -196,7 +196,7 @@
DPRINTF(Ethernet, "bus busy...buffer for retransmission\n");
packetBuffer.push(packet);
if (!txEvent.scheduled())
- schedule(txEvent, curTick() + retryTime);
+ schedule(txEvent, curTick() + SimClock::Int::ns);
} else if (dump) {
dump->dump(packet);
}
@@ -218,7 +218,7 @@
}
if (!packetBuffer.empty() && !txEvent.scheduled())
- schedule(txEvent, curTick() + retryTime);
+ schedule(txEvent, curTick() + SimClock::Int::ns);
}
diff --git a/src/dev/net/ns_gige.cc b/src/dev/net/ns_gige.cc
index 68c4497..71f449a 100644
--- a/src/dev/net/ns_gige.cc
+++ b/src/dev/net/ns_gige.cc
@@ -1395,7 +1395,7 @@
if (!txFifo.empty() && !txEvent.scheduled()) {
DPRINTF(Ethernet, "reschedule transmit\n");
- schedule(txEvent, curTick() + retryTime);
+ schedule(txEvent, curTick() + SimClock::Int::ns);
}
}
diff --git a/src/sim/core.hh b/src/sim/core.hh
index 7a7e911..48b7096 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -43,8 +43,6 @@
/// The universal simulation clock.
inline Tick curTick() { return _curEventQueue->getCurTick(); }
-const Tick retryTime = 1000;
-
/// These are variables that are set based on the simulator frequency
///@{
namespace SimClock {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29398
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I31d9dad438f854b4152cd53c9a7042a25d13e0a6
Gerrit-Change-Number: 29398
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
