summaryrefslogtreecommitdiffstats
path: root/lldb/source/Expression/ClangFunction.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2012-10-16 21:41:58 +0000
committerJim Ingham <jingham@apple.com>2012-10-16 21:41:58 +0000
commit35e1bda6957bb7e5d26f6a50e473ca3aa22a1386 (patch)
tree8ae0c9392cf55fc5c112148231d78729935de8e9 /lldb/source/Expression/ClangFunction.cpp
parent02a1141e5a36928f7a0ac9d2e0ee44dca3be3a01 (diff)
downloadbcm5719-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/ClangFunction.cpp')
-rw-r--r--lldb/source/Expression/ClangFunction.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/lldb/source/Expression/ClangFunction.cpp b/lldb/source/Expression/ClangFunction.cpp
index 62e4e8a8903..1909dc2c848 100644
--- a/lldb/source/Expression/ClangFunction.cpp
+++ b/lldb/source/Expression/ClangFunction.cpp
@@ -485,13 +485,13 @@ ExecutionResults
ClangFunction::ExecuteFunction(
ExecutionContext &exe_ctx,
Stream &errors,
- uint32_t single_thread_timeout_usec,
+ uint32_t timeout_usec,
bool try_all_threads,
Value &results)
{
const bool stop_others = true;
const bool discard_on_error = true;
- return ExecuteFunction (exe_ctx, NULL, errors, stop_others, single_thread_timeout_usec,
+ return ExecuteFunction (exe_ctx, NULL, errors, stop_others, timeout_usec,
try_all_threads, discard_on_error, results);
}
@@ -504,7 +504,7 @@ ClangFunction::ExecuteFunction (
bool stop_others,
bool try_all_threads,
bool discard_on_error,
- uint32_t single_thread_timeout_usec,
+ uint32_t timeout_usec,
Stream &errors,
lldb::addr_t *this_arg)
{
@@ -529,7 +529,7 @@ ClangFunction::ExecuteFunction (
stop_others,
try_all_threads,
discard_on_error,
- single_thread_timeout_usec,
+ timeout_usec,
errors);
if (exe_ctx.GetProcessPtr())
@@ -544,7 +544,7 @@ ClangFunction::ExecuteFunction(
lldb::addr_t *args_addr_ptr,
Stream &errors,
bool stop_others,
- uint32_t single_thread_timeout_usec,
+ uint32_t timeout_usec,
bool try_all_threads,
bool discard_on_error,
Value &results)
@@ -574,7 +574,7 @@ ClangFunction::ExecuteFunction(
stop_others,
try_all_threads,
discard_on_error,
- single_thread_timeout_usec,
+ timeout_usec,
errors);
if (args_addr_ptr != NULL)
OpenPOWER on IntegriCloud