[gem5-dev] Change in gem5/gem5[master]: systemc: Handle null and omitted event names.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/12258

Change subject: systemc: Handle null and omitted event names.
......................................................................

systemc: Handle null and omitted event names.

If the simulation isn't running, these should be replaced with versions
generated by sc_gen_unique_name().

Change-Id: Idd515e73ba17d3dfa866ee5509369e9c4e3fb2f5
---
M src/systemc/core/event.cc
1 file changed, 8 insertions(+), 3 deletions(-)



diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 77e47fb..4f3d4f9 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -37,18 +37,23 @@
 #include "sim/core.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
+#include "systemc/ext/core/sc_main.hh"
+#include "systemc/ext/core/sc_module.hh"

 namespace sc_gem5
 {

-Event::Event(sc_core::sc_event *_sc_event) : Event(_sc_event, "") {}
+Event::Event(sc_core::sc_event *_sc_event) : Event(_sc_event, nullptr) {}

-Event::Event(sc_core::sc_event *_sc_event, const char *_basename) :
-    _sc_event(_sc_event), _basename(_basename),
+Event::Event(sc_core::sc_event *_sc_event, const char *_basename_cstr) :
+    _sc_event(_sc_event), _basename(_basename_cstr ? _basename_cstr : ""),
     delayedNotify([this]() { this->notify(); })
 {
     Module *p = currentModule();

+    if (_basename == "" && ::sc_core::sc_is_running())
+        _basename = ::sc_core::sc_gen_unique_name("event");
+
     if (p)
         parent = p->obj()->sc_obj();
     else if (scheduler.current())

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12258
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: Idd515e73ba17d3dfa866ee5509369e9c4e3fb2f5
Gerrit-Change-Number: 12258
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