Merge pull request #1226 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger

Author: sst-autotester

src/sst/core/activity.h

@@ -136,7 +136,7 @@ class Activity : public SST::Core::MemPoolItem
 
 
     /** Function which will be called when the time for this Activity comes to pass. */
-    virtual void execute(void) = 0;
+    virtual void execute() = 0;
 
     /** Set the time for which this Activity should be delivered */
     inline void setDeliveryTime(SimTime_t time) { delivery_time = time; }

src/sst/core/baseComponent.cc

@@ -82,7 +82,7 @@ BaseComponent::~BaseComponent()
     my_info->component = nullptr;
     if ( my_info->parent_info ) {
         std::map<ComponentId_t, ComponentInfo>& parent_subcomps = my_info->parent_info->getSubComponents();
-        size_t                                  deleted         = parent_subcomps.erase(my_info->id);
+        size_t                                  deleted         = parent_subcomps.erase(my_info->id_);
         if ( deleted != 1 ) {
             // Should never happen, but issue warning just in case
             sim_->getSimulationOutput().output(
@@ -288,6 +288,7 @@ BaseComponent::configureLink(const std::string& name, TimeConverter* time_base,
             tmp = my_info->parent_info->component->getLinkFromParentSharedPort(name, port_modules);
             // If I got a link from my parent, I need to put it in my
             // link map
+
             if ( nullptr != tmp ) {
                 if ( nullptr == myLinks ) {
                     myLinks           = new LinkMap();
@@ -299,8 +300,11 @@ BaseComponent::configureLink(const std::string& name, TimeConverter* time_base,
 
                 // Need to see if I got any port_modules, if so, need
                 // to add them to my_info->portModules
+
                 if ( port_modules.size() > 0 ) {
                     if ( nullptr == my_info->portModules ) {
+                        // This memory is currently leaked as portModules is otherwise a pointer to ConfigComponent
+                        // ConfigComponent does not exist for anonymous subcomponents
                         my_info->portModules = new std::map<std::string, std::vector<ConfigPortModule>>();
                     }
                     (*my_info->portModules)[name].swap(port_modules);
@@ -331,7 +335,9 @@ BaseComponent::configureLink(const std::string& name, TimeConverter* time_base,
         }
 
         // Check for PortModules
-        if ( my_info->portModules != nullptr ) {
+        // portModules pointer may be invalid after wire up
+        // Only SelfLinks can be initialized after wire up and SelfLinks do not support PortModules
+        if ( !sim_->isWireUpFinished() && my_info->portModules != nullptr ) {
             auto it = my_info->portModules->find(name);
             if ( it != my_info->portModules->end() ) {
                 EventHandlerMetaData mdata(my_info->getID(), getName(), getType(), name);
@@ -683,13 +689,11 @@ BaseComponent::getComponentInfoStatisticEnableLevel(const std::string& statistic
 }
 
 void
-BaseComponent::configureCollectionMode(
-    Statistics::StatisticBase* statistic, const SST::Params& params, const std::string& name)
+BaseComponent::configureCollectionMode(Statistics::StatisticBase* statistic, const std::string& name)
 {
     StatisticBase::StatMode_t statCollectionMode = StatisticBase::STAT_MODE_COUNT;
     Output&                   out                = Simulation_impl::getSimulationOutput();
-    std::string               statRateParam      = params.find<std::string>("rate", "0ns");
-    UnitAlgebra               collectionRate(statRateParam);
+    UnitAlgebra               collectionRate     = statistic->getCollectionRate();
 
     // make sure we have a valid collection rate
     // Check that the Collection Rate is a valid unit type that we can use
@@ -766,7 +770,7 @@ BaseComponent::createStatistic(
     cpp_params.insert(python_params);
     std::string type = cpp_params.find<std::string>("type", "sst.AccumulatorStatistic");
     auto*       stat = fxn(this, engine, type, name, subId, cpp_params);
-    configureCollectionMode(stat, cpp_params, name);
+    configureCollectionMode(stat, name);
     engine->registerStatisticWithEngine(stat);
     return stat;
 }
@@ -775,16 +779,16 @@ Statistics::StatisticBase*
 BaseComponent::createEnabledAllStatistic(
     Params& params, const std::string& name, const std::string& statSubId, StatCreateFunction fxn)
 {
-    auto iter = m_enabledAllStats.find(name);
-    if ( iter != m_enabledAllStats.end() ) {
+    auto iter = m_enabled_all_stats_.find(name);
+    if ( iter != m_enabled_all_stats_.end() ) {
         auto& submap  = iter->second;
         auto  subiter = submap.find(statSubId);
         if ( subiter != submap.end() ) { return subiter->second; }
     }
 
     // a matching statistic was not found
-    auto* stat = createStatistic(params, my_info->allStatConfig->params, name, statSubId, true, std::move(fxn));
-    m_enabledAllStats[name][statSubId] = stat;
+    auto* stat = createStatistic(params, my_info->all_stat_config_->params, name, statSubId, true, std::move(fxn));
+    if ( !stat->isNullStatistic() ) { m_enabled_all_stats_[name][statSubId] = stat; }
     return stat;
 }
 
@@ -799,8 +803,8 @@ BaseComponent::createExplicitlyEnabledStatistic(
             name.c_str());
     }
 
-    auto piter = my_info->statConfigs->find(id);
-    if ( piter == my_info->statConfigs->end() ) {
+    auto piter = my_info->stat_configs_->find(id);
+    if ( piter == my_info->stat_configs_->end() ) {
         out.fatal(
             CALL_INFO, 1, "Explicitly enabled statistic '%s' does not have parameters mapped to its ID", name.c_str());
     }
@@ -919,9 +923,7 @@ BaseComponent::serialize_order(SST::Core::Serialization::serializer& ser)
     }
 }
 
-namespace Core {
-namespace Serialization {
-namespace pvt {
+namespace Core::Serialization::pvt {
 
 static const long null_ptr_id = -1;
 
@@ -987,7 +989,7 @@ SerializeBaseComponentHelper::map_basecomponent(serializable_base*& s, serialize
     ObjectMap* my_info_dir = new ObjectMapHierarchyOnly();
     ser.mapper().map_hierarchy_start("my_info", my_info_dir);
     ser.mapper().setNextObjectReadOnly();
-    sst_map_object(ser, const_cast<ComponentId_t&>(comp->my_info->id), "id");
+    sst_map_object(ser, const_cast<ComponentId_t&>(comp->my_info->id_), "id");
     ser.mapper().setNextObjectReadOnly();
     sst_map_object(ser, const_cast<std::string&>(comp->my_info->type), "type");
     sst_map_object(ser, comp->my_info->defaultTimeBase, "defaultTimeBase");
@@ -997,9 +999,6 @@ SerializeBaseComponentHelper::map_basecomponent(serializable_base*& s, serialize
     ser.mapper().map_hierarchy_end(); // obj_map
 }
 
-} // namespace pvt
-} // namespace Serialization
-} // namespace Core
-
+} // namespace Core::Serialization::pvt
 
 } // namespace SST

src/sst/core/baseComponent.h

@@ -49,13 +49,9 @@ class TimeConverter;
 class UnitAlgebra;
 
 
-namespace Core {
-namespace Serialization {
-namespace pvt {
+namespace Core::Serialization::pvt {
 class SerializeBaseComponentHelper;
-} // namespace pvt
-} // namespace Serialization
-} // namespace Core
+}
 
 /**
  * Main component object for the simulation.
@@ -84,15 +80,15 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     const std::string& getType() const { return my_info->getType(); }
 
     /** Returns unique component ID */
-    inline ComponentId_t getId() const { return my_info->id; }
+    inline ComponentId_t getId() const { return my_info->id_; }
 
     /** Returns Component Statistic load level */
     inline uint8_t getStatisticLoadLevel() const { return my_info->statLoadLevel; }
 
     /** Called when SIGINT or SIGTERM has been seen.
      * Allows components opportunity to clean up external state.
      */
-    virtual void emergencyShutdown(void) {}
+    virtual void emergencyShutdown() {}
 
     /** Returns Component/SubComponent Name */
     inline const std::string& getName() const { return my_info->getName(); }
@@ -441,9 +437,9 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     Statistics::Statistic<T>*
     registerStatistic(SST::Params& params, const std::string& statName, const std::string& statSubId, bool inserting)
     {
-        if ( my_info->enabledStatNames ) {
-            auto iter = my_info->enabledStatNames->find(statName);
-            if ( iter != my_info->enabledStatNames->end() ) {
+        if ( my_info->enabled_stat_names_ ) {
+            auto iter = my_info->enabled_stat_names_->find(statName);
+            if ( iter != my_info->enabled_stat_names_->end() ) {
                 // valid, enabled statistic
                 // During initialization, the component should have assigned a mapping between
                 // the local name and globally unique stat ID
@@ -455,7 +451,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
         // if we got here, this is not a stat we explicitly enabled
         if ( inserting || doesComponentInfoStatisticExist(statName) ) {
             // this is a statistic that I registered
-            if ( my_info->enabledAllStats ) { return createStatistic<T>(params, STATALL_ID, statName, statSubId); }
+            if ( my_info->enabled_all_stats_ ) { return createStatistic<T>(params, STATALL_ID, statName, statSubId); }
             else if ( my_info->parent_info && my_info->canInsertStatistics() ) {
                 // I did not explicitly enable nor enable all
                 // but I can insert statistics into my parent
@@ -595,7 +591,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     template <class T, class... ARGS>
     T* loadComponentExtension(ARGS... args)
     {
-        ComponentExtension* ret = new T(my_info->id, args...);
+        ComponentExtension* ret = new T(my_info->id_, args...);
         return static_cast<T*>(ret);
     }
 
@@ -678,7 +674,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
 
         // Check to see if this can be loaded with new API or if we have to fallback to old
         if ( isSubComponentLoadableUsingAPI<T>(type) ) {
-            auto ret = Factory::getFactory()->CreateWithParams<T>(type, params, sub_info->id, params, args...);
+            auto ret = Factory::getFactory()->CreateWithParams<T>(type, params, sub_info->id_, params, args...);
             return ret;
         }
         return nullptr;
@@ -795,8 +791,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
 private:
     SimTime_t processCurrentTimeWithUnderflowedBase(const std::string& base) const;
 
-    void
-    configureCollectionMode(Statistics::StatisticBase* statistic, const SST::Params& params, const std::string& name);
+    void configureCollectionMode(Statistics::StatisticBase* statistic, const std::string& name);
 
     /**
      * @brief findExplicitlyEnabledStatistic
@@ -846,7 +841,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
 
         if ( isSubComponentLoadableUsingAPI<T>(sub_info->type) ) {
             auto ret = Factory::getFactory()->CreateWithParams<T>(
-                sub_info->type, *sub_info->params, sub_info->id, *sub_info->params, args...);
+                sub_info->type, *sub_info->params, sub_info->id_, *sub_info->params, args...);
             return ret;
         }
         return nullptr;
@@ -921,7 +916,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     std::vector<PortModule*>                            portModules;
     std::map<StatisticId_t, Statistics::StatisticBase*> m_explicitlyEnabledSharedStats;
     std::map<StatisticId_t, StatNameMap>                m_explicitlyEnabledUniqueStats;
-    StatNameMap                                         m_enabledAllStats;
+    StatNameMap                                         m_enabled_all_stats_;
 
     BaseComponent* getParentComponent()
     {
@@ -1117,11 +1112,9 @@ class SubComponentSlotInfo
     }
 };
 
-namespace Core {
-namespace Serialization {
+namespace Core::Serialization {
 
 namespace pvt {
-
 class SerializeBaseComponentHelper
 {
 public:
@@ -1138,7 +1131,7 @@ class SerializeBaseComponentHelper
 
 
 template <class T>
-class serialize_impl<T*, typename std::enable_if<std::is_base_of<SST::BaseComponent, T>::value>::type>
+class serialize_impl<T*, std::enable_if_t<std::is_base_of_v<SST::BaseComponent, T>>>
 {
     template <class A>
     friend class serialize;
@@ -1169,8 +1162,7 @@ class serialize_impl<T*, typename std::enable_if<std::is_base_of<SST::BaseCompon
     }
 };
 
-} // namespace Serialization
-} // namespace Core
+} // namespace Core::Serialization
 
 } // namespace SST
 

src/sst/core/cfgoutput/dotConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class DotConfigGraphOutput : public ConfigGraphOutput
 {
@@ -33,7 +32,6 @@ class DotConfigGraphOutput : public ConfigGraphOutput
     void generateDot(const ConfigLink* link, const uint32_t dot_verbosity) const;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_DOT_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/jsonConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class JSONConfigGraphOutput : public ConfigGraphOutput
 {
@@ -27,7 +26,6 @@ class JSONConfigGraphOutput : public ConfigGraphOutput
     virtual void generate(const Config* cfg, ConfigGraph* graph) override;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_JSON_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/pythonConfigOutput.h

@@ -18,8 +18,7 @@
 
 #include <map>
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class PythonConfigGraphOutput : public ConfigGraphOutput
 {
@@ -51,7 +50,6 @@ class PythonConfigGraphOutput : public ConfigGraphOutput
     std::map<LinkId_t, std::string> linkMap;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_PYTHON_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/xmlConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class XMLConfigGraphOutput : public ConfigGraphOutput
 {
@@ -30,7 +29,6 @@ class XMLConfigGraphOutput : public ConfigGraphOutput
     void generateXML(const std::string& indent, const ConfigLink* link, const ConfigComponentMap_t& compMap) const;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_XML_CONFIG_OUTPUT_H

src/sst/core/checkpointAction.cc

@@ -73,7 +73,7 @@ CheckpointAction::~CheckpointAction() {}
 
 // Generate checkpoint on simulation time period
 void
-CheckpointAction::execute(void)
+CheckpointAction::execute()
 {
     Simulation_impl* sim = Simulation_impl::getSimulation();
     createCheckpoint(sim);

src/sst/core/checkpointAction.h

@@ -70,7 +70,7 @@ class CheckpointAction : public Action
     void setCheckpoint();
 
     /** Called by TimeVortex to trigger checkpoint on simulation clock interval - not used in parallel simulation */
-    void execute(void) override;
+    void execute() override;
 
     /** Called by SyncManager to check whether a checkpoint should be generated */
     SimTime_t check(SimTime_t current_time);

src/sst/core/clock.cc

@@ -82,7 +82,7 @@ Clock::getNextCycle()
 }
 
 void
-Clock::execute(void)
+Clock::execute()
 {
     Simulation_impl* sim = Simulation_impl::getSimulation();