Skip to content

test: make sure the late-burst port test reaches its fifth lsof call #16155

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

Open
austinywang wants to merge 3 commits into
base: main
Choose a base branch
from
Open

test: make sure the late-burst port test reaches its fifth lsof call #16155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c74b43
test: make sure the late-burst port test reaches its fifth lsof call
austinywang Sep 30, 2026
c12f389
Merge main (96914e73277) into 15488-portscanner-late-kick
austinywang Sep 30, 2026
112e9a3
Merge main (6171d8cca49) into 15488-portscanner-late-kick
austinywang Sep 30, 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
34 changes: 16 additions & 18 deletions cmuxTests/PortScannerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,9 +1117,12 @@ struct PortScannerPortRetirementTests {
// The fixture stops and kicks from inside the fifth port lookup, after
// that lookup reports the port, so the stop is tied to the scan itself
// rather than to when this task happens to observe it.
processTable.stopListening(afterListenerLookup: 5) {
processTable.perform(atListenerLookup: 5, stopsListening: true) {
scanner.kick(workspaceId: workspaceId, panelId: panelId)
}
// Burst timers that fire during a slow scan merge, so a loaded host could pay off the first kick
// before a fifth port lookup. A kick from inside the second lookup owes the third through fifth scans.
processTable.perform(atListenerLookup: 2) { scanner.kick(workspaceId: workspaceId, panelId: panelId) }
scanner.kick(workspaceId: workspaceId, panelId: panelId)

let didPublishListeningPort = await Self.waitForPublication(
Expand All @@ -1142,7 +1145,8 @@ struct PortScannerPortRetirementTests {
pollInterval: .milliseconds(10)
)

#expect(didRetirePort, "a late-burst kick did not schedule enough complete misses")
let lookups = processTable.listenerLookups
#expect(didRetirePort, "a late-burst kick did not schedule enough complete misses (\(lookups) port lookups)")
}

/// The process table accepts a full device path, but reports the matching
Expand Down Expand Up @@ -1243,7 +1247,7 @@ private final class PortLifecycleProcessTable: PortProcessTableReading, @uncheck
var isListening = true
var portScanCount = 0
var listenerLookupCount = 0
var scheduledStop: (lookup: Int, action: @Sendable () -> Void)?
var scheduledActions: [Int: (stopsListening: Bool, action: @Sendable () -> Void)] = [:]
}

private let ttyName: String
Expand Down Expand Up @@ -1278,28 +1282,22 @@ private final class PortLifecycleProcessTable: PortProcessTableReading, @uncheck
guard Int(queryPID) == pid else { return (false, nil) }
current.listenerLookupCount += 1
let reportsPort = current.isListening
var action: (@Sendable () -> Void)?
if let stop = current.scheduledStop, stop.lookup == current.listenerLookupCount {
current.scheduledStop = nil
current.isListening = false
action = stop.action
}
return (reportsPort, action)
let scheduled = current.scheduledActions.removeValue(forKey: current.listenerLookupCount)
if scheduled?.stopsListening == true { current.isListening = false }
return (reportsPort, scheduled?.action)
}
stopAction?()
return .ports(reportsPort ? [port] : [])
}

/// Stops listening inside the `target`th lookup of the listener's ports,
/// after that lookup has reported the port, then runs `action` while the
/// scan is still in flight. Must be armed before that lookup happens.
func stopListening(
afterListenerLookup target: Int,
then action: @escaping @Sendable () -> Void
) {
state.withLock { $0.scheduledStop = (target, action) }
/// Runs `action` inside the `target`th lookup of the listener's ports, after that lookup has
/// decided what it reports; with `stopsListening`, later lookups report no port. Arm it first.
func perform(atListenerLookup target: Int, stopsListening: Bool = false, _ action: @escaping @Sendable () -> Void) {
state.withLock { $0.scheduledActions[target] = (stopsListening, action) }
}

var listenerLookups: Int { state.withLock { $0.listenerLookupCount } }

func waitForPortScan(_ target: Int, timeout: Duration = .seconds(15)) async -> Bool {
let deadline = ContinuousClock.now + timeout
while state.withLock({ $0.portScanCount }) < target, ContinuousClock.now < deadline {
Expand Down
Loading