From 17afbc2416d943d9de3a63270d51fc1f3aa5107d Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Fri, 14 Aug 2020 01:26:35 -0700
Subject: [PATCH] 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   | 2 +-
 src/base/statistics.cc | 4 ++--
 src/mem/backdoor.hh    | 2 +-
 src/sim/core.cc        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/base/callback.hh b/src/base/callback.hh
index e7afd64e9..1591f182d 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 156fcbbe4..5c77ee0b8 100644
--- a/src/base/statistics.cc
+++ b/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()
diff --git a/src/mem/backdoor.hh b/src/mem/backdoor.hh
index 596aa4edc..c3391f78c 100644
--- a/src/mem/backdoor.hh
+++ b/src/mem/backdoor.hh
@@ -113,7 +113,7 @@ class MemBackdoor
     }
 
   private:
-    CallbackQueue2 invalidationCallbacks;
+    CallbackQueue invalidationCallbacks;
 
     AddrRange _range;
     uint8_t *_ptr;
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 8dd5c852f..8b3624582 100644
--- a/src/sim/core.cc
+++ b/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;
 }
 
-- 
2.30.2