Multithreaded support for shared replay, logging, autocomplete, and confirm

Author: skuntz

src/sst/core/impl/interactive/simpleDebug.cc

@@ -30,6 +30,14 @@
 
 namespace SST::IMPL::Interactive {
 
+// Static Initialization
+bool          SimpleDebugger::autoCompleteEnable = true;
+std::ofstream SimpleDebugger::loggingFile; 
+std::ifstream SimpleDebugger::replayFile;
+std::string   SimpleDebugger::loggingFilePath = "sst-console.out";
+std::string   SimpleDebugger::replayFilePath = "sst-console.in";
+bool          SimpleDebugger::enLogging = false;
+bool          SimpleDebugger::confirm = true;
 SimpleDebugger::SimpleDebugger(Params& params) :
     InteractiveConsole()
 {
@@ -240,6 +248,7 @@ SimpleDebugger::summary()
             std::cout << x.first.c_str() << "/ (" << x.second->getType() << ")\n";
         }
     }
+    std::cout << std::endl;
 #endif
 }
 
@@ -1255,8 +1264,9 @@ getLogicOpFromString(const std::string& opStr)
 bool
 SimpleDebugger::cmd_watchlist(std::vector<std::string>& UNUSED(tokens))
 {
+    RankInfo info = getRank();
     // Print the watch points
-    printf("Current watch points:\n");
+    printf("R%d,T%d: Current watch points:\n", info.rank, info.thread);
     int count = 0;
     for ( auto& x : watch_points_ ) {
         // printf("  %d - %s\n", count++, x.first->getName().c_str());

src/sst/core/impl/interactive/simpleDebug.h

@@ -270,17 +270,17 @@ class SimpleDebugger : public SST::InteractiveConsole
     void save_name_stack();
     void cd_name_stack();
 
-    bool autoCompleteEnable = true;
+    static bool autoCompleteEnable; //skk = true;
 
     // gdb/lldb thread spin support
     uint64_t spinner = 1;
 
     // logging support
-    std::ofstream loggingFile;
-    std::ifstream replayFile;
-    std::string   loggingFilePath = "sst-console.out";
-    std::string   replayFilePath  = "sst-console.in";
-    bool          enLogging       = false;
+    static std::ofstream loggingFile;
+    static std::ifstream replayFile;
+    static std::string   loggingFilePath; //skk = "sst-console.out";
+    static std::string   replayFilePath; //skk = "sst-console.in";
+    static bool          enLogging; //skk = false;
 
     // command injection (for sst --replay option)
     std::stringstream injectedCommand;
@@ -295,7 +295,7 @@ class SimpleDebugger : public SST::InteractiveConsole
     // Keep track of all the WatchPoints
     std::vector<std::pair<WatchPoint*, BaseComponent*>> watch_points_;
     bool                                                clear_watchlist();
-    bool                                                confirm = true; // Ask for confirmation to clear watchlist
+    static bool                                         confirm;//skk = true; // Ask for confirmation to clear watchlist
 
     std::vector<std::string> tokenize(std::vector<std::string>& tokens, const std::string& input);