derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem: Use the new type of CallbackQueue in the MemBackdoor.

Browse Source 
Issue-on: https://gem5.atlassian.net/browse/GEM5-698
Change-Id: Ide40528f8c613b46204550d6e6840a7b274a366a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32643
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2020-08-13 23:29:55 -07:00
parent 4f121c11a2
commit 316f7d42dc
1 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mem/backdoor.hh
View File

@@ -42,28 +42,6 @@ class MemBackdoor
// a const reference to this back door as their only parameter.
typedef std::function<void(const MemBackdoor &backdoor)> CbFunction;
private:
// This wrapper class holds the callables described above so that they
// can be stored in a generic CallbackQueue.
class Callback : public ::Callback
{
public:
Callback(MemBackdoor &bd, CbFunction cb) :
_backdoor(bd), cbFunction(cb)
{}
void process() override { cbFunction(_backdoor); }
// It looks like this is only called when the CallbackQueue is
// destroyed and this Callback is currently in the queue.
void autoDestruct() override { delete this; }
MemBackdoor &backdoor() { return _backdoor; }
private:
MemBackdoor &_backdoor;
CbFunction cbFunction;
};
public:
enum Flags{
// How data is allowed to be accessed through this backdoor.
@@ -108,7 +86,6 @@ class MemBackdoor
void flags(Flags f) { _flags = f; }
MemBackdoor(AddrRange r, uint8_t *p, Flags flags) :
invalidationCallbacks(new CallbackQueue),
_range(r), _ptr(p), _flags(flags)
{}
@@ -121,9 +98,7 @@ class MemBackdoor
void
addInvalidationCallback(CbFunction func)
{
auto *cb = new MemBackdoor::Callback(*this, func);
assert(cb);
invalidationCallbacks->add(cb);
invalidationCallbacks.push_back([this,func](){ func(*this); });
}
// Notify and clear invalidation callbacks when the data in the backdoor
@@ -133,14 +108,12 @@ class MemBackdoor
void
invalidate()
{
invalidationCallbacks->process();
// Delete and recreate the callback queue to ensure the callback
// objects are deleted.
invalidationCallbacks.reset(new CallbackQueue());
invalidationCallbacks.process();
invalidationCallbacks.clear();
}
private:
std::unique_ptr<CallbackQueue> invalidationCallbacks;
CallbackQueue2 invalidationCallbacks;
AddrRange _range;
uint8_t *_ptr;