changeset 3bf3100e9fa1 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=3bf3100e9fa1
description:
Ruby: Fix RubyPort evict packet memory leak
When using the o3 or inorder CPUs with many Ruby protocols, the caches
may
need to forward invalidations to the CPUs. The RubyPort was
instantiating a
packet to be sent to the CPUs to signal the eviction, but the packets
were
not being freed by the CPUs. Consistent with the classic memory model,
stack
allocate the packet and heap allocate the request so on
ruby_eviction_callback() completion, the packet deconstructor is
called, and
deletes the request (*Note: stack allocating the request causes double
deletion, since it will be deleted in the packet destructor). This
results in
the least memory allocations without memory errors.
diffstat:
src/mem/ruby/system/RubyPort.cc | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r 476febc1aff0 -r 3bf3100e9fa1 src/mem/ruby/system/RubyPort.cc
--- a/src/mem/ruby/system/RubyPort.cc Tue Apr 09 16:25:29 2013 -0500
+++ b/src/mem/ruby/system/RubyPort.cc Tue Apr 09 16:25:30 2013 -0500
@@ -496,14 +496,19 @@
RubyPort::ruby_eviction_callback(const Address& address)
{
DPRINTF(RubyPort, "Sending invalidations.\n");
- // should this really be using funcMasterId?
- Request req(address.getAddress(), 0, 0, Request::funcMasterId);
+ // This request is deleted in the stack-allocated packet destructor
+ // when this function exits
+ // TODO: should this really be using funcMasterId?
+ RequestPtr req =
+ new Request(address.getAddress(), 0, 0, Request::funcMasterId);
+ // Use a single packet to signal all snooping ports of the invalidation.
+ // This assumes that snooping ports do NOT modify the packet/request
+ Packet pkt(req, MemCmd::InvalidationReq);
for (CpuPortIter p = slave_ports.begin(); p != slave_ports.end(); ++p) {
// check if the connected master port is snooping
if ((*p)->isSnooping()) {
- Packet *pkt = new Packet(&req, MemCmd::InvalidationReq);
// send as a snoop request
- (*p)->sendTimingSnoopReq(pkt);
+ (*p)->sendTimingSnoopReq(&pkt);
}
}
}
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
