[gem5-dev] Change in gem5/gem5[develop]: misc: Rename CallbackQueue2 to CallbackQueue.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
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
---
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(-)



diff --git a/src/base/callback.hh b/src/base/callback.hh
index a7c916a..9556883 100644
--- a/src/base/callback.hh
+++ b/src/base/callback.hh
@@ -33,7 +33,7 @@
 #include <list>

 template <typename ...Args>
-class CallbackQueue2 : public std::list<std::function<void(Args...)>>
+class CallbackQueue : public std::list<std::function<void(Args...)>>
 {
   public:
     using CBFunc = std::function<void(Args...)>;
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index a00c190..194bef1 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 42540eb..30fe8c5 100644
--- a/src/mem/backdoor.hh
+++ b/src/mem/backdoor.hh
@@ -113,7 +113,7 @@
     }

   private:
-    CallbackQueue2<const MemBackdoor &> invalidationCallbacks;
+    CallbackQueue<const MemBackdoor &> invalidationCallbacks;

     AddrRange _range;
     uint8_t *_ptr;
diff --git a/src/sim/core.cc b/src/sim/core.cc
index de4ee11..b67867e 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: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
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