Skip to content

Fix a bug where using "thread backtrace unique" would switch you to #140993

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix a bug where using "thread backtrace unique" would switch you to #140993

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
2 changes: 2 additions & 0 deletions lldb/source/Commands/CommandObjectThreadUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ void CommandObjectIterateOverThreads::DoExecute(Args &command,
result.SetStatus(m_success_return);

bool all_threads = false;
m_unique_stacks = false;

if (command.GetArgumentCount() == 0) {
Thread *thread = m_exe_ctx.GetThreadPtr();
if (thread)
Expand Down
18 changes: 17 additions & 1 deletion lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,26 @@ def is_thread3(thread):
# Construct our expected back trace string
expect_string = "10 thread(s)%s" % (expect_threads)

# There was a bug where if you used 'thread backtrace unique'
# we would switch all future backtraces to use the
# "frame-format-unique" not the "frame-format". Make
# sure we don't do that...
setting_data = self.dbg.GetSetting("frame-format-unique")
setting_str = setting_data.GetStringValue(1000)
setting_str = "UNIQUE: " + setting_str
lldb.SBDebugger.SetInternalVariable("frame-format-unique", setting_str, self.dbg.GetInstanceName())
# Now that we are stopped, we should have 10 threads waiting in the
# thread3 function. All of these threads should show as one stack.
self.expect(
"thread backtrace unique",
"Backtrace with unique stack shown correctly",
substrs=[expect_string, "main.cpp:%d" % self.thread3_before_lock_line],
substrs=[expect_string, "UNIQUE:", "main.cpp:%d" % self.thread3_before_lock_line],
)
# Make sure setting the unique flag in the command isn't
# persistent:
self.expect(
"thread backtrace",
"Backtrace unique is not sticky",
substrs=["UNIQUE:"],
matching=False
)
Loading