Revert "IORing backends: allow ring to be specified at initialization"

This reverts commit 68c4118.

Unfortunately this appears to cause compile issues with some API consumers. We
probably need a flag instead to indicate whether the shared IORing should be
used.

Author: lhoward

Sources/SwiftOCA/OCP.1/Backend/Ocp1IORingConnection.swift

@@ -23,12 +23,13 @@ import Foundation
 #endif
 
 import Glibc
-import IORing
 
 #if swift(>=6.0)
+internal import IORing
 internal import IORingFoundation
 internal import IORingUtils
 #else
+@_implementationOnly import IORing
 @_implementationOnly import IORingFoundation
 @_implementationOnly import IORingUtils
 #endif
@@ -57,7 +58,6 @@ fileprivate extension Errno {
 }
 
 public class Ocp1IORingConnection: Ocp1Connection, Ocp1MutableConnection {
-  fileprivate let _ring: IORing
   fileprivate let _deviceAddress: Mutex<any SocketAddress>
   fileprivate var _socket: Socket?
   fileprivate var _type: Int32 {
@@ -66,34 +66,29 @@ public class Ocp1IORingConnection: Ocp1Connection, Ocp1MutableConnection {
 
   public convenience init(
     deviceAddress: Data,
-    options: Ocp1ConnectionOptions = Ocp1ConnectionOptions(),
-    ring: IORing = .shared
+    options: Ocp1ConnectionOptions = Ocp1ConnectionOptions()
   ) throws {
-    try self.init(socketAddress: deviceAddress.socketAddress, options: options, ring: ring)
+    try self.init(socketAddress: deviceAddress.socketAddress, options: options)
   }
 
   fileprivate init(
     socketAddress: any SocketAddress,
-    options: Ocp1ConnectionOptions,
-    ring: IORing = .shared
+    options: Ocp1ConnectionOptions
   ) throws {
     _deviceAddress = Mutex(socketAddress)
-    _ring = ring
     super.init(options: options)
   }
 
   public convenience init(
     path: String,
-    options: Ocp1ConnectionOptions = Ocp1ConnectionOptions(),
-    ring: IORing = .shared
+    options: Ocp1ConnectionOptions = Ocp1ConnectionOptions()
   ) throws {
     try self.init(
       socketAddress: sockaddr_un(
         family: sa_family_t(AF_LOCAL),
         presentationAddress: path
       ),
-      options: options,
-      ring: ring
+      options: options
     )
   }
 
@@ -145,18 +140,17 @@ public final class Ocp1IORingDatagramConnection: Ocp1IORingConnection {
 
   override fileprivate init(
     socketAddress: any SocketAddress,
-    options: Ocp1ConnectionOptions,
-    ring: IORing
+    options: Ocp1ConnectionOptions
   ) throws {
     guard socketAddress.family == AF_INET || socketAddress.family == AF_INET6
     else { throw Errno.addressFamilyNotSupported }
-    try super.init(socketAddress: socketAddress, options: options, ring: ring)
+    try super.init(socketAddress: socketAddress, options: options)
   }
 
   override public func connectDevice() async throws {
     let deviceAddress = _deviceAddress.criticalValue
     let socket = try Socket(
-      ring: _ring,
+      ring: IORing.shared,
       domain: deviceAddress.family,
       type: __socket_type(UInt32(_type)),
       protocol: 0
@@ -201,12 +195,11 @@ public final class Ocp1IORingDomainSocketDatagramConnection: Ocp1IORingConnectio
 
   override fileprivate init(
     socketAddress: any SocketAddress,
-    options: Ocp1ConnectionOptions,
-    ring: IORing
+    options: Ocp1ConnectionOptions
   ) throws {
     guard socketAddress.family == AF_LOCAL else { throw Errno.addressFamilyNotSupported }
     localAddress = try sockaddr_un.ephemeralDatagramDomainSocketName
-    try super.init(socketAddress: socketAddress, options: options, ring: ring)
+    try super.init(socketAddress: socketAddress, options: options)
   }
 
   override public func connectDevice() async throws {
@@ -274,7 +267,7 @@ public final class Ocp1IORingStreamConnection: Ocp1IORingConnection {
     let deviceAddress: any SocketAddress = _deviceAddress.criticalValue
 
     let socket = try Socket(
-      ring: _ring,
+      ring: IORing.shared,
       domain: deviceAddress.family,
       type: __socket_type(UInt32(_type)),
       protocol: 0

Sources/SwiftOCADevice/OCP.1/Backend/IORing/Ocp1IORingDeviceEndpoint.swift

@@ -25,11 +25,12 @@ import FoundationEssentials
 import Foundation
 #endif
 import Glibc
-import IORing
 
 #if swift(>=6.0)
+internal import IORing
 internal import IORingUtils
 #else
+@_implementationOnly import IORing
 @_implementationOnly import IORingUtils
 #endif
 
@@ -63,14 +64,13 @@ public class Ocp1IORingDeviceEndpoint: OcaBonjourRegistrableDeviceEndpoint,
     address: any SocketAddress,
     timeout: Duration = OcaDevice.DefaultTimeout,
     device: OcaDevice = OcaDevice.shared,
-    logger: Logger = Logger(label: "com.padl.SwiftOCADevice.Ocp1IORingDeviceEndpoint"),
-    ring: IORing = .shared
+    logger: Logger = Logger(label: "com.padl.SwiftOCADevice.Ocp1IORingDeviceEndpoint")
   ) async throws {
     self.address = address
     self.timeout = timeout
     self.device = device
     self.logger = logger
-    self.ring = ring
+    ring = IORing.shared
     try await device.add(endpoint: self)
   }