dnrops
/
swift-nio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slight improvements to the allocation tests (#859) 

Motivation:

The allocation tests were needlessly running the resolver within the
allocation counted loop.

Modifications:

- bump to Swift version 5.0
- take the resolving out of the allocation counting loop

Result:

more accurate results
This commit is contained in:
Johannes Weiss 2019-03-01 18:53:25 +00:00 committed by GitHub
parent 9c07f89ec7
commit ac26c7298d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IntegrationTests/tests_04_performance/test_01_resources/template/AtomicCounter/Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:4.0 // swift-tools-version:5.0
// The swift-tools-version declares the minimum version of Swift required to build this package. // The swift-tools-version declares the minimum version of Swift required to build this package.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //

2
IntegrationTests/tests_04_performance/test_01_resources/template/HookedFunctions/Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:4.0 // swift-tools-version:5.0
// The swift-tools-version declares the minimum version of Swift required to build this package. // The swift-tools-version declares the minimum version of Swift required to build this package.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //

2
IntegrationTests/tests_04_performance/test_01_resources/template/Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:4.0 // swift-tools-version:5.0
// The swift-tools-version declares the minimum version of Swift required to build this package. // The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription import PackageDescription

4
IntegrationTests/tests_04_performance/test_01_resources/template/Sources/SwiftBootstrap/SwiftMain.swift
View File

@ -12,6 +12,8 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
let localhostPickPort = try! SocketAddress.makeAddressResolvingHost("127.0.0.1", port: 0)
import NIO import NIO
import NIOHTTP1 import NIOHTTP1
import Foundation import Foundation
@ -243,7 +245,7 @@ public func swiftMain() -> Int {
withErrorHandling: false).flatMap { withErrorHandling: false).flatMap {
channel.pipeline.addHandler(SimpleHTTPServer()) channel.pipeline.addHandler(SimpleHTTPServer())
} }
}.bind(host: "127.0.0.1", port: 0).wait() }.bind(to: localhostPickPort).wait()
defer { defer {
try! serverChannel.close().wait() try! serverChannel.close().wait()

4
docker/docker-compose.1804.50.yaml
View File

@ -20,7 +20,7 @@ services:
image: swift-nio:18.04-5.0 image: swift-nio:18.04-5.0
environment: environment:
- MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=36750 - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=36750
- MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=692050 - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=685050
- MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=4600 - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=4600
- MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2100 - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2100
- MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=99100 - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=99100
@ -30,7 +30,7 @@ services:
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors -Xswiftc -DNIO_CI_BUILD && ./scripts/integration_tests.sh" command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors -Xswiftc -DNIO_CI_BUILD && ./scripts/integration_tests.sh"
environment: environment:
- MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=36750 - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=36750
- MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=692050 - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=685050
- MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=4600 - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=4600
- MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2100 - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2100
- MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=99100 - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=99100