sim: Move the draining interface into a separate base class

This patch moves the draining interface from SimObject to a separate
class that can be used by any object needing draining. However,
objects not visible to the Python code (i.e., objects not deriving
from SimObject) still depend on their parents informing them when to
drain. This patch also gets rid of the CountedDrainEvent (which isn't
really an event) and replaces it with a DrainManager.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/dev/dma_device.hh b/src/dev/dma_device.hh
index cd328f3d6..3b4bb522d 100644
--- a/src/dev/dma_device.hh
+++ b/src/dev/dma_device.hh
@@ -48,6 +48,7 @@
 
 #include "dev/io_device.hh"
 #include "params/DmaDevice.hh"
+#include "sim/drain.hh"
 
 class DmaPort : public MasterPort
 {
@@ -123,7 +124,7 @@ class DmaPort : public MasterPort
 
     /** If we need to drain, keep the drain event around until we're done
      * here.*/
-    Event *drainEvent;
+    DrainManager *drainManager;
 
     /** If the port is currently waiting for a retry before it can
      * send whatever it is that it's sending. */
@@ -146,7 +147,7 @@ class DmaPort : public MasterPort
     bool dmaPending() const { return pendingCount > 0; }
 
     unsigned cacheBlockSize() const { return peerBlockSize(); }
-    unsigned int drain(Event *de);
+    unsigned int drain(DrainManager *drainManger);
 };
 
 class DmaDevice : public PioDevice
@@ -175,7 +176,7 @@ class DmaDevice : public PioDevice
 
     virtual void init();
 
-    virtual unsigned int drain(Event *de);
+    unsigned int drain(DrainManager *drainManger);
 
     unsigned cacheBlockSize() const { return dmaPort.cacheBlockSize(); }