[Macros] Mitigate plugin process 'wait' failure #81517
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, the compiler waited the plugin process with `llvm::sys::Wait(pid, /*SecondsToWait=*/1)`. But in the `Wait` implementation, it sets the `alarm(SecondsToWait)`, then `wait4(pid, ..)` so if the alarm fires before the `wait4` call, it may miss the timeout and can wait indefinitely. To mitigate that risk,use `10` for the timeout value. rdar://150474701
rintaro
requested review from
DougGregor,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci Please smoke test |
rintaro
force-pushed
the
macros-wait-rdar150474701
branch
from
0463484 to
45d3508
Compare
Close all the pipe file descriptors in the child process after duping them to the standard I/O. This is not necessary but it's a good thing to do anyway.
rintaro
force-pushed
the
macros-wait-rdar150474701
branch
from
45d3508 to
05948bc
Compare
|
@swift-ci Please smoke test |
Instead of expecting the plugin read `EOF` and exit, proactively terminate the plugin and `wait` to reap it.
|
@swift-ci Please smoke test |
bnbarham
approved these changes
May 14, 2025
|
@swift-ci Please smoke test macOS |
This was referenced May 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the compiler waited the plugin process with
llvm::sys::Wait(process, /*SecondsToWait=*/1). But in theWaitimplementation, it sets thealarm(SecondsToWait), thenwait4(process.Pid, ..)so if the alarm fires before thewait4call, it may miss the timeout and can wait indefinitely. To mitigate that risk, use10for the timeout value.And terminate the plugin process, then
waitto reap it, instead of expecting the plugin readEOFandexititself.Also, close all the pipe file descriptors in the child process after duping them to the standard I/O. This is not necessary but it's a good thing to do anyway.
rdar://150474701