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 <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

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()>>;

src/base/statistics.cc

@@ -518,8 +518,8 @@ registerHandlers(Handler reset_handler, Handler dump_handler)
     dumpHandler = dump_handler;
 }
 
-CallbackQueue2 dumpQueue;
-CallbackQueue2 resetQueue;
+CallbackQueue dumpQueue;
+CallbackQueue resetQueue;
 
 void
 processResetQueue()

src/mem/backdoor.hh

@@ -113,7 +113,7 @@ class MemBackdoor
     }
 
   private:
-    CallbackQueue2 invalidationCallbacks;
+    CallbackQueue invalidationCallbacks;
 
     AddrRange _range;
     uint8_t *_ptr;

src/sim/core.cc

@@ -126,10 +126,10 @@ setOutputDir(const string &dir)
 /**
  * Queue of C++ callbacks to invoke on simulator exit.
  */
-inline CallbackQueue2 &
+inline CallbackQueue &
 exitCallbacks()
 {
-    static CallbackQueue2 theQueue;
+    static CallbackQueue theQueue;
     return theQueue;
 }