preconcurrency linux

grpc · Aug 15, 2023 · bdd24e2 · bdd24e2
1 parent 59a9c7d
commit bdd24e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Sources/GRPC/ConnectionManagerChannelProvider.swift b/Sources/GRPC/ConnectionManagerChannelProvider.swift
@@ -69,7 +69,7 @@ internal struct DefaultChannelProvider: ConnectionManagerChannelProvider, Sendab
   @usableFromInline
   internal var errorDelegate: Optional<ClientErrorDelegate>
   @usableFromInline
-  internal var debugChannelInitializer: Optional< @Sendable (Channel) -> EventLoopFuture < Void>>
+  internal var debugChannelInitializer: Optional<@Sendable (Channel) -> EventLoopFuture <Void>>
 
   @inlinable
   internal init(

diff --git a/Tests/GRPCTests/CapturingLogHandler.swift b/Tests/GRPCTests/CapturingLogHandler.swift
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if os(Linux)
+@preconcurrency import struct Foundation.Date
+#else
 import struct Foundation.Date
+#endif
 import class Foundation.DateFormatter
 import Logging
 import NIOConcurrencyHelpers

diff --git a/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift b/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift
@@ -346,19 +346,22 @@ private final class EmbeddedEventLoopGroup: EventLoopGroup, Sendable {
     return EventLoopIterator(self.loops)
   }
 
-  internal func shutdownGracefully(queue: DispatchQueue, _ callback: @escaping (Error?) -> Void) {
-    var shutdownError: Error?
+  internal func shutdownGracefully(
+    queue: DispatchQueue,
+    _ callback: @escaping @Sendable (Error?) -> Void
+  ) {
+    let lockedError = NIOLockedValueBox<Error?>(nil)
 
     for loop in self.loops {
       loop.shutdownGracefully(queue: queue) { error in
         if let error = error {
-          shutdownError = error
+          lockedError.withLockedValue { $0 = error }
         }
       }
     }
 
     queue.sync {
-      callback(shutdownError)
+      callback(lockedError.withLockedValue { $0 })
     }
   }
 }