Skip to content

perf: make methods synchronous and defer List creation #4366

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
thomhurst merged 1 commit into from
Jan 13, 2026
Merged

perf: make methods synchronous and defer List creation #4366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 28 additions & 23 deletions TUnit.Engine/Services/EventReceiverOrchestrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ internal sealed class EventReceiverOrchestrator : IDisposable
private ThreadSafeDictionary<string, Task> _firstTestInSessionTasks = new();

// Track remaining test counts for "last" events
private readonly ThreadSafeDictionary<string, Counter> _assemblyTestCounts = new();
private readonly ThreadSafeDictionary<Type, Counter> _classTestCounts = new();
private readonly ConcurrentDictionary<string, Counter> _assemblyTestCounts = new();
private readonly ConcurrentDictionary<Type, Counter> _classTestCounts = new();
private int _sessionTestCount;

// Track which objects have already been initialized to avoid duplicates
Expand Down Expand Up @@ -79,15 +79,15 @@ obj is IFirstTestInAssemblyEventReceiver ||

// Fast-path checks with inlining
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask InvokeTestStartEventReceiversAsync(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage = null)
public ValueTask InvokeTestStartEventReceiversAsync(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage = null)
{
// Fast path - no allocation if no receivers
if (!_registry.HasTestStartReceivers())
{
return;
return ValueTask.CompletedTask;
}

await InvokeTestStartEventReceiversCore(context, cancellationToken, stage);
return InvokeTestStartEventReceiversCore(context, cancellationToken, stage);
}

private async ValueTask InvokeTestStartEventReceiversCore(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage)
Expand Down Expand Up @@ -127,17 +127,17 @@ private async ValueTask InvokeTestStartEventReceiversCore(TestContext context, C
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask<List<Exception>> InvokeTestEndEventReceiversAsync(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage = null)
public ValueTask<IReadOnlyList<Exception>> InvokeTestEndEventReceiversAsync(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage = null)
{
if (!_registry.HasTestEndReceivers())
{
return [];
return new ValueTask<IReadOnlyList<Exception>>([]);
}

return await InvokeTestEndEventReceiversCore(context, cancellationToken, stage);
return InvokeTestEndEventReceiversCore(context, cancellationToken, stage);
}

private async ValueTask<List<Exception>> InvokeTestEndEventReceiversCore(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage)
private async ValueTask<IReadOnlyList<Exception>> InvokeTestEndEventReceiversCore(TestContext context, CancellationToken cancellationToken, EventReceiverStage? stage)
{
// Defer exception list allocation until actually needed
List<Exception>? exceptions = null;
Expand Down Expand Up @@ -211,18 +211,18 @@ private async ValueTask<List<Exception>> InvokeTestEndEventReceiversCore(TestCon
}
#endif

return exceptions ?? [];
return exceptions == null ? Array.Empty<Exception>() : exceptions;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask InvokeTestSkippedEventReceiversAsync(TestContext context, CancellationToken cancellationToken)
public ValueTask InvokeTestSkippedEventReceiversAsync(TestContext context, CancellationToken cancellationToken)
{
if (!_registry.HasTestSkippedReceivers())
{
return;
return ValueTask.CompletedTask;
}

await InvokeTestSkippedEventReceiversCore(context, cancellationToken);
return InvokeTestSkippedEventReceiversCore(context, cancellationToken);
}

private async ValueTask InvokeTestSkippedEventReceiversCore(TestContext context, CancellationToken cancellationToken)
Expand Down Expand Up @@ -272,7 +272,6 @@ public async ValueTask InvokeHookRegistrationEventReceiversAsync(HookRegisteredC
}
}


// First/Last event methods with fast-path checks
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public ValueTask InvokeFirstTestInSessionEventReceiversAsync(
Expand Down Expand Up @@ -365,20 +364,22 @@ private async Task InvokeFirstTestInClassEventReceiversCoreAsync(

// Last event methods
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask InvokeLastTestInSessionEventReceiversAsync(
public ValueTask InvokeLastTestInSessionEventReceiversAsync(
TestContext context,
TestSessionContext sessionContext,
CancellationToken cancellationToken)
{
if (!_registry.HasLastTestInSessionReceivers())
{
return;
return ValueTask.CompletedTask;
}

if (Interlocked.Decrement(ref _sessionTestCount) == 0)
{
await InvokeLastTestInSessionEventReceiversCore(context, sessionContext, cancellationToken);
return InvokeLastTestInSessionEventReceiversCore(context, sessionContext, cancellationToken);
}

return ValueTask.CompletedTask;
}

private async ValueTask InvokeLastTestInSessionEventReceiversCore(
Expand All @@ -402,14 +403,14 @@ private async ValueTask InvokeLastTestInSessionEventReceiversCore(
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask InvokeLastTestInAssemblyEventReceiversAsync(
public ValueTask InvokeLastTestInAssemblyEventReceiversAsync(
TestContext context,
AssemblyHookContext assemblyContext,
CancellationToken cancellationToken)
{
if (!_registry.HasLastTestInAssemblyReceivers())
{
return;
return ValueTask.CompletedTask;
}

var assemblyName = assemblyContext.Assembly.GetName().FullName ?? "";
Expand All @@ -418,8 +419,10 @@ public async ValueTask InvokeLastTestInAssemblyEventReceiversAsync(

if (assemblyCount == 0)
{
await InvokeLastTestInAssemblyEventReceiversCore(context, assemblyContext, cancellationToken);
return InvokeLastTestInAssemblyEventReceiversCore(context, assemblyContext, cancellationToken);
}

return ValueTask.CompletedTask;
}

private async ValueTask InvokeLastTestInAssemblyEventReceiversCore(
Expand All @@ -443,14 +446,14 @@ private async ValueTask InvokeLastTestInAssemblyEventReceiversCore(
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public async ValueTask InvokeLastTestInClassEventReceiversAsync(
public ValueTask InvokeLastTestInClassEventReceiversAsync(
TestContext context,
ClassHookContext classContext,
CancellationToken cancellationToken)
{
if (!_registry.HasLastTestInClassReceivers())
{
return;
return ValueTask.CompletedTask;
}

var classType = classContext.ClassType;
Expand All @@ -459,8 +462,10 @@ public async ValueTask InvokeLastTestInClassEventReceiversAsync(

if (classCount == 0)
{
await InvokeLastTestInClassEventReceiversCore(context, classContext, cancellationToken);
return InvokeLastTestInClassEventReceiversCore(context, classContext, cancellationToken);
}

return ValueTask.CompletedTask;
}

private async ValueTask InvokeLastTestInClassEventReceiversCore(
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine/Services/HookExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public async ValueTask ExecuteBeforeTestHooksAsync(AbstractExecutableTest test,
}
}

public async ValueTask<List<Exception>> ExecuteAfterTestHooksAsync(AbstractExecutableTest test, CancellationToken cancellationToken)
public async ValueTask<IReadOnlyList<Exception>> ExecuteAfterTestHooksAsync(AbstractExecutableTest test, CancellationToken cancellationToken)
{
// Defer exception list allocation until actually needed
List<Exception>? exceptions = null;
Expand Down Expand Up @@ -338,7 +338,7 @@ public async ValueTask<List<Exception>> ExecuteAfterTestHooksAsync(AbstractExecu
}
}

return exceptions ?? [];
return exceptions == null ? Array.Empty<Exception>() : exceptions;
}

public async ValueTask ExecuteBeforeTestDiscoveryHooksAsync(CancellationToken cancellationToken)
Expand Down
Loading