Skip to content

Two phase cleanup for Listener Objects #6075

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
Santhosha-bk merged 3 commits into from
Jun 13, 2026
+36 −11
Merged

Two phase cleanup for Listener Objects #6075

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feee0c9
Two phase cleanup for Listener Objects
Santhosha-bk Jun 8, 2026
1675ba7
Addressing comments
Santhosha-bk Jun 11, 2026
d6c9d7e
Addressing comments
Santhosha-bk Jun 12, 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
6 changes: 0 additions & 6 deletions src/core/listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
#include "listener.c.clog.h"
#endif

_IRQL_requires_max_(PASSIVE_LEVEL)
void
QuicListenerStopAsync(
_In_ QUIC_LISTENER* Listener
);

BOOLEAN
QuicListenerIsOnWorker(
_In_ QUIC_LISTENER* Listener
Expand Down
9 changes: 9 additions & 0 deletions src/core/listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,12 @@ BOOLEAN
QuicListenerDrainOperations(
_In_ QUIC_LISTENER* Listener
);

//
// Stops the listener asynchronously.
//
_IRQL_requires_max_(PASSIVE_LEVEL)
void
QuicListenerStopAsync(
_In_ QUIC_LISTENER* Listener
);
31 changes: 26 additions & 5 deletions src/core/registration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,14 +395,35 @@ MsQuicRegistrationShutdown(
Entry = Entry->Flink;
}

CxPlatDispatchLockRelease(&Registration->ConnectionLock);
//
// Drain listeners under the registration lock into a local list while
// taking a non-zero cleanup reference on each one. Then stop them outside
Comment thread
Santhosha-bk marked this conversation as resolved.
Outdated
// the lock.
//
CXPLAT_LIST_ENTRY PendingListeners;
CxPlatListInitializeHead(&PendingListeners);

Entry = Registration->Listeners.Flink;
while (Entry != &Registration->Listeners) {
while (!CxPlatListIsEmpty(&Registration->Listeners)) {
Entry = CxPlatListRemoveHead(&Registration->Listeners);
QUIC_LISTENER* Listener =
CXPLAT_CONTAINING_RECORD(Entry, QUIC_LISTENER, RegistrationLink);
Entry = Entry->Flink;
MsQuicListenerStop((HQUIC)Listener);

if (CxPlatRefIncrementNonZero(&Listener->RefCount, 1)) {
CxPlatListInsertTail(&PendingListeners, &Listener->RegistrationLink);
}
}

CxPlatDispatchLockRelease(&Registration->ConnectionLock);

while (!CxPlatListIsEmpty(&PendingListeners)) {
QUIC_LISTENER* Listener =
CXPLAT_CONTAINING_RECORD(
CxPlatListRemoveHead(&PendingListeners),
QUIC_LISTENER,
RegistrationLink);

QuicListenerStopAsync(Listener);
QuicListenerRelease(Listener);
}
}

Expand Down
Loading