[6.2][Macros] Mitigate plugin process 'wait' failure #81535
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
|
@swift-ci Please test |
bnbarham
approved these changes
May 15, 2025
Instead of expecting the plugin read `EOF` and exit, proactively terminate the plugin and `wait` to reap it. (cherry picked from commit 4a62ef8) [Macros] 'close' unnecessary file descriptors in plugin process 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. (cherry picked from commit 05948bc)
rintaro
force-pushed
the
6.2-macros-wait-rdar150474701
branch
from
f405ed7 to
2416b58
Compare
|
@swift-ci Please test |
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.
Cherry-pick #81517 (and #81547) into
release/6.2SIGTERM) the plugin process, in addition to close the pipe and expecting the plugin exit itself.Also adjust theAlso, make sure tollvm::sys::Waittimeout from 1 to 10 seconds, because in theWaitimplementation, it sets thealarm(SecondsToWait), thenwait4(pid, ..)so the alarm can go off before thewait4call.closeall the pipe file descriptor after duping them to stdio, which is not necessary, but it's a good thing to do.