diff options
| author | Jim Ingham <jingham@apple.com> | 2012-10-16 21:41:58 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2012-10-16 21:41:58 +0000 |
| commit | 35e1bda6957bb7e5d26f6a50e473ca3aa22a1386 (patch) | |
| tree | 8ae0c9392cf55fc5c112148231d78729935de8e9 /lldb/source/Expression/ClangUserExpression.cpp | |
| parent | 02a1141e5a36928f7a0ac9d2e0ee44dca3be3a01 (diff) | |
| download | bcm5719-llvm-35e1bda6957bb7e5d26f6a50e473ca3aa22a1386.tar.gz bcm5719-llvm-35e1bda6957bb7e5d26f6a50e473ca3aa22a1386.zip | |
Add the ability to set timeout & "run all threads" options both from the "expr" command and from
the SB API's that evaluate expressions.
<rdar://problem/12457211>
llvm-svn: 166062
Diffstat (limited to 'lldb/source/Expression/ClangUserExpression.cpp')
| -rw-r--r-- | lldb/source/Expression/ClangUserExpression.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index c037d0238f9..450728272e6 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -544,7 +544,8 @@ ClangUserExpression::Execute (Stream &error_stream, bool discard_on_error, ClangUserExpression::ClangUserExpressionSP &shared_ptr_to_me, lldb::ClangExpressionVariableSP &result, - uint32_t single_thread_timeout_usec) + bool run_others, + uint32_t timeout_usec) { // The expression log is quite verbose, and if you're just tracking the execution of the // expression, it's quite convenient to have these logs come out with the STEP log as well. @@ -594,7 +595,7 @@ ClangUserExpression::Execute (Stream &error_stream, stop_others, try_all_threads, discard_on_error, - single_thread_timeout_usec, + timeout_usec, error_stream); if (exe_ctx.GetProcessPtr()) @@ -655,10 +656,21 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, const char *expr_cstr, const char *expr_prefix, lldb::ValueObjectSP &result_valobj_sp, - uint32_t single_thread_timeout_usec) + bool run_others, + uint32_t timeout_usec) { Error error; - return EvaluateWithError (exe_ctx, execution_policy, language, desired_type, discard_on_error, expr_cstr, expr_prefix, result_valobj_sp, error, single_thread_timeout_usec); + return EvaluateWithError (exe_ctx, + execution_policy, + language, + desired_type, + discard_on_error, + expr_cstr, + expr_prefix, + result_valobj_sp, + error, + run_others, + timeout_usec); } ExecutionResults @@ -671,7 +683,8 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx, const char *expr_prefix, lldb::ValueObjectSP &result_valobj_sp, Error &error, - uint32_t single_thread_timeout_usec) + bool run_others, + uint32_t timeout_usec) { lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); @@ -747,7 +760,8 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx, discard_on_error, user_expression_sp, expr_result, - single_thread_timeout_usec); + run_others, + timeout_usec); if (execution_results != eExecutionCompleted) { |
