Add simcontext to sc_object, make simcontext thread local, handle sub-simcontext construction in simcontext::init

Signed-off-by: Mark Burton <mburton@quicinc.com>

Author: markfoodyburton

src/sysc/communication/sc_prim_channel.cpp

@@ -48,7 +48,7 @@ namespace sc_core {
 // constructors
 
 sc_prim_channel::sc_prim_channel()
-: sc_object( 0 ),
+: sc_object(),
   m_registry( simcontext()->get_prim_channel_registry() ),
   m_update_next_p( 0 ) 
 {

src/sysc/kernel/sc_module.cpp

@@ -116,10 +116,10 @@ sc_module::sc_module_init()
  *
  */
 
-sc_module::sc_module()
+sc_module::sc_module(sc_simcontext *simc)
   : sc_object_host(sc_core::sc_get_curr_simcontext()
                       ->get_object_manager()
-                      ->top_of_module_name_stack_name())
+                      ->top_of_module_name_stack_name(), simc)
   , sensitive(this)
   , sensitive_pos(this)
   , sensitive_neg(this)
@@ -142,10 +142,10 @@ sc_module::sc_module()
     m_module_name_p = mod_name; // must come after sc_module_init call.
 }
 
-sc_module::sc_module( const sc_module_name& )
+sc_module::sc_module( const sc_module_name&,  sc_simcontext *simc)
   : sc_object_host(sc_core::sc_get_curr_simcontext()
                       ->get_object_manager()
-                      ->top_of_module_name_stack_name())
+                      ->top_of_module_name_stack_name(), simc)
   , sensitive(this)
   , sensitive_pos(this)
   , sensitive_neg(this)

src/sysc/kernel/sc_module.h

@@ -124,8 +124,8 @@ class SC_API sc_module
     void sc_module_init();
 
     // constructor
-    sc_module();
-    sc_module( const sc_module_name& nm ); /* for those used to old style */
+    sc_module(sc_simcontext *simc=nullptr);
+    sc_module( const sc_module_name& nm, sc_simcontext *simc=nullptr ); /* for those used to old style */
 
     /* DEPRECATED */ sc_module( const char* nm ); 
     /* DEPRECATED */ sc_module( const std::string& nm );

src/sysc/kernel/sc_object.cpp

@@ -157,13 +157,15 @@ sc_object::dump(::std::ostream& os) const
 // |     nm = leaf name for the object.
 // +----------------------------------------------------------------------------
 void 
-sc_object::sc_object_init(const char* nm)
+sc_object::sc_object_init(const char* nm, sc_simcontext *simc)
 { 
     // SET UP POINTERS TO OBJECT MANAGER, PARENT, AND SIMULATION CONTEXT: 
     //
     // Make the current simcontext the simcontext for this object 
 
-    m_simc = sc_get_curr_simcontext(); 
+    if (!simc) m_simc = sc_get_curr_simcontext();
+    else m_simc=simc;
+
     m_attr_cltn_p = 0; 
     sc_object_manager* object_manager = m_simc->get_object_manager(); 
     m_parent = m_simc->active_object();
@@ -183,18 +185,18 @@ sc_object::sc_object_init(const char* nm)
         m_simc->add_child_object( this );
 } 
 
-sc_object::sc_object()
+sc_object::sc_object(sc_simcontext *simc)
   : m_attr_cltn_p(0), m_name()
   , m_parent(0), m_simc(0)
 {
-    sc_object_init( sc_gen_unique_name("object") );
+    sc_object_init( sc_gen_unique_name("object"), simc );
 }
 
 sc_object::sc_object( const sc_object& that )
   : m_attr_cltn_p(0), m_name()
   , m_parent(0), m_simc(0)
 {
-    sc_object_init( sc_gen_unique_name( that.basename() ) );
+    sc_object_init( sc_gen_unique_name( that.basename() ), that.m_simc );
 }
 
 
@@ -204,7 +206,7 @@ object_name_illegal_char(char ch)
     return (ch == SC_HIERARCHY_CHAR) || std::isspace(ch);
 }
 
-sc_object::sc_object(const char* nm)
+sc_object::sc_object(const char* nm, sc_simcontext *simc)
   : m_attr_cltn_p(0), m_name()
   , m_parent(0), m_simc(0)
 {
@@ -244,7 +246,7 @@ sc_object::sc_object(const char* nm)
             SC_REPORT_WARNING( SC_ID_ILLEGAL_CHARACTERS_, message.c_str());
 	}
     }
-    sc_object_init(p);
+    sc_object_init(p, simc);
     sc_mempool::release( namebuf, namebuf_alloc );
 }
 

src/sysc/kernel/sc_object.h

@@ -30,6 +30,7 @@
 #ifndef SC_OBJECT_H
 #define SC_OBJECT_H
 
+#include "sc_cor.h"
 #include "sysc/kernel/sc_attribute.h"
 #include <iostream>
 
@@ -165,8 +166,8 @@ class SC_API sc_object
     virtual ~sc_object();
 
 protected:
-    sc_object();
-    sc_object(const char* nm);
+    sc_object(sc_simcontext *simc=nullptr);
+    sc_object(const char* nm, sc_simcontext *simc=nullptr);
 
     sc_object( const sc_object& );
     sc_object& operator=( const sc_object& );
