diff options
| author | Jordi Vaquero <jordi.vaquero@metempsy.com> | 2019-09-11 00:11:27 +0200 |
|---|---|---|
| committer | Jordi Vaquero <jordi.vaquero@metempsy.com> | 2019-09-23 12:32:08 +0000 |
| commit | e5a82da26e29560f3e7121b600a12f8acd6a5a3f (patch) | |
| tree | 31786646cd8b077b48381303d0352959038e15a2 /src/arch/generic | |
| parent | a56ab04598be184427e8dd71fa5528b016738306 (diff) | |
| download | gem5-e5a82da26e29560f3e7121b600a12f8acd6a5a3f.tar.xz | |
cpu, mem: Changing AtomicOpFunctor* for unique_ptr<AtomicOpFunctor>
This change is based on modify the way we move the AtomicOpFunctor*
through gem5 in order to mantain proper ownership of the object and
ensuring its destruction when it is no longer used.
Doing that we fix at the same time a memory leak in Request.hh
where we were assigning a new AtomicOpFunctor* without destroying the
previous one.
This change creates a new type AtomicOpFunctor_ptr as a
std::unique_ptr<AtomicOpFunctor> and move its ownership as needed. Except
for its only usage when AtomicOpFunc() is called.
Change-Id: Ic516f9d8217cb1ae1f0a19500e5da0336da9fd4f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20919
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/arch/generic')
| -rw-r--r-- | src/arch/generic/memhelpers.hh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/arch/generic/memhelpers.hh b/src/arch/generic/memhelpers.hh index 7fd4f70de..fa1af2694 100644 --- a/src/arch/generic/memhelpers.hh +++ b/src/arch/generic/memhelpers.hh @@ -125,15 +125,16 @@ writeMemAtomic(XC *xc, Trace::InstRecord *traceData, const MemT &mem, template <class XC, class MemT> Fault amoMemAtomic(XC *xc, Trace::InstRecord *traceData, MemT &mem, Addr addr, - Request::Flags flags, AtomicOpFunctor *amo_op) + Request::Flags flags, AtomicOpFunctor *_amo_op) { - assert(amo_op); + assert(_amo_op); // mem will hold the previous value at addr after the AMO completes memset(&mem, 0, sizeof(mem)); + AtomicOpFunctorPtr amo_op = AtomicOpFunctorPtr(_amo_op); Fault fault = xc->amoMem(addr, (uint8_t *)&mem, sizeof(MemT), flags, - amo_op); + std::move(amo_op)); if (fault == NoFault) { mem = TheISA::gtoh(mem); @@ -147,10 +148,11 @@ amoMemAtomic(XC *xc, Trace::InstRecord *traceData, MemT &mem, Addr addr, template <class XC, class MemT> Fault initiateMemAMO(XC *xc, Trace::InstRecord *traceData, Addr addr, MemT& mem, - Request::Flags flags, AtomicOpFunctor *amo_op) + Request::Flags flags, AtomicOpFunctor *_amo_op) { - assert(amo_op); - return xc->initiateMemAMO(addr, sizeof(MemT), flags, amo_op); + assert(_amo_op); + AtomicOpFunctorPtr amo_op = AtomicOpFunctorPtr(_amo_op); + return xc->initiateMemAMO(addr, sizeof(MemT), flags, std::move(amo_op)); } #endif |