diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2015-11-06 03:26:21 -0500 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-11-06 03:26:21 -0500 |
commit | ac1368df50af123b32b41d7115ea4a0f15f7c97f (patch) | |
tree | 107ba41258ee0a30de841624bc6f3c5fab041d8f /src/mem/dram_ctrl.hh | |
parent | 2cb5467e8514934c4d88304c65050adead0ffc7e (diff) | |
download | gem5-ac1368df50af123b32b41d7115ea4a0f15f7c97f.tar.xz |
mem: Unify delayed packet deletion
This patch unifies how we deal with delayed packet deletion, where the
receiving slave is responsible for deleting the packet, but the
sending agent (e.g. a cache) is still relying on the pointer until the
call to sendTimingReq completes. Previously we used a mix of a
deletion vector and a construct using unique_ptr. With this patch we
ensure all slaves use the latter approach.
Diffstat (limited to 'src/mem/dram_ctrl.hh')
-rw-r--r-- | src/mem/dram_ctrl.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/dram_ctrl.hh b/src/mem/dram_ctrl.hh index 617c94914..6cd72b266 100644 --- a/src/mem/dram_ctrl.hh +++ b/src/mem/dram_ctrl.hh @@ -836,11 +836,11 @@ class DRAMCtrl : public AbstractMemory // timestamp offset uint64_t timeStampOffset; - /** @todo this is a temporary workaround until the 4-phase code is - * committed. upstream caches needs this packet until true is returned, so - * hold onto it for deletion until a subsequent call + /** + * Upstream caches need this packet until true is returned, so + * hold it for deletion until a subsequent call */ - std::vector<PacketPtr> pendingDelete; + std::unique_ptr<Packet> pendingDelete; /** * This function increments the energy when called. If stats are |