Merge branch 'main' into ff-async-sequence-support

Author: fabianfett

IntegrationTests/tests_02_syscall_wrappers/defines.sh

@@ -17,7 +17,7 @@ set -eu
 
 function make_package() {
     cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
-// swift-tools-version:5.0
+// swift-tools-version:5.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -28,24 +28,30 @@ let package = Package(
     targets: [
         .target(
             name: "syscallwrapper",
-            dependencies: ["CNIOLinux", "CNIODarwin"]),
+            dependencies: ["CNIOLinux", "CNIODarwin", "NIOCore"]),
         .target(
             name: "CNIOLinux",
             dependencies: []),
         .target(
             name: "CNIODarwin",
             dependencies: []),
+        // This target does nothing, it just makes imports work.
+        .target(
+            name: "NIOCore",
+            dependencies: []),
     ]
 )
 EOF
-    cp "$here/../../Tests/NIOTests/SystemCallWrapperHelpers.swift" \
+    cp "$here/../../Tests/NIOPosixTests/SystemCallWrapperHelpers.swift" \
         "$here/../../Sources/NIOCore/BSDSocketAPI.swift" \
-        "$here/../../Sources/NIO/BSDSocketAPICommon.swift" \
-        "$here/../../Sources/NIO/BSDSocketAPIPosix.swift" \
-        "$here/../../Sources/NIO/System.swift" \
+        "$here/../../Sources/NIOPosix/BSDSocketAPICommon.swift" \
+        "$here/../../Sources/NIOPosix/BSDSocketAPIPosix.swift" \
+        "$here/../../Sources/NIOPosix/System.swift" \
         "$here/../../Sources/NIOCore/IO.swift" \
         "$tmpdir/syscallwrapper/Sources/syscallwrapper"
-    cp "$here/../../Sources/NIO/IO.swift" "$tmpdir/syscallwrapper/Sources/syscallwrapper/NIOIO.swift"
+    cp "$here/../../Sources/NIOPosix/IO.swift" "$tmpdir/syscallwrapper/Sources/syscallwrapper/NIOPosixIO.swift"
     ln -s "$here/../../Sources/CNIOLinux" "$tmpdir/syscallwrapper/Sources"
     ln -s "$here/../../Sources/CNIODarwin" "$tmpdir/syscallwrapper/Sources"
+    mkdir "$tmpdir/syscallwrapper/Sources/NIOCore"
+    touch "$tmpdir/syscallwrapper/Sources/NIOCore/empty.swift"
 }

IntegrationTests/tests_04_performance/test_01_resources/run-nio-alloc-counter-tests.sh

@@ -39,7 +39,7 @@ fi
 
 "$here/../../allocation-counter-tests-framework/run-allocation-counter.sh" \
     -p "$here/../../.." \
-    -m NIO -m NIOHTTP1 -m NIOWebSocket \
+    -m NIOCore -m NIOEmbedded -m NIOPosix -m NIOHTTP1 -m NIOWebSocket \
     -s "$here/shared.swift" \
     -t "$tmp_dir" \
     "${tests_to_run[@]}"

IntegrationTests/tests_04_performance/test_01_resources/shared.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import NIO
+import NIOCore
+import NIOPosix
 import NIOHTTP1
 
 let localhostPickPort = try! SocketAddress.makeAddressResolvingHost("127.0.0.1", port: 0)

IntegrationTests/tests_04_performance/test_01_resources/test_1000_addHandlers.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2020-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 
 fileprivate final class SimpleHandler: ChannelInboundHandler {
     typealias InboundIn = NIOAny

IntegrationTests/tests_04_performance/test_01_resources/test_1000_addHandlers_sync.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 
 fileprivate final class SimpleHandler: ChannelInboundHandler {
     typealias InboundIn = NIOAny

IntegrationTests/tests_04_performance/test_01_resources/test_1000_addRemoveHandlers.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 
 fileprivate final class RemovableHandler: ChannelInboundHandler, RemovableChannelHandler {
     typealias InboundIn = NIOAny

IntegrationTests/tests_04_performance/test_01_resources/test_1000_autoReadGetAndSet.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 
 func run(identifier: String) {
     let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)

IntegrationTests/tests_04_performance/test_01_resources/test_1000_autoReadGetAndSet_sync.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 
 func run(identifier: String) {
     MultiThreadedEventLoopGroup.withCurrentThreadAsEventLoop { loop in

IntegrationTests/tests_04_performance/test_01_resources/test_1000_getHandlers.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 
 fileprivate final class SimpleHandler: ChannelInboundHandler {
     typealias InboundIn = NIOAny

IntegrationTests/tests_04_performance/test_01_resources/test_1000_getHandlers_sync.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 
 fileprivate final class SimpleHandler: ChannelInboundHandler {
     typealias InboundIn = NIOAny