Skip to content

Commit 0722f29

Browse files
committed
[lldb] Increase the default timeouts when running under ASan
Increase the default timeouts when running under ASan. We had something similar before we adopted tablegen, but the larger timeouts got lost in the transition, possibly because tablegen's preprocessor support is very limited. This patch passes a new define (LLDB_SANITIZED) to lldb-tablegen on which we can base the default value. Differential revision: https://reviews.llvm.org/D156279 (cherry picked from commit 94e8fef)
1 parent ea47328 commit 0722f29

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ function(lldb_tablegen)
2020
endif()
2121

2222
set(LLVM_TARGET_DEFINITIONS ${LTG_SOURCE})
23+
24+
if (LLVM_USE_SANITIZER MATCHES ".*Address.*")
25+
list(APPEND LTG_UNPARSED_ARGUMENTS -DLLDB_SANITIZED)
26+
endif()
27+
2328
tablegen(LLDB ${LTG_UNPARSED_ARGUMENTS})
2429

2530
if(LTG_TARGET)

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ include "../../../../include/lldb/Core/PropertiesBase.td"
33
let Definition = "processgdbremote" in {
44
def PacketTimeout: Property<"packet-timeout", "UInt64">,
55
Global,
6+
#ifdef LLDB_SANITIZED
7+
DefaultUnsignedValue<60>,
8+
#else
69
DefaultUnsignedValue<5>,
10+
#endif
711
Desc<"Specify the default packet timeout in seconds.">;
812
def TargetDefinitionFile: Property<"target-definition-file", "FileSpec">,
913
Global,

lldb/source/Target/TargetProperties.td

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,18 @@ let Definition = "process" in {
282282
DefaultTrue,
283283
Desc<"If true, stop when the inferior exec's.">;
284284
def UtilityExpressionTimeout: Property<"utility-expression-timeout", "UInt64">,
285+
#ifdef LLDB_SANITIZED
286+
DefaultUnsignedValue<60>,
287+
#else
285288
DefaultUnsignedValue<15>,
289+
#endif
286290
Desc<"The time in seconds to wait for LLDB-internal utility expressions.">;
287291
def InterruptTimeout: Property<"interrupt-timeout", "UInt64">,
292+
#ifdef LLDB_SANITIZED
293+
DefaultUnsignedValue<60>,
294+
#else
288295
DefaultUnsignedValue<20>,
296+
#endif
289297
Desc<"The time in seconds to wait for an interrupt succeed in stopping the target.">;
290298
def SteppingRunsAllThreads: Property<"run-all-threads", "Boolean">,
291299
DefaultFalse,

0 commit comments

Comments
 (0)