Skip to content

Reduce tolerance for nanoseconds #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atdrendel merged 2 commits into from
Apr 30, 2026
+49 −6
Merged

Reduce tolerance for nanoseconds #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f015ebb
Set default nanosecond tolerance to zero
atdrendel Apr 29, 2026
355a373
Update GitHub Actions workflow
atdrendel Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on: push

jobs:
test:
runs-on: macos-12
runs-on: macos-15

steps:
- uses: actions/checkout@v3
- name: Select Xcode 14
run: sudo xcode-select -s /Applications/Xcode_14.1.app
- uses: actions/checkout@v4
- name: Select Xcode 26
run: sudo xcode-select -s /Applications/Xcode_26.3.app
- name: Test
run: swift test
9 changes: 7 additions & 2 deletions Sources/DispatchTimer/DispatchTimer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public final class DispatchTimer: Sendable {
}
}

private extension DispatchTimer {
extension DispatchTimer {
static func defaultTolerance(_ interval: DispatchTimeInterval) -> DispatchTimeInterval {
switch interval {
case let .seconds(amount):
Expand All @@ -85,13 +85,18 @@ private extension DispatchTimer {
case let .microseconds(amount):
guard amount > 0 else { return .never }
return .nanoseconds(oneTenthOfOneThousand(of: amount))
case .nanoseconds, .never:
case let .nanoseconds(amount):
guard amount > 0 else { return .never }
return .nanoseconds(0)
case .never:
return .never
@unknown default:
return .never
}
}
}

private extension DispatchTimer {
func fire() {
block()
if !isRepeating { source.cancel() }
Expand Down
38 changes: 38 additions & 0 deletions Tests/DispatchTimerTests/DispatchTimerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,49 @@ final class DispatchTimerTests: XCTestCase {
timer.invalidate()
}

func testDefaultToleranceForPositiveNanosecondsIsZero() throws {
XCTAssertEqual(
DispatchTimer.defaultTolerance(.nanoseconds(1)),
.nanoseconds(0)
)
XCTAssertEqual(
DispatchTimer.defaultTolerance(.nanoseconds(50_000_000)),
.nanoseconds(0)
)
}

func testDefaultToleranceForNonPositiveNanosecondsIsNever() throws {
XCTAssertEqual(
DispatchTimer.defaultTolerance(.nanoseconds(0)),
.never
)
XCTAssertEqual(
DispatchTimer.defaultTolerance(.nanoseconds(-1)),
.never
)
}

func testDefaultToleranceForNeverIsNever() throws {
XCTAssertEqual(
DispatchTimer.defaultTolerance(.never),
.never
)
}

static var allTests = [
("testNonRepeatingTimer", testNonRepeatingTimer),
("testRepeatingTimer", testRepeatingTimer),
("testFireAtTimer", testFireAtTimer),
("testInvalidateCancelsTimer", testInvalidateCancelsTimer),
("testFireAtInPastFiresImmediately", testFireAtInPastFiresImmediately),
(
"testDefaultToleranceForPositiveNanosecondsIsZero",
testDefaultToleranceForPositiveNanosecondsIsZero
),
(
"testDefaultToleranceForNonPositiveNanosecondsIsNever",
testDefaultToleranceForNonPositiveNanosecondsIsNever
),
("testDefaultToleranceForNeverIsNever", testDefaultToleranceForNeverIsNever),
]
}
Loading