Author: Alex Langford Date: 2023-02-23T11:22:22-08:00 New Revision: 97b579d3140476cd32d94a6e052f0908e2c21228
URL: https://github.com/llvm/llvm-project/commit/97b579d3140476cd32d94a6e052f0908e2c21228 DIFF: https://github.com/llvm/llvm-project/commit/97b579d3140476cd32d94a6e052f0908e2c21228.diff LOG: [debugserver] Add one additional sleep before attaching after waiting It's possible for debugserver to attach to a process during the handoff between /usr/lib/dyld and the dyld in the shared cache. When that happens, we may end up in a state where there is no dyld in the process and our debugging session is doomed. To make that scenario a lot less likely, we can insert a sleep right before attaching after waiting to find the right pid. rdar://105513180 Differential Revision: https://reviews.llvm.org/D144311 Added: Modified: lldb/tools/debugserver/source/DNB.cpp Removed: ################################################################################ diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp index a95238c6279e1..07423ea56e6e2 100644 --- a/lldb/tools/debugserver/source/DNB.cpp +++ b/lldb/tools/debugserver/source/DNB.cpp @@ -793,6 +793,14 @@ DNBProcessAttachWait(RNBContext *ctx, const char *waitfor_process_name, if (waitfor_pid != INVALID_NUB_PROCESS) { DNBLogThreadedIf(LOG_PROCESS, "Attaching to %s with pid %i...\n", waitfor_process_name, waitfor_pid); + // In some cases, we attempt to attach during the transition from + // /usr/lib/dyld to the dyld in the shared cache. If that happens, we may + // end up in a state where there is no dyld in the process and from there + // the debugging session is doomed. + // In an attempt to make this scenario much less likely, we sleep + // for an additional `waitfor_interval` number of microseconds before + // attaching. + ::usleep(waitfor_interval); waitfor_pid = DNBProcessAttach(waitfor_pid, timeout_abstime, ctx->GetIgnoredExceptions(), err_str, err_len); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
