Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13301 )
Change subject: systemc: Detach child events in the Object destructor.
......................................................................
systemc: Detach child events in the Object destructor.
This way they don't try to detach themselves from a parent object which
no longer exists.
Change-Id: Id4a3f3b2241cf8c67cae9b983bd4c1acbef083e3
Reviewed-on: https://gem5-review.googlesource.com/c/13301
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/core/event.cc
M src/systemc/core/event.hh
M src/systemc/core/object.cc
3 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index aa4a713..120b514 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -191,6 +191,16 @@
return _triggeredStamp == scheduler.changeStamp();
}
+void
+Event::clearParent()
+{
+ if (!parent)
+ return;
+ Object::getFromScObject(parent)->delChildEvent(sc_event());
+ parent = nullptr;
+ topLevelEvents.emplace(topLevelEvents.end(), sc_event());
+}
+
Events topLevelEvents;
Events allEvents;
diff --git a/src/systemc/core/event.hh b/src/systemc/core/event.hh
index 2d620c9..532d983 100644
--- a/src/systemc/core/event.hh
+++ b/src/systemc/core/event.hh
@@ -138,6 +138,8 @@
}
}
+ void clearParent();
+
private:
sc_core::sc_event *_sc_event;
diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index 91e3cb3..781e6d6 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -145,6 +145,9 @@
}
children.clear();
+ for (auto event: events)
+ Event::getFromScEvent(event)->clearParent();
+
if (parent)
popObject(&parent->_gem5_object->children, _name);
else
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13301
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Id4a3f3b2241cf8c67cae9b983bd4c1acbef083e3
Gerrit-Change-Number: 13301
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
