maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Long timeouts for the MacOSX SystemRuntime plugins under ASAN; else quick. 

In April via r357829, Adrian unified timeouts across lldb and set the
default value high so that we wouldn't get timeouts on ASAN bots that
were running under load.

The library that the MacOSX SystemRuntime has functions that need
to take a lock, and if that lock is held already, those functions
will never complete; we're seeing the 15 second timeout being hit
with inferiors that are doing a lot of enqueuing and dequeuing of
libdispatch work items causing this deadlocking behavior.

This patch reverts to a very short timeout for these SystemRuntime
function calls, given the behavior of this library that they are 
calling into.  When lldb is built with AddressSanitizer enabled,
they will use the default 15 second timeout.

tl;dr: this reverts to the previous timeouts for these SystemRuntime
inf func calls.

<rdar://problem/54538149> 

llvm-svn: 371280
This commit is contained in:
Jason Molenda 2019-09-07 01:38:37 +00:00
parent 0aee387321
commit 5b0a687d89
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp
View File

@ -332,6 +332,11 @@ AppleGetItemInfoHandler::GetItemInfo(Thread &thread, uint64_t item,
options.SetUnwindOnError(true);
options.SetIgnoreBreakpoints(true);
options.SetStopOthers(true);
#if __has_feature(address_sanitizer)
options.SetTimeout(process_sp->GetUtilityExpressionTimeout());
#else
options.SetTimeout(std::chrono::milliseconds(500));
#endif
options.SetTimeout(process_sp->GetUtilityExpressionTimeout());
options.SetTryAllThreads(false);
options.SetIsForUtilityExpr(true);

4
lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp
View File

@ -338,7 +338,11 @@ AppleGetPendingItemsHandler::GetPendingItems(Thread &thread, addr_t queue,
options.SetUnwindOnError(true);
options.SetIgnoreBreakpoints(true);
options.SetStopOthers(true);
#if __has_feature(address_sanitizer)
options.SetTimeout(process_sp->GetUtilityExpressionTimeout());
#else
options.SetTimeout(std::chrono::milliseconds(500));
#endif
options.SetTryAllThreads(false);
options.SetIsForUtilityExpr(true);
thread.CalculateExecutionContext(exe_ctx);

4
lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
View File

@ -344,7 +344,11 @@ AppleGetQueuesHandler::GetCurrentQueues(Thread &thread, addr_t page_to_free,
options.SetUnwindOnError(true);
options.SetIgnoreBreakpoints(true);
options.SetStopOthers(true);
#if __has_feature(address_sanitizer)
options.SetTimeout(process_sp->GetUtilityExpressionTimeout());
#else
options.SetTimeout(std::chrono::milliseconds(500));
#endif
options.SetTryAllThreads(false);
options.SetIsForUtilityExpr(true);
thread.CalculateExecutionContext(exe_ctx);

4
lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp
View File

@ -341,7 +341,11 @@ AppleGetThreadItemInfoHandler::GetThreadItemInfo(Thread &thread,
options.SetUnwindOnError(true);
options.SetIgnoreBreakpoints(true);
options.SetStopOthers(true);
#if __has_feature(address_sanitizer)
options.SetTimeout(process_sp->GetUtilityExpressionTimeout());
#else
options.SetTimeout(std::chrono::milliseconds(500));
#endif
options.SetTryAllThreads(false);
options.SetIsForUtilityExpr(true);
thread.CalculateExecutionContext(exe_ctx);