diff options
| author | Andreas Sandberg <Andreas.Sandberg@arm.com> | 2012-11-02 11:32:01 -0500 |
|---|---|---|
| committer | Andreas Sandberg <Andreas.Sandberg@arm.com> | 2012-11-02 11:32:01 -0500 |
| commit | b81a977e6ab7dbfd122cb778cfe3d40ca7451198 (patch) | |
| tree | 09804c27367de8cf93623ec4644bf47abf316bf9 /src/mem/bus.hh | |
| parent | eb703a4b4e167e4d45f92203a1e0849f19cdba6d (diff) | |
| download | gem5-b81a977e6ab7dbfd122cb778cfe3d40ca7451198.tar.xz | |
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.
Diffstat (limited to 'src/mem/bus.hh')
| -rw-r--r-- | src/mem/bus.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh index f3cbc9d24..19ffa020c 100644 --- a/src/mem/bus.hh +++ b/src/mem/bus.hh @@ -94,7 +94,7 @@ class BaseBus : public MemObject * whereas a response layer holds master ports. */ template <typename PortClass> - class Layer + class Layer : public Drainable { public: @@ -118,7 +118,7 @@ class BaseBus : public MemObject * * @return 1 if busy or waiting to retry, or 0 if idle */ - unsigned int drain(Event *de); + unsigned int drain(DrainManager *dm); /** * Get the bus layer's name @@ -206,8 +206,8 @@ class BaseBus : public MemObject /** the clock speed for the bus layer */ Tick clock; - /** event for signalling when drained */ - Event * drainEvent; + /** manager to signal when drained */ + DrainManager *drainManager; /** * An array of ports that retry should be called @@ -366,7 +366,7 @@ class BaseBus : public MemObject BaseSlavePort& getSlavePort(const std::string& if_name, PortID idx = InvalidPortID); - virtual unsigned int drain(Event *de) = 0; + virtual unsigned int drain(DrainManager *dm) = 0; }; |