Merge pull request #960 from berquist/736-tidying

Minor tidying
sstsimulator · Jul 11, 2023 · 6466a06 · 6466a06
2 parents 52299cf + 815f304
commit 6466a06
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 **/.deps/
 **/.dirstamp
 **/Makefile.in
+**~
 *.o
 .libs/
 .deps/
@@ -25,7 +26,8 @@ src/sst/core/sst-register
 src/sst/SST-*.pc
 src/sst/core/sst_config.h
 src/sst/core/sst_config.h.in
-src/sst/core/sst_config.h.in~
+src/sst/core/sst-test-core
+src/sst/core/sst-test-elements
 stamp-h1
 src/sst/sstsimulator.conf
 build_info.h
@@ -39,3 +41,4 @@ libtool
 *.pyc
 *.lo
 *.la
+sst_test_outputs/
diff --git a/doc/.gitignore b/doc/.gitignore
@@ -2,3 +2,4 @@ Doxyfile
 Makefile
 Makefile.in
 tagfile
+html/
diff --git a/src/sst/core/configGraph.cc b/src/sst/core/configGraph.cc
@@ -20,6 +20,7 @@
 #include "sst/core/namecheck.h"
 #include "sst/core/simulation_impl.h"
 #include "sst/core/timeLord.h"
+#include "sst/core/warnmacros.h"
 
 #include <algorithm>
 #include <fstream>

diff --git a/src/sst/core/event.h b/src/sst/core/event.h
@@ -65,7 +65,7 @@ class Event : public Activity
     /** Constant, default value for id_types */
     static const id_type             NO_ID;
 
-    Event() : Activity()
+    Event() : Activity(), delivery_info(0)
     {
         setPriority(EVENTPRIORITY);
 #if __SST_DEBUG_EVENT_TRACKING__

diff --git a/src/sst/core/link.cc b/src/sst/core/link.cc
@@ -119,7 +119,7 @@ Link::finalizeConfiguration()
 {
     mode = RUN;
     if ( SYNC == type ) {
-        // No configuraiton changes to be made
+        // No configuration changes to be made
         return;
     }
 
@@ -147,7 +147,7 @@ Link::prepareForComplete()
     mode = COMPLETE;
 
     if ( SYNC == type ) {
-        // No configuraiton changes to be made
+        // No configuration changes to be made
         return;
     }
 

diff --git a/src/sst/core/rng/uniform.h b/src/sst/core/rng/uniform.h
@@ -36,7 +36,11 @@ class UniformDistribution : public RandomDistribution
         Creates an uniform distribution with a specific number of bins
         \param probsCount Number of probability bins in this distribution
     */
-    UniformDistribution(const uint32_t probsCount) : RandomDistribution(), probCount(probsCount), deleteDistrib(true)
+    UniformDistribution(const uint32_t probsCount) :
+        RandomDistribution(),
+        deleteDistrib(true),
+        probCount(probsCount),
+        probPerBin(1)
     {
 
         if ( probCount > 0 ) { probPerBin = 1.0 / static_cast<double>(probCount); }
@@ -52,8 +56,9 @@ class UniformDistribution : public RandomDistribution
     */
     UniformDistribution(const uint32_t probsCount, SST::RNG::Random* baseDist) :
         RandomDistribution(),
+        deleteDistrib(false),
         probCount(probsCount),
-        deleteDistrib(false)
+        probPerBin(1)
     {
 
         if ( probCount > 0 ) { probPerBin = 1.0 / static_cast<double>(probCount); }

diff --git a/src/sst/core/serialization/serialize_buffer_accessor.h b/src/sst/core/serialization/serialize_buffer_accessor.h
@@ -78,7 +78,7 @@ class ser_buffer_accessor
     }
 
 protected:
-    ser_buffer_accessor() : bufstart_(nullptr), bufptr_(nullptr), size_(0) {}
+    ser_buffer_accessor() : bufstart_(nullptr), bufptr_(nullptr), size_(0), max_size_(0) {}
 
 protected:
     char*  bufstart_;

diff --git a/src/sst/core/simulation.cc b/src/sst/core/simulation.cc
@@ -252,8 +252,8 @@ Simulation_impl::processGraphInfo(ConfigGraph& graph, const RankInfo& UNUSED(myR
         interThreadLatencies[i] = MAX_SIMTIME_T;
     }
 
-    interThreadMinLatency  = MAX_SIMTIME_T;
-    int cross_thread_links = 0;
+    interThreadMinLatency      = MAX_SIMTIME_T;
+    int num_cross_thread_links = 0;
     if ( num_ranks.thread > 1 ) {
         // Need to determine the lookahead for the thread synchronization
         ConfigComponentMap_t comps = graph.getComponentMap();
@@ -277,7 +277,7 @@ Simulation_impl::processGraphInfo(ConfigGraph& graph, const RankInfo& UNUSED(myR
             // At this point, we know that both endpoints are on this
             // rank, but on different threads.  Therefore, they
             // contribute to the interThreadMinLatency.
-            cross_thread_links++;
+            num_cross_thread_links++;
             if ( clink->getMinLatency() < interThreadMinLatency ) { interThreadMinLatency = clink->getMinLatency(); }
 
             // Now check only those latencies that directly impact this
@@ -312,7 +312,7 @@ Simulation_impl::processGraphInfo(ConfigGraph& graph, const RankInfo& UNUSED(myR
 
     // Determine if this thread is independent.  That means there is
     // no need to synchronize with any other threads or ranks.
-    if ( min_part == MAX_SIMTIME_T && cross_thread_links == 0 ) { independent = true; }
+    if ( min_part == MAX_SIMTIME_T && num_cross_thread_links == 0 ) { independent = true; }
     else {
         independent = false;
     }