misc: Rename CallbackQueue2 to CallbackQueue.
authorGabe Black <gabeblack@google.com>
Fri, 14 Aug 2020 08:26:35 +0000 (01:26 -0700)
committerGabe Black <gabeblack@google.com>
Tue, 18 Aug 2020 23:21:30 +0000 (23:21 +0000)
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
src/base/statistics.cc
src/mem/backdoor.hh
src/sim/core.cc

index e7afd64e9d277abde2396e227f4eebb1f46ec01e..1591f182d61032bbdd4f1a64a3711aaa51f2b90d 100644 (file)
@@ -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()>>;
index 156fcbbe4fda65046c748e8a93ebed7d9a211cd6..5c77ee0b8e567551a2f49eb7960e202490582798 100644 (file)
@@ -518,8 +518,8 @@ registerHandlers(Handler reset_handler, Handler dump_handler)
     dumpHandler = dump_handler;
 }
 
-CallbackQueue2 dumpQueue;
-CallbackQueue2 resetQueue;
+CallbackQueue dumpQueue;
+CallbackQueue resetQueue;
 
 void
 processResetQueue()
index 596aa4edc82209c3dcaa0cbe5c220bd32c56f738..c3391f78cc4f7dbf37636a40e2c72d952bd4b10c 100644 (file)
@@ -113,7 +113,7 @@ class MemBackdoor
     }
 
   private:
-    CallbackQueue2 invalidationCallbacks;
+    CallbackQueue invalidationCallbacks;
 
     AddrRange _range;
     uint8_t *_ptr;
index 8dd5c852fa5dad12fc161575016daf18b93bdaf4..8b3624582e85e0021e3c86e02f576ee5b3d3e5cc 100644 (file)
@@ -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;
 }