Skip to content

[5.9] Cherry-pick waitUntilExit: ignore RunLoop.run()'s return value #4816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2023
Merged

[5.9] Cherry-pick waitUntilExit: ignore RunLoop.run()'s return value #4816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CoreFoundation/Base.subproj/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ void __CFInitialize(void) {
if (!__CFInitialized && !__CFInitializing) {
__CFInitializing = 1;

#if __HAS_DISPATCH__
#if __HAS_DISPATCH__ && !TARGET_OS_MAC
// libdispatch has to be initialized before CoreFoundation, so to avoid
// issues with static initializer ordering, we are doing it explicitly.
libdispatch_init();
Expand Down
15 changes: 9 additions & 6 deletions Sources/Foundation/Process.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,14 +1134,17 @@ open class Process: NSObject {
open func waitUntilExit() {
let runInterval = 0.05
let currentRunLoop = RunLoop.current
let checkRunLoop : () -> Bool = (currentRunLoop == self.runLoop)
? { currentRunLoop.run(mode: .default, before: Date(timeIntervalSinceNow: runInterval)) }
: { currentRunLoop.run(until: Date(timeIntervalSinceNow: runInterval)); return true }

// update .runLoop to allow early wakeup.
let runRunLoop : () -> Void = (currentRunLoop == self.runLoop)
? { currentRunLoop.run(mode: .default, before: Date(timeIntervalSinceNow: runInterval)) }
: { currentRunLoop.run(until: Date(timeIntervalSinceNow: runInterval)) }
// update .runLoop to allow early wakeup triggered by terminateRunLoop.
self.runLoop = currentRunLoop
while self.isRunning && checkRunLoop() {}


while self.isRunning {
runRunLoop()
}

self.runLoop = nil
self.runLoopSource = nil
}
Expand Down