Skip to content

user prompting to select a variable name for multiple matches #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kpgriesser merged 1 commit into from
Jan 27, 2026
Merged

user prompting to select a variable name for multiple matches #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/sst/core/impl/interactive/simpleDebug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@
namespace SST::IMPL::Interactive {

// Static Initialization
//TODO kg is there a naming convention for static vars?
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;
bool SimpleDebugger::confirm_ = true;
Copy link
Collaborator Author

@kpgriesser kpgriesser Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have members using the '_' suffix convention. I added it here as I thought I had a name conflict (which I didn't) but left it in anyway

SimpleDebugger::SimpleDebugger(Params& params) :
InteractiveConsole()
{
Expand Down Expand Up @@ -736,7 +737,7 @@ SimpleDebugger::cmd_cd(std::vector<std::string>& tokens)
}

bool loop_detected = false;
SST::Core::Serialization::ObjectMap* new_obj = obj_->selectVariable(selection, loop_detected);
SST::Core::Serialization::ObjectMap* new_obj = obj_->selectVariable(selection, loop_detected, confirm_);
if ( !new_obj || (new_obj == obj_) ) {
printf("Unknown object in cd command: %s\n", selection.c_str());
return false;
Expand Down Expand Up @@ -1607,23 +1608,23 @@ SimpleDebugger::cmd_setConfirm(std::vector<std::string>& tokens)
}

if ( (tokens[1] == "true") || (tokens[1] == "t") || (tokens[1] == "T") || (tokens[1] == "1") ) {
confirm = true;
confirm_ = true;
return true;
}
else if ( (tokens[1] == "false") || (tokens[1] == "f") || (tokens[1] == "F") || (tokens[1] == "0") ) {
confirm = false;
confirm_ = false;
return true;
}

std::cout << "Invalid argument for confirm: must be true or false" << tokens[1] << std::endl;
std::cout << "Invalid argument for confirm: must be true or false. <" << tokens[1] << ">" << std::endl;
return false;
}

bool
SimpleDebugger::clear_watchlist()
{

if ( confirm ) {
if ( confirm_ ) {
std::string line;
std::cout << "Do you want to delete all watchpoints? [yes, no]\n";
std::getline(std::cin, line);
Expand Down
2 changes: 1 addition & 1 deletion src/sst/core/impl/interactive/simpleDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class SimpleDebugger : public SST::InteractiveConsole
// Keep track of all the WatchPoints
std::vector<std::pair<WatchPoint*, BaseComponent*>> watch_points_;
bool clear_watchlist();
static bool confirm; // skk = 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);

Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/serialization/objectMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ ObjectMap::selectParent()
}

ObjectMap*
ObjectMap::selectVariable(std::string name, bool& loop_detected)
ObjectMap::selectVariable(std::string name, bool& loop_detected, bool confirm)
{
// kg maybe there is a way we can go through this to detect problems
// before changing objmap state to avoid memory corruption bugs.
loop_detected = false;
ObjectMap* var = findVariable(name);
ObjectMap* var = findVariable(name, confirm);

// TODO Would prefer this be a simple nullptr to avoid confusion (bugs)
// If we get nullptr back, then it didn't exist. Just return this
Expand Down
41 changes: 39 additions & 2 deletions src/sst/core/serialization/objectMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,12 @@ class ObjectMap
TODO: prefer this return nullptr as bugs have occurred with incorrect use

@param name Name of variable to select
@param confirm Prompt user to resolve duplicate match of name. Select first found if false.

@return ObjectMap for specified variable, if it exists, this
otherwise
*/
ObjectMap* selectVariable(std::string name, bool& loop_detected);
ObjectMap* selectVariable(std::string name, bool& loop_detected, bool confirm = false);

/**
Adds a variable to this ObjectMap. NOTE: calls to this
Expand Down Expand Up @@ -544,16 +545,52 @@ class ObjectMap
Find a variable in this object map

@param name Name of variable to find
@param confirm Prompt user to resolve duplicate match of name. Select first found if false.

@return ObjectMap representing the requested variable if it is
found, nullptr otherwise
*/
ObjectMap* findVariable(const std::string& name) const
ObjectMap* findVariable(const std::string& name, bool confirm = false) const
{
// TODO move body into objectMap.cc
#if 1
// Would prefer we can uniquify the variable list whilst mapping and not use a multimap.
// Assuming multimap is sorted.
auto& variables = getVariables();
auto range = variables.equal_range(name);
auto count = std::distance(range.first, range.second);
if ( count == 0 ) return nullptr;
if ( count == 1 || (!confirm) ) return range.first->second;
// more than 1 found and confirm is true
std::vector<ObjectMap*> selections = {};
for ( auto [it, end] = variables.equal_range(name); it != end; ++it )
selections.push_back(it->second);

std::cout << "[Found multiple entries for <" << name << ">]" << std::endl;
int remaining = 3;
int n;
std::string user_input;
while ( remaining-- > 0 ) {
for ( size_t i = 0; i < selections.size(); i++ )
std::cout << i << ": " << selections[i]->getName() << " " << selections[i]->getType() << std::endl;
std::cout << "-1: None" << std::endl;
std::cout << "[?] ";
std::getline(std::cin, user_input);
std::stringstream ss(user_input);
if ( (ss >> n) && ss.eof() ) {
if ( n < 0 ) return nullptr;
if ( n < (int)selections.size() ) return selections[n];
}
std::cout << "Invalid entry" << std::endl;
}
std::cout << "Too many attempts\n" << std::endl;
return nullptr;
#else
auto& variables = getVariables();
for ( auto [it, end] = variables.equal_range(name); it != end; ++it )
return it->second; // For now, we return only the first match if multiple matches
return nullptr;
#endif
}

/**
Expand Down
Loading