@@ -176,7 +177,7 @@ class SC_API sc_object
 
 private:
     void detach();
-    void sc_object_init(const char* nm);
+    void sc_object_init(const char* nm, sc_simcontext *simc=nullptr);
 
 private:
 
@@ -209,8 +210,8 @@ class SC_API sc_object_host : public sc_object
     friend class sc_process_b;
     friend SC_API const char* sc_gen_unique_name( const char*, bool preserve_first );
 protected:
-    sc_object_host();
-    sc_object_host(const char* nm);
+    sc_object_host(sc_simcontext *simc=nullptr);
+    sc_object_host(const char* nm, sc_simcontext *simc=nullptr);
     virtual ~sc_object_host();
 
 public:

src/sysc/kernel/sc_object_int.h

@@ -36,16 +36,16 @@
 namespace sc_core {
 
 inline
-sc_object_host::sc_object_host()
- : sc_object()
+sc_object_host::sc_object_host(sc_simcontext *simc)
+ : sc_object(simc)
  , m_child_events()
  , m_child_objects()
  , m_name_gen_p()
 {}
 
 inline
-sc_object_host::sc_object_host(const char* nm)
- : sc_object(nm)
+sc_object_host::sc_object_host(const char* nm, sc_simcontext *simc)
+ : sc_object(nm, simc)
  , m_child_events()
  , m_child_objects()
  , m_name_gen_p()

src/sysc/kernel/sc_process.cpp

@@ -47,13 +47,13 @@ namespace sc_core {
 // Note the special name for 'non_event' - this makes sure it does not
 // appear as a named event.
 
-std::vector<sc_event*>  sc_process_handle::empty_event_vector;
-std::vector<sc_object*> sc_process_handle::empty_object_vector;
+thread_local std::vector<sc_event*>  sc_process_handle::empty_event_vector;
+thread_local std::vector<sc_object*> sc_process_handle::empty_object_vector;
 sc_event&               sc_process_handle::non_event() { return sc_get_curr_simcontext()->null_event(); }
 
 // Last process that was created:
 
-sc_process_b* sc_process_b::m_last_created_process_p = 0;
+thread_local sc_process_b* sc_process_b::m_last_created_process_p = 0;
 
 //------------------------------------------------------------------------------
 //"sc_process_b::add_static_event"

src/sysc/kernel/sc_process.h

@@ -401,7 +401,7 @@ class SC_API sc_process_b : public sc_object_host {
                                                     // requesting global suspension.
 
   protected:
-    static sc_process_b* m_last_created_process_p; // Last process created.
+    thread_local static sc_process_b* m_last_created_process_p; // Last process created.
 };
 
 

src/sysc/kernel/sc_process_handle.h

@@ -147,8 +147,8 @@ class SC_API sc_process_handle {
     sc_process_b* m_target_p;   // Target for this object instance.
 
   protected:
-    static std::vector<sc_event*>  empty_event_vector;  // If m_target_p == 0.
-    static std::vector<sc_object*> empty_object_vector; // If m_target_p == 0.
+    thread_local static std::vector<sc_event*>  empty_event_vector;  // If m_target_p == 0.
+    thread_local static std::vector<sc_object*> empty_object_vector; // If m_target_p == 0.
     static sc_event&               non_event();         // If m_target_p == 0.
 };
 

src/sysc/kernel/sc_simcontext.cpp

@@ -305,7 +305,14 @@ sc_simcontext::init()
 
     // ALLOCATE VARIOUS MANAGERS AND REGISTRIES:
 
-    m_object_manager = new sc_object_manager;
+    if (sc_curr_simcontext && this!=sc_curr_simcontext) {  // Request to re-init due to reset
+        m_object_manager = sc_curr_simcontext->get_object_manager();
+        //dynamic_log_verbosity = sc_curr_simcontext->dynamic_log_verbosity; remember to put this back for SC_LOG
+        m_parent_context=sc_curr_simcontext;
+    } else {
+        m_object_manager = new sc_object_manager;
+        m_parent_context=nullptr;
+    }
     m_module_registry = new sc_module_registry( *this );
     m_port_registry = new sc_port_registry( *this );
     m_export_registry = new sc_export_registry( *this );
@@ -661,7 +668,7 @@ sc_simcontext::elaborate()
     // (not added to public object hierarchy)
 
     m_method_invoker_p =
-      new sc_invoke_method("$$$$kernel_module$$$$_invoke_method" );
+        new sc_invoke_method(("$$$$kernel_module$$$$_invoke_method$" + std::to_string((uint64_t)((void*)this))).c_str());
 
     set_simulation_status(SC_BEFORE_END_OF_ELABORATION);
     for( int cd = 0; cd != 4; /* empty */ )
@@ -1553,8 +1560,8 @@ void sc_simcontext::post_suspend() const
 	static sc_simcontext sc_default_global_context;
 	sc_simcontext* sc_curr_simcontext = &sc_default_global_context;
 #else
-	SC_API sc_simcontext* sc_curr_simcontext = 0;
-	SC_API sc_simcontext* sc_default_global_context = 0;
+	thread_local SC_API sc_simcontext* sc_curr_simcontext = 0;
+	thread_local SC_API sc_simcontext* sc_default_global_context = 0;
 #endif
 #else
 // Not MT-safe!