Revert "Remove duplicated runloop code (#1193)"

This reverts commit ae0648d.

Author: younata

Sources/Nimble/Utils/AsyncAwait.swift

@@ -1,5 +1,9 @@
 #if !os(WASI)
 
+#if canImport(CoreFoundation)
+import CoreFoundation
+#endif
+
 import Dispatch
 import Foundation
 

Sources/Nimble/Utils/AsyncTimerSequence.swift

@@ -1,5 +1,8 @@
 #if !os(WASI)
 
+#if canImport(CoreFoundation)
+import CoreFoundation
+#endif
 import Dispatch
 import Foundation
 

Sources/Nimble/Utils/PollAwait.swift

@@ -1,5 +1,8 @@
 #if !os(WASI)
 
+#if canImport(CoreFoundation)
+import CoreFoundation
+#endif
 import Dispatch
 import Foundation
 
@@ -195,24 +198,48 @@ internal class AwaitPromiseBuilder<T> {
             let timedOutSem = DispatchSemaphore(value: 0)
             let semTimedOutOrBlocked = DispatchSemaphore(value: 0)
             semTimedOutOrBlocked.signal()
+            #if canImport(CoreFoundation)
+            let runLoop = CFRunLoopGetMain()
+            #if canImport(Darwin)
+                let runLoopMode = CFRunLoopMode.defaultMode.rawValue
+            #else
+                let runLoopMode = kCFRunLoopDefaultMode
+            #endif
+            CFRunLoopPerformBlock(runLoop, runLoopMode) {
+                if semTimedOutOrBlocked.wait(timeout: .now()) == .success {
+                    timedOutSem.signal()
+                    semTimedOutOrBlocked.signal()
+                    if self.promise.resolveResult(.timedOut) {
+                        CFRunLoopStop(CFRunLoopGetMain())
+                    }
+                }
+            }
+            // potentially interrupt blocking code on run loop to let timeout code run
+            CFRunLoopStop(runLoop)
+            #else
             let runLoop = RunLoop.main
             runLoop.perform(inModes: [.default], block: {
                 if semTimedOutOrBlocked.wait(timeout: .now()) == .success {
                     timedOutSem.signal()
                     semTimedOutOrBlocked.signal()
                     if self.promise.resolveResult(.timedOut) {
-                        RunLoop.main.stop()
+                        RunLoop.main._stop()
                     }
                 }
             })
             // potentially interrupt blocking code on run loop to let timeout code run
-            runLoop.stop()
+            runLoop._stop()
+            #endif
             let now = DispatchTime.now() + forcefullyAbortTimeout.dispatchTimeInterval
             let didNotTimeOut = timedOutSem.wait(timeout: now) != .success
             let timeoutWasNotTriggered = semTimedOutOrBlocked.wait(timeout: .now()) == .success
             if didNotTimeOut && timeoutWasNotTriggered {
                 if self.promise.resolveResult(.blockedRunLoop) {
-                    runLoop.stop()
+                    #if canImport(CoreFoundation)
+                    CFRunLoopStop(CFRunLoopGetMain())
+                    #else
+                    RunLoop.main._stop()
+                    #endif
                 }
             }
         }
@@ -300,7 +327,11 @@ internal class Awaiter {
                     if completionCount < 2 {
                         func completeBlock() {
                             if promise.resolveResult(.completed(result)) {
-                                RunLoop.main.stop()
+                                #if canImport(CoreFoundation)
+                                CFRunLoopStop(CFRunLoopGetMain())
+                                #else
+                                RunLoop.main._stop()
+                                #endif
                             }
                         }
 
@@ -338,12 +369,20 @@ internal class Awaiter {
                 do {
                     if let result = try closure() {
                         if promise.resolveResult(.completed(result)) {
-                            RunLoop.current.stop()
+                            #if canImport(CoreFoundation)
+                            CFRunLoopStop(CFRunLoopGetCurrent())
+                            #else
+                            RunLoop.current._stop()
+                            #endif
                         }
                     }
                 } catch let error {
                     if promise.resolveResult(.errorThrown(error)) {
-                        RunLoop.current.stop()
+                        #if canImport(CoreFoundation)
+                        CFRunLoopStop(CFRunLoopGetCurrent())
+                        #else
+                        RunLoop.current._stop()
+                        #endif
                     }
                 }
             }
@@ -377,23 +416,4 @@ internal func pollBlock(
         return result
 }
 
-#if canImport(CoreFoundation)
-import CoreFoundation
-
-extension RunLoop {
-    func stop() {
-        CFRunLoopStop(getCFRunLoop())
-    }
-}
-
-#else
-
-extension RunLoop {
-    func stop() {
-        _stop()
-    }
-}
-
-#endif
-
 #endif // #if !os(WASI)

Tests/NimbleTests/PollingTest+Require.swift

@@ -1,6 +1,9 @@
 #if !os(WASI)
 
 import Dispatch
+#if canImport(CoreFoundation)
+import CoreFoundation
+#endif
 import Foundation
 import XCTest
 import Nimble