diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-04 09:40:19 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-11 16:55:30 +0000 |
| commit | f54020eb8155371725ab75b0fc5c419287eca084 (patch) | |
| tree | 65d379f7603e689e083e9a58ff4c2e90abd19fbf /src/dev | |
| parent | 2113b21996d086dab32b9fd388efe3df241bfbd2 (diff) | |
| download | gem5-f54020eb8155371725ab75b0fc5c419287eca084.tar.xz | |
misc: Using smart pointers for memory Requests
This patch is changing the underlying type for RequestPtr from Request*
to shared_ptr<Request>. Having memory requests being managed by smart
pointers will simplify the code; it will also prevent memory leakage and
dangling pointers.
Change-Id: I7749af38a11ac8eb4d53d8df1252951e0890fde3
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/10996
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/dma_device.cc | 8 | ||||
| -rw-r--r-- | src/dev/x86/i82094aa.cc | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/dev/dma_device.cc b/src/dev/dma_device.cc index a80cffc09..c445fbc77 100644 --- a/src/dev/dma_device.cc +++ b/src/dev/dma_device.cc @@ -95,8 +95,7 @@ DmaPort::handleResp(PacketPtr pkt, Tick delay) delete state; } - // delete the request that we created and also the packet - delete pkt->req; + // delete the packet delete pkt; // we might be drained at this point, if so signal the drain event @@ -165,7 +164,10 @@ DmaPort::dmaAction(Packet::Command cmd, Addr addr, int size, Event *event, event ? event->scheduled() : -1); for (ChunkGenerator gen(addr, size, sys->cacheLineSize()); !gen.done(); gen.next()) { - req = new Request(gen.addr(), gen.size(), flag, masterId); + + req = std::make_shared<Request>( + gen.addr(), gen.size(), flag, masterId); + req->taskId(ContextSwitchTaskId::DMA); PacketPtr pkt = new Packet(req, cmd); diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc index a4b05b007..51304f25a 100644 --- a/src/dev/x86/i82094aa.cc +++ b/src/dev/x86/i82094aa.cc @@ -92,7 +92,6 @@ Tick X86ISA::I82094AA::recvResponse(PacketPtr pkt) { // Packet instantiated calling sendMessage() in signalInterrupt() - delete pkt->req; delete pkt; return 0; } |