Merge pull request #1164 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger
sstsimulator · Oct 12, 2024 · e9be5a2 · e9be5a2
2 parents 6854da5 + 6ee77fb
commit e9be5a2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/sst/core/impl/interactive/simpleDebug.cc b/src/sst/core/impl/interactive/simpleDebug.cc
@@ -130,6 +130,11 @@ SimpleDebugger::cmd_print(std::vector<std::string>& tokens)
     // Index in tokens array where we may find the variable name
     size_t var_index = 1;
 
+    if ( tokens.size() < 2 ) {
+        printf("Invalid format for print command (print [-rN] [<obj>])\n");
+        return;
+    }
+
     // See if have a -r or not
     int         recurse = 0;
     std::string tok     = tokens[1];

diff --git a/src/sst/core/impl/interactive/simpleDebug.h b/src/sst/core/impl/interactive/simpleDebug.h
@@ -47,7 +47,7 @@ class SimpleDebugger : public SST::InteractiveConsole
     // directory as far as we can.
     std::vector<std::string> name_stack;
 
-    SST::Core::Serialization::ObjectMap* obj_;
+    SST::Core::Serialization::ObjectMap* obj_ = nullptr;
     bool                                 done = false;
 
     std::vector<std::string> tokenize(std::vector<std::string>& tokens, const std::string& input);

diff --git a/src/sst/core/serialization/objectMap.h b/src/sst/core/serialization/objectMap.h
@@ -154,7 +154,7 @@ class ObjectMap
     /**
        Get the list of child variables contained in this ObjectMap
 
-       @return Refernce to vector containing ObjectMaps for this
+       @return Reference to vector containing ObjectMaps for this
        ObjectMap's child variables. Fundamental types will return the
        same empty vector.
      */

diff --git a/src/sst/core/simulation.cc b/src/sst/core/simulation.cc
@@ -836,7 +836,7 @@ Simulation_impl::run()
                 }
 
                 InteractiveAction* act =
-                    new InteractiveAction(this, format_string("Interctive start at %" PRI_SIMTIME, offset));
+                    new InteractiveAction(this, format_string("Interactive start at %" PRI_SIMTIME, offset));
                 act->setDeliveryTime(currentSimCycle + offset);
                 timeVortex->insert(act);
             }

diff --git a/src/sst/core/sync/syncManager.cc b/src/sst/core/sync/syncManager.cc
@@ -51,7 +51,7 @@ SimTime_t                 SyncManager::next_rankSync_ = MAX_SIMTIME_T;
 #if SST_HIGH_RESOLUTION_CLOCK
 #define SST_SYNC_PROFILE_START                                  \
     auto sim                = Simulation_impl::getSimulation(); \
-    auto last_sync_type     = next_sync_type;                   \
+    auto last_sync_type     = next_sync_type_;                  \
     auto sync_profile_start = std::chrono::high_resolution_clock::now();
 
 #define SST_SYNC_PROFILE_STOP                                                                                 \
@@ -63,7 +63,7 @@ SimTime_t                 SyncManager::next_rankSync_ = MAX_SIMTIME_T;
 #else
 #define SST_SYNC_PROFILE_START                                               \
     auto           sim            = Simulation_impl::getSimulation();        \
-    auto           last_sync_type = next_sync_type;                          \
+    auto           last_sync_type = next_sync_type_;                         \
     struct timeval sync_profile_stop, sync_profile_start, sync_profile_diff; \
     gettimeofday(&sync_profile_start, NULL);