Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/32651 )
Change subject: misc: Rename CallbackQueue2 to CallbackQueue.
......................................................................
misc: Rename CallbackQueue2 to CallbackQueue.
Now that the original CallbackQueue has been removed, CallbackQueue2 can
fully take it's place.
Issue-on: https://gem5.atlassian.net/browse/GEM5-698
Change-Id: I925f647cbbd393045a22f7cbd5d8b4d7d23d19b0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32651
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/base/callback.hh
M src/base/statistics.cc
M src/mem/backdoor.hh
M src/sim/core.cc
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/callback.hh b/src/base/callback.hh
index e7afd64..1591f18 100644
--- a/src/base/callback.hh
+++ b/src/base/callback.hh
@@ -32,7 +32,7 @@
#include <functional>
#include <list>
-class CallbackQueue2 : public std::list<std::function<void()>>
+class CallbackQueue : public std::list<std::function<void()>>
{
public:
using Base = std::list<std::function<void()>>;
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 156fcbb..5c77ee0 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -518,8 +518,8 @@
dumpHandler = dump_handler;
}
-CallbackQueue2 dumpQueue;
-CallbackQueue2 resetQueue;
+CallbackQueue dumpQueue;
+CallbackQueue resetQueue;
void
processResetQueue()
diff --git a/src/mem/backdoor.hh b/src/mem/backdoor.hh
index 596aa4e..c3391f7 100644
--- a/src/mem/backdoor.hh
+++ b/src/mem/backdoor.hh
@@ -113,7 +113,7 @@
}
private:
- CallbackQueue2 invalidationCallbacks;
+ CallbackQueue invalidationCallbacks;
AddrRange _range;
uint8_t *_ptr;
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 8dd5c85..8b36245 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -126,10 +126,10 @@
/**
* Queue of C++ callbacks to invoke on simulator exit.
*/
-inline CallbackQueue2 &
+inline CallbackQueue &
exitCallbacks()
{
- static CallbackQueue2 theQueue;
+ static CallbackQueue theQueue;
return theQueue;
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/32651
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: I925f647cbbd393045a22f7cbd5d8b4d7d23d19b0
Gerrit-Change-Number: 32651
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Mahyar Samani <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
