Skip to content

[lldb] Add a progress event for executing an expression #119757

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
merged 1 commit into from
Dec 13, 2024
+26 −0
Merged

[lldb] Add a progress event for executing an expression #119757

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
5 changes: 5 additions & 0 deletions lldb/source/Expression/FunctionCaller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "lldb/Expression/FunctionCaller.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/Progress.h"
#include "lldb/Expression/DiagnosticManager.h"
#include "lldb/Expression/IRExecutionUnit.h"
#include "lldb/Interpreter/CommandReturnObject.h"
Expand Down Expand Up @@ -338,6 +339,10 @@ lldb::ExpressionResults FunctionCaller::ExecuteFunction(
DiagnosticManager &diagnostic_manager, Value &results) {
lldb::ExpressionResults return_value = lldb::eExpressionSetupError;

Debugger *debugger =
exe_ctx.GetTargetPtr() ? &exe_ctx.GetTargetPtr()->GetDebugger() : nullptr;
Progress progress("Calling function", FunctionName(), {}, debugger);

// FunctionCaller::ExecuteFunction execution is always just to get the
// result. Unless explicitly asked for, ignore breakpoints and unwind on
// error.
Expand Down
13 changes: 13 additions & 0 deletions lldb/source/Expression/UserExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <string>

#include "lldb/Core/Module.h"
#include "lldb/Core/Progress.h"
#include "lldb/Expression/DiagnosticManager.h"
#include "lldb/Expression/ExpressionVariable.h"
#include "lldb/Expression/IRExecutionUnit.h"
Expand Down Expand Up @@ -424,6 +425,18 @@ UserExpression::Execute(DiagnosticManager &diagnostic_manager,
const EvaluateExpressionOptions &options,
lldb::UserExpressionSP &shared_ptr_to_me,
lldb::ExpressionVariableSP &result_var) {
Debugger *debugger =
exe_ctx.GetTargetPtr() ? &exe_ctx.GetTargetPtr()->GetDebugger() : nullptr;
std::string details;
if (m_options.IsForUtilityExpr())
details = "LLDB utility";
else if (m_expr_text.size() > 15)
details = m_expr_text.substr(0, 14) + "…";
else
details = m_expr_text;

Progress progress("Running expression", details, {}, debugger);

lldb::ExpressionResults expr_result = DoExecute(
diagnostic_manager, exe_ctx, options, shared_ptr_to_me, result_var);
Target *target = exe_ctx.GetTargetPtr();
Expand Down
8 changes: 8 additions & 0 deletions lldb/test/Shell/Expr/TestExecProgress.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# RUN: %lldb -s %s | FileCheck %s
log enable lldb event
expr 1
expr 1 // And a very long comment.
quit

# CHECK: {{title = "Running expression", details = "1"}}
# CHECK: {{title = "Running expression", details = "1 // And a ver…"}}
Loading