Revert "Update NSURLSession to be buildable in Xcode and gate all access to dispatch with DEPLOYMENT_ENABLE_LIBDISPATCH"

This reverts commit 73ba103.

Author: phausler

Foundation.xcodeproj/project.pbxproj

@@ -18,6 +18,9 @@
 // -----------------------------------------------------------------------------
 
 import CoreFoundation
+import Dispatch
+
+
 
 extension URLSessionTask {
     /// Minimal wrapper around the [curl easy interface](https://curl.haxx.se/libcurl/c/)

Foundation/NSURLSession/EasyHandle.swift

@@ -17,9 +17,10 @@
 // -----------------------------------------------------------------------------
 
 import CoreFoundation
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
 import Dispatch
 
+
+
 internal extension Data {
     /// Turn `dispatch_data_t` into `NSData`
     init(dispatchData: DispatchData) {
@@ -54,8 +55,7 @@ internal func split(dispatchData data: DispatchData, atPosition position: Int) -
     return (head, tail)*/
     return (data.subdata(in: 0..<position), data.subdata(in: position..<data.count))
 }
-#endif
-    
+
 /// A (non-blocking) source for HTTP body data.
 internal protocol _HTTPBodySource: class {
     /// Get the next chunck of data.
@@ -66,9 +66,7 @@ internal protocol _HTTPBodySource: class {
     func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk
 }
 internal enum _HTTPBodySourceDataChunk {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
     case data(DispatchData)
-#endif
     /// The source is depleted.
     case done
     /// Retry later to get more data.
@@ -78,12 +76,10 @@ internal enum _HTTPBodySourceDataChunk {
 
 /// A HTTP body data source backed by `dispatch_data_t`.
 internal final class _HTTPBodyDataSource {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
-    var data: DispatchData!
+    var data: DispatchData! 
     init(data: DispatchData) {
         self.data = data
     }
-#endif
 }
 
 extension _HTTPBodyDataSource : _HTTPBodySource {
@@ -92,7 +88,6 @@ extension _HTTPBodyDataSource : _HTTPBodySource {
     }
 
     func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         let remaining = data.count
         if remaining == 0 {
             return .done
@@ -105,9 +100,6 @@ extension _HTTPBodyDataSource : _HTTPBodySource {
             data = remainder
             return .data(chunk)
         }
-#else
-        fatalError("NSURLSession requires libdispatch")
-#endif
     }
 }
 
@@ -125,10 +117,8 @@ extension _HTTPBodyDataSource : _HTTPBodySource {
 /// have to be thread safe.
 internal final class _HTTPBodyFileSource {
     fileprivate let fileURL: URL
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
-    fileprivate let channel: DispatchIO
-    fileprivate let workQueue: DispatchQueue
-#endif
+    fileprivate let channel: DispatchIO 
+    fileprivate let workQueue: DispatchQueue 
     fileprivate let dataAvailableHandler: () -> ()
     fileprivate var hasActiveReadHandler = false
     fileprivate var availableChunk: _Chunk = .empty
@@ -143,7 +133,6 @@ internal final class _HTTPBodyFileSource {
     ///     no data may be available even if there's more data in the file.
     ///     if `getNextChunk(withLength:)` returns `.retryLater`, this handler
     ///     will be called once data becomes available.
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
     init(fileURL: URL, workQueue: DispatchQueue, dataAvailableHandler: @escaping () -> ()) {
         guard fileURL.isFileURL else { fatalError("The body data URL must be a file URL.") }
         self.fileURL = fileURL
@@ -156,24 +145,16 @@ internal final class _HTTPBodyFileSource {
         self.channel = DispatchIO(type: .stream, path: fileSystemRepresentation, oflag: O_RDONLY, mode: 0, queue: workQueue, cleanupHandler: {_ in })
         self.channel.setLimit(highWater: CFURLSessionMaxWriteSize)
     }
-#else
-    init(fileURL: URL, dataAvailableHandler: @escaping () -> ()) {
-        self.fileURL = fileURL
-        self.dataAvailableHandler = dataAvailableHandler
-    }
-#endif
 
     fileprivate enum _Chunk {
         /// Nothing has been read, yet
         case empty
         /// An error has occured while reading
         case errorDetected(Int)
         /// Data has been read
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         case data(DispatchData)
         /// All data has been read from the file (EOF).
         case done(DispatchData?)
-#endif
     }
 }
 
@@ -191,7 +172,6 @@ fileprivate extension _HTTPBodyFileSource {
         hasActiveReadHandler = true
 
         let lengthToRead = desiredBufferLength - availableByteCount
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         channel.read(offset: 0, length: lengthToRead, queue: workQueue) { (done: Bool, data: DispatchData?, errno: Int32) in
             let wasEmpty = self.availableByteCount == 0
             self.hasActiveReadHandler = !done
@@ -213,9 +193,8 @@ fileprivate extension _HTTPBodyFileSource {
                 self.dataAvailableHandler()
             }
         }
-#endif
     }
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
+
     fileprivate func append(data: DispatchData, endOfFile: Bool) {
         switch availableChunk {
         case .empty:
@@ -229,26 +208,20 @@ fileprivate extension _HTTPBodyFileSource {
             fatalError("Trying to append data, but end-of-file was already detected.")
         }
     }
-#endif
-    
+
     fileprivate var availableByteCount: Int {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         switch availableChunk {
         case .empty: return 0
         case .errorDetected: return 0
         case .data(let d): return d.count
         case .done(.some(let d)): return d.count
         case .done(.none): return 0
         }
-#else
-        return 0
-#endif
     }
 }
 
 extension _HTTPBodyFileSource : _HTTPBodySource {
-    func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
+    func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk {    
         switch availableChunk {
         case .empty:
             readNextChunk()
@@ -279,8 +252,5 @@ extension _HTTPBodyFileSource : _HTTPBodySource {
         case .done(.none):
             return .done
         }
-#else
-        fatalError("NSURLSession requires libdispatch")
-#endif
     }
 }

Foundation/NSURLSession/HTTPBodySource.swift

@@ -18,9 +18,7 @@
 // -----------------------------------------------------------------------------
 
 import CoreFoundation
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
 import Dispatch
-#endif
 
 
 
@@ -38,21 +36,18 @@ extension URLSession {
     /// - SeeAlso: URLSessionTask._EasyHandle
     internal final class _MultiHandle {
         let rawHandle = CFURLSessionMultiHandleInit()
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         let queue: DispatchQueue
         //let queue = DispatchQueue(label: "MultiHandle.isolation", attributes: .serial)
         let group = DispatchGroup()
-#endif
         fileprivate var easyHandles: [URLSessionTask._EasyHandle] = []
         fileprivate var timeoutSource: _TimeoutSource? = nil
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
+        
         init(configuration: URLSession._Configuration, workQueue: DispatchQueue) {
             //queue.setTarget(queue: workQueue)
             queue = DispatchQueue(label: "MultiHandle.isolation", target: workQueue)
             setupCallbacks()
             configure(with: configuration)
         }
-#endif
         deinit {
             // C.f.: <https://curl.haxx.se/libcurl/c/curl_multi_cleanup.html>
             easyHandles.forEach {
@@ -122,12 +117,10 @@ fileprivate extension URLSession._MultiHandle {
             socketSources = nil
         }
         if let ss = socketSources {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
             let handler = DispatchWorkItem { [weak self] in
                 self?.performAction(for: socket)
             }
             ss.createSources(with: action, fileDescriptor: Int(socket), queue: queue, handler: handler)
-#endif
         }
         return 0
     }
@@ -308,11 +301,8 @@ fileprivate extension URLSession._MultiHandle._SocketRegisterAction {
 ///
 /// Used to implement the timeout of `URLSession.MultiHandle`.
 fileprivate class _TimeoutSource {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
-    let rawSource: DispatchSource
-#endif
+    let rawSource: DispatchSource 
     let milliseconds: Int
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
     init(queue: DispatchQueue, milliseconds: Int, handler: DispatchWorkItem) {
         self.milliseconds = milliseconds
         self.rawSource = DispatchSource.makeTimerSource(queue: queue) as! DispatchSource
@@ -328,17 +318,13 @@ fileprivate class _TimeoutSource {
     deinit {
         rawSource.cancel()
     }
-#else
-    init() { milliseconds = 0 }
-#endif
 }
 fileprivate extension URLSession._MultiHandle {
     /// <https://curl.haxx.se/libcurl/c/CURLMOPT_TIMERFUNCTION.html>
     func updateTimeoutTimer(to value: Int) {
         updateTimeoutTimer(to: _Timeout(timeout: value))
     }
     func updateTimeoutTimer(to timeout: _Timeout) {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
         // Set up a timeout timer based on the given value:
         switch timeout {
         case .none:
@@ -356,7 +342,6 @@ fileprivate extension URLSession._MultiHandle {
                 timeoutSource = _TimeoutSource(queue: queue, milliseconds: milliseconds, handler: block)
             }
         }
-#endif
     }
     enum _Timeout {
         case milliseconds(Int)
@@ -387,7 +372,6 @@ fileprivate extension URLSession._MultiHandle._Timeout {
 ///
 /// - SeeAlso: URLSession.MultiHandle.SocketRegisterAction
 fileprivate class _SocketSources {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
     var readSource: DispatchSource?
     var writeSource: DispatchSource?
 
@@ -417,10 +401,8 @@ fileprivate class _SocketSources {
         }
         writeSource = nil
     }
-#endif
 }
 extension _SocketSources {
-#if DEPLOYMENT_ENABLE_LIBDISPATCH
     /// Create a read and/or write source as specified by the action.
     func createSources(with action: URLSession._MultiHandle._SocketRegisterAction, fileDescriptor fd: Int, queue: DispatchQueue, handler: DispatchWorkItem) {
         if action.needsReadSource {
@@ -430,7 +412,6 @@ extension _SocketSources {
             createWriteSource(fileDescriptor: fd, queue: queue, handler: handler)
         }
     }
-#endif
 }
 extension _SocketSources {
     /// Unwraps the `SocketSources`