stop m5 from leaking like a sieve
don't create a new physPort/virtPort every time activateContext() is called add the ability to tell a memory object to delete it's reference to a port and a method to have a port call deletePortRefs() on the port owner as well as delete it's peer still need to stop calling connectMemoPorts() every time activateContext() is called or we'll overflow the bus id and panic src/cpu/thread_state.cc: if we hav ea (phys|virt)Port don't create a new on, have it delete it's peer and then reuse it src/mem/bus.cc: src/mem/bus.hh: add ability to delete a port by usig a hash_map instead of an array to store port ids add a function to do deleting src/mem/cache/cache.hh: src/mem/cache/cache_impl.hh: src/mem/mem_object.cc: src/mem/mem_object.hh: adda function to delete port references from a memory object src/mem/port.cc: src/mem/port.hh: add a removeConn function that tell the owener to delete any references to the port and then deletes its peer --HG-- extra : convert_revision : 272f0c8f80e1cf1ab1750d8be5a6c9aa110b06a4
This commit is contained in:
parent
87fb0eb8de
commit
027dfa01e6
9 changed files with 73 additions and 15 deletions
|
@ -125,6 +125,9 @@ ThreadState::connectPhysPort()
|
||||||
// @todo: For now this disregards any older port that may have
|
// @todo: For now this disregards any older port that may have
|
||||||
// already existed. Fix this memory leak once the bus port IDs
|
// already existed. Fix this memory leak once the bus port IDs
|
||||||
// for functional ports is resolved.
|
// for functional ports is resolved.
|
||||||
|
if (physPort)
|
||||||
|
physPort->removeConn();
|
||||||
|
else
|
||||||
physPort = new FunctionalPort(csprintf("%s-%d-funcport",
|
physPort = new FunctionalPort(csprintf("%s-%d-funcport",
|
||||||
baseCpu->name(), tid));
|
baseCpu->name(), tid));
|
||||||
connectToMemFunc(physPort);
|
connectToMemFunc(physPort);
|
||||||
|
@ -136,6 +139,9 @@ ThreadState::connectVirtPort()
|
||||||
// @todo: For now this disregards any older port that may have
|
// @todo: For now this disregards any older port that may have
|
||||||
// already existed. Fix this memory leak once the bus port IDs
|
// already existed. Fix this memory leak once the bus port IDs
|
||||||
// for functional ports is resolved.
|
// for functional ports is resolved.
|
||||||
|
if (virtPort)
|
||||||
|
virtPort->removeConn();
|
||||||
|
else
|
||||||
virtPort = new VirtualPort(csprintf("%s-%d-vport",
|
virtPort = new VirtualPort(csprintf("%s-%d-vport",
|
||||||
baseCpu->name(), tid));
|
baseCpu->name(), tid));
|
||||||
connectToMemFunc(virtPort);
|
connectToMemFunc(virtPort);
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
#include "base/misc.hh"
|
#include "base/misc.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "mem/bus.hh"
|
#include "mem/bus.hh"
|
||||||
|
@ -52,20 +54,30 @@ Bus::getPort(const std::string &if_name, int idx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// if_name ignored? forced to be empty?
|
// if_name ignored? forced to be empty?
|
||||||
int id = interfaces.size();
|
int id = maxId++;
|
||||||
|
assert(maxId < std::numeric_limits<typeof(maxId)>::max());
|
||||||
BusPort *bp = new BusPort(csprintf("%s-p%d", name(), id), this, id);
|
BusPort *bp = new BusPort(csprintf("%s-p%d", name(), id), this, id);
|
||||||
interfaces.push_back(bp);
|
interfaces[id] = bp;
|
||||||
return bp;
|
return bp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Bus::deletePortRefs(Port *p)
|
||||||
|
{
|
||||||
|
BusPort *bp = dynamic_cast<BusPort*>(p);
|
||||||
|
if (bp == NULL)
|
||||||
|
panic("Couldn't convert Port* to BusPort*\n");
|
||||||
|
interfaces.erase(bp->getId());
|
||||||
|
}
|
||||||
|
|
||||||
/** Get the ranges of anyone other buses that we are connected to. */
|
/** Get the ranges of anyone other buses that we are connected to. */
|
||||||
void
|
void
|
||||||
Bus::init()
|
Bus::init()
|
||||||
{
|
{
|
||||||
std::vector<BusPort*>::iterator intIter;
|
m5::hash_map<short,BusPort*>::iterator intIter;
|
||||||
|
|
||||||
for (intIter = interfaces.begin(); intIter != interfaces.end(); intIter++)
|
for (intIter = interfaces.begin(); intIter != interfaces.end(); intIter++)
|
||||||
(*intIter)->sendStatusChange(Port::RangeChange);
|
intIter->second->sendStatusChange(Port::RangeChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
Bus::BusFreeEvent::BusFreeEvent(Bus *_bus) : Event(&mainEventQueue), bus(_bus)
|
Bus::BusFreeEvent::BusFreeEvent(Bus *_bus) : Event(&mainEventQueue), bus(_bus)
|
||||||
|
@ -186,7 +198,7 @@ Bus::recvTiming(PacketPtr pkt)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
assert(dest >= 0 && dest < interfaces.size());
|
assert(dest >= 0 && dest < maxId);
|
||||||
assert(dest != pkt->getSrc()); // catch infinite loops
|
assert(dest != pkt->getSrc()); // catch infinite loops
|
||||||
port = interfaces[dest];
|
port = interfaces[dest];
|
||||||
}
|
}
|
||||||
|
@ -435,7 +447,6 @@ Bus::recvStatusChange(Port::Status status, int id)
|
||||||
{
|
{
|
||||||
AddrRangeList ranges;
|
AddrRangeList ranges;
|
||||||
AddrRangeList snoops;
|
AddrRangeList snoops;
|
||||||
int x;
|
|
||||||
AddrRangeIter iter;
|
AddrRangeIter iter;
|
||||||
|
|
||||||
assert(status == Port::RangeChange &&
|
assert(status == Port::RangeChange &&
|
||||||
|
@ -457,7 +468,7 @@ Bus::recvStatusChange(Port::Status status, int id)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
assert((id < interfaces.size() && id >= 0) || id == defaultId);
|
assert((id < maxId && id >= 0) || id == defaultId);
|
||||||
Port *port = interfaces[id];
|
Port *port = interfaces[id];
|
||||||
range_map<Addr,int>::iterator portIter;
|
range_map<Addr,int>::iterator portIter;
|
||||||
std::vector<DevMap>::iterator snoopIter;
|
std::vector<DevMap>::iterator snoopIter;
|
||||||
|
@ -502,9 +513,11 @@ Bus::recvStatusChange(Port::Status status, int id)
|
||||||
|
|
||||||
// tell all our peers that our address range has changed.
|
// tell all our peers that our address range has changed.
|
||||||
// Don't tell the device that caused this change, it already knows
|
// Don't tell the device that caused this change, it already knows
|
||||||
for (x = 0; x < interfaces.size(); x++)
|
m5::hash_map<short,BusPort*>::iterator intIter;
|
||||||
if (x != id)
|
|
||||||
interfaces[x]->sendStatusChange(Port::RangeChange);
|
for (intIter = interfaces.begin(); intIter != interfaces.end(); intIter++)
|
||||||
|
if (intIter->first != id)
|
||||||
|
intIter->second->sendStatusChange(Port::RangeChange);
|
||||||
|
|
||||||
if (id != defaultId && defaultPort)
|
if (id != defaultId && defaultPort)
|
||||||
defaultPort->sendStatusChange(Port::RangeChange);
|
defaultPort->sendStatusChange(Port::RangeChange);
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
#include "base/range.hh"
|
#include "base/range.hh"
|
||||||
|
#include "base/hashmap.hh"
|
||||||
#include "base/range_map.hh"
|
#include "base/range_map.hh"
|
||||||
#include "mem/mem_object.hh"
|
#include "mem/mem_object.hh"
|
||||||
#include "mem/packet.hh"
|
#include "mem/packet.hh"
|
||||||
|
@ -212,9 +213,12 @@ class Bus : public MemObject
|
||||||
|
|
||||||
bool inRetry;
|
bool inRetry;
|
||||||
|
|
||||||
|
/** max number of bus ids we've handed out so far */
|
||||||
|
short maxId;
|
||||||
|
|
||||||
/** An array of pointers to the peer port interfaces
|
/** An array of pointers to the peer port interfaces
|
||||||
connected to this bus.*/
|
connected to this bus.*/
|
||||||
std::vector<BusPort*> interfaces;
|
m5::hash_map<short,BusPort*> interfaces;
|
||||||
|
|
||||||
/** An array of pointers to ports that retry should be called on because the
|
/** An array of pointers to ports that retry should be called on because the
|
||||||
* original send failed for whatever reason.*/
|
* original send failed for whatever reason.*/
|
||||||
|
@ -252,6 +256,7 @@ class Bus : public MemObject
|
||||||
|
|
||||||
/** A function used to return the port associated with this bus object. */
|
/** A function used to return the port associated with this bus object. */
|
||||||
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
||||||
|
virtual void deletePortRefs(Port *p);
|
||||||
|
|
||||||
virtual void init();
|
virtual void init();
|
||||||
|
|
||||||
|
@ -261,7 +266,7 @@ class Bus : public MemObject
|
||||||
bool responder_set)
|
bool responder_set)
|
||||||
: MemObject(n), busId(bus_id), clock(_clock), width(_width),
|
: MemObject(n), busId(bus_id), clock(_clock), width(_width),
|
||||||
tickNextIdle(0), drainEvent(NULL), busIdle(this), inRetry(false),
|
tickNextIdle(0), drainEvent(NULL), busIdle(this), inRetry(false),
|
||||||
defaultPort(NULL), responderSet(responder_set)
|
maxId(0), defaultPort(NULL), responderSet(responder_set)
|
||||||
{
|
{
|
||||||
//Both the width and clock period must be positive
|
//Both the width and clock period must be positive
|
||||||
if (width <= 0)
|
if (width <= 0)
|
||||||
|
|
1
src/mem/cache/cache.hh
vendored
1
src/mem/cache/cache.hh
vendored
|
@ -331,6 +331,7 @@ class Cache : public BaseCache
|
||||||
Cache(const std::string &_name, Params ¶ms);
|
Cache(const std::string &_name, Params ¶ms);
|
||||||
|
|
||||||
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
||||||
|
virtual void deletePortRefs(Port *p);
|
||||||
|
|
||||||
virtual void recvStatusChange(Port::Status status, bool isCpuSide);
|
virtual void recvStatusChange(Port::Status status, bool isCpuSide);
|
||||||
|
|
||||||
|
|
11
src/mem/cache/cache_impl.hh
vendored
11
src/mem/cache/cache_impl.hh
vendored
|
@ -1100,7 +1100,7 @@ Cache<TagStore,Coherence>::getPort(const std::string &if_name, int idx)
|
||||||
}
|
}
|
||||||
else if (if_name == "functional")
|
else if (if_name == "functional")
|
||||||
{
|
{
|
||||||
return new CpuSidePort(name() + "-cpu_side_port", this);
|
return new CpuSidePort(name() + "-cpu_side_funcport", this);
|
||||||
}
|
}
|
||||||
else if (if_name == "cpu_side")
|
else if (if_name == "cpu_side")
|
||||||
{
|
{
|
||||||
|
@ -1121,6 +1121,15 @@ Cache<TagStore,Coherence>::getPort(const std::string &if_name, int idx)
|
||||||
else panic("Port name %s unrecognized\n", if_name);
|
else panic("Port name %s unrecognized\n", if_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class TagStore, class Coherence>
|
||||||
|
void
|
||||||
|
Cache<TagStore,Coherence>::deletePortRefs(Port *p)
|
||||||
|
{
|
||||||
|
if (cpuSidePort == p || memSidePort == p)
|
||||||
|
panic("Can only delete functional ports\n");
|
||||||
|
// nothing else to do
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
template<class TagStore, class Coherence>
|
template<class TagStore, class Coherence>
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -35,5 +35,10 @@ MemObject::MemObject(const std::string &name)
|
||||||
: SimObject(name)
|
: SimObject(name)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
void
|
||||||
|
MemObject::deletePortRefs(Port *p)
|
||||||
|
{
|
||||||
|
panic("This object does not support port deletion\n");
|
||||||
|
}
|
||||||
|
|
||||||
DEFINE_SIM_OBJECT_CLASS_NAME("MemObject", MemObject)
|
DEFINE_SIM_OBJECT_CLASS_NAME("MemObject", MemObject)
|
||||||
|
|
|
@ -51,6 +51,10 @@ class MemObject : public SimObject
|
||||||
public:
|
public:
|
||||||
/** Additional function to return the Port of a memory object. */
|
/** Additional function to return the Port of a memory object. */
|
||||||
virtual Port *getPort(const std::string &if_name, int idx = -1) = 0;
|
virtual Port *getPort(const std::string &if_name, int idx = -1) = 0;
|
||||||
|
|
||||||
|
/** Tell object that this port is about to disappear, so it should remove it
|
||||||
|
* from any structures that it's keeping it in. */
|
||||||
|
virtual void deletePortRefs(Port *p) ;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //__MEM_MEM_OBJECT_HH__
|
#endif //__MEM_MEM_OBJECT_HH__
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
|
|
||||||
#include "base/chunk_generator.hh"
|
#include "base/chunk_generator.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "mem/mem_object.hh"
|
||||||
#include "mem/port.hh"
|
#include "mem/port.hh"
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -45,6 +46,15 @@ Port::setPeer(Port *port)
|
||||||
peer = port;
|
peer = port;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Port::removeConn()
|
||||||
|
{
|
||||||
|
if (peer->getOwner())
|
||||||
|
peer->getOwner()->deletePortRefs(peer);
|
||||||
|
delete peer;
|
||||||
|
peer = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Port::blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd)
|
Port::blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -131,6 +131,11 @@ class Port
|
||||||
/** Function to return the owner of this port. */
|
/** Function to return the owner of this port. */
|
||||||
MemObject *getOwner() { return owner; }
|
MemObject *getOwner() { return owner; }
|
||||||
|
|
||||||
|
/** Inform the peer port to delete itself and notify it's owner about it's
|
||||||
|
* demise. */
|
||||||
|
void removeConn();
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
/** These functions are protected because they should only be
|
/** These functions are protected because they should only be
|
||||||
|
|
Loading…
Reference in a new issue