[gem5-dev] Change in gem5/gem5[master]: systemc: Detach child events in the Object destructor.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
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
---
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(-)



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: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev