Skip to content

perf: make methods synchronous and prevent closure creation #4269

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 9, 2026
Merged

perf: make methods synchronous and prevent closure creation #4269

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
54 changes: 36 additions & 18 deletions TUnit.Engine/Helpers/HookTimeoutHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using TUnit.Core;
using TUnit.Core.Hooks;
using TUnit.Core.Interfaces;
Expand All @@ -12,7 +13,7 @@ internal static class HookTimeoutHelper
/// <summary>
/// Creates a timeout-aware action wrapper for a hook
/// </summary>
public static Func<Task> CreateTimeoutHookAction<T>(
public static Task CreateTimeoutHookAction<T>(
StaticHookMethod<T> hook,
T context,
CancellationToken cancellationToken)
Expand All @@ -24,13 +25,20 @@ public static Func<Task> CreateTimeoutHookAction<T>(
if (timeout == null)
{
// No timeout specified, execute with potential custom executor
return async () => await ExecuteHookWithPotentialCustomExecutor(hook, context, cancellationToken);
return ExecuteHookWithPotentialCustomExecutor(hook, context, cancellationToken).AsTask();
}

return async () =>
var timeoutMs = (int)timeout.Value.TotalMilliseconds;

return CreateTimeoutHookActionAsync(hook, context, timeoutMs, cancellationToken);

static async Task CreateTimeoutHookActionAsync(
StaticHookMethod<T> hook,
T context,
int timeoutMs,
CancellationToken cancellationToken)
{
using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var timeoutMs = (int)timeout.Value.TotalMilliseconds;
cts.CancelAfter(timeoutMs);

try
Expand All @@ -41,7 +49,7 @@ public static Func<Task> CreateTimeoutHookAction<T>(
{
throw new TimeoutException($"Hook '{hook.Name}' exceeded timeout of {timeoutMs}ms");
}
};
}
}

/// <summary>
Expand All @@ -58,26 +66,34 @@ private static ValueTask ExecuteHookWithPotentialCustomExecutor<T>(StaticHookMet
// Determine which executor method to call based on hook type
if (hook is BeforeTestHookMethod || hook is InstanceHookMethod)
{
return customExecutor.ExecuteBeforeTestHook(
hook.MethodInfo,
testContext,
() => hook.Body!.Invoke(context, cancellationToken)
);
return ExecuteBeforeTestHook(hook, context, cancellationToken, customExecutor, testContext);
}
else if (hook is AfterTestHookMethod)
{
return customExecutor.ExecuteAfterTestHook(
hook.MethodInfo,
testContext,
() => hook.Body!.Invoke(context, cancellationToken)
);
return ExecuteAfterTestHook(hook, context, cancellationToken, customExecutor, testContext);
}
}

// No custom executor, use the hook's default executor
return hook.ExecuteAsync(context, cancellationToken);
}

private static ValueTask ExecuteBeforeTestHook<T>(StaticHookMethod<T> hook, [DisallowNull] T context,
CancellationToken cancellationToken, IHookExecutor customExecutor, TestContext testContext) =>
customExecutor.ExecuteBeforeTestHook(
hook.MethodInfo,
testContext,
() => hook.Body!.Invoke(context, cancellationToken)
);

private static ValueTask ExecuteAfterTestHook<T>(StaticHookMethod<T> hook, [DisallowNull] T context,
CancellationToken cancellationToken, IHookExecutor customExecutor, TestContext testContext) =>
customExecutor.ExecuteAfterTestHook(
hook.MethodInfo,
testContext,
() => hook.Body!.Invoke(context, cancellationToken)
);

/// <summary>
/// Creates a timeout-aware action wrapper for a hook delegate
/// </summary>
Expand All @@ -94,10 +110,11 @@ public static Func<Task> CreateTimeoutHookAction<T>(
return async () => await hookDelegate(context, cancellationToken);
}

var timeoutMs = (int)timeout.Value.TotalMilliseconds;

return async () =>
{
using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var timeoutMs = (int)timeout.Value.TotalMilliseconds;
cts.CancelAfter(timeoutMs);

try
Expand Down Expand Up @@ -129,10 +146,11 @@ public static Func<Task> CreateTimeoutHookAction<T>(
return async () => await hookDelegate(context, cancellationToken);
}

var timeoutMs = (int)timeout.Value.TotalMilliseconds;

return async () =>
{
using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var timeoutMs = (int)timeout.Value.TotalMilliseconds;
cts.CancelAfter(timeoutMs);

try
Expand All @@ -145,4 +163,4 @@ public static Func<Task> CreateTimeoutHookAction<T>(
}
};
}
}
}
73 changes: 24 additions & 49 deletions TUnit.Engine/Services/HookCollectionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,27 +704,20 @@ private async Task<Func<TestContext, CancellationToken, Task>> CreateStaticHookD
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
return (context, cancellationToken) => HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);
}

private static Func<ClassHookContext, CancellationToken, Task> CreateClassHookDelegate(StaticHookMethod<ClassHookContext> hook)
{
return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand All @@ -733,27 +726,23 @@ private async Task<Func<ClassHookContext, CancellationToken, Task>> CreateClassH
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

private static Func<AssemblyHookContext, CancellationToken, Task> CreateAssemblyHookDelegate(StaticHookMethod<AssemblyHookContext> hook)
{
return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand All @@ -762,27 +751,23 @@ private async Task<Func<AssemblyHookContext, CancellationToken, Task>> CreateAss
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

private static Func<TestSessionContext, CancellationToken, Task> CreateTestSessionHookDelegate(StaticHookMethod<TestSessionContext> hook)
{
return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand All @@ -791,27 +776,23 @@ private async Task<Func<TestSessionContext, CancellationToken, Task>> CreateTest
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

private static Func<BeforeTestDiscoveryContext, CancellationToken, Task> CreateBeforeTestDiscoveryHookDelegate(StaticHookMethod<BeforeTestDiscoveryContext> hook)
{
return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand All @@ -820,27 +801,23 @@ private async Task<Func<BeforeTestDiscoveryContext, CancellationToken, Task>> Cr
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

private static Func<TestDiscoveryContext, CancellationToken, Task> CreateTestDiscoveryHookDelegate(StaticHookMethod<TestDiscoveryContext> hook)
{
return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand All @@ -849,14 +826,12 @@ private async Task<Func<TestDiscoveryContext, CancellationToken, Task>> CreateTe
// Process hook registration event receivers
await ProcessHookRegistrationAsync(hook);

return async (context, cancellationToken) =>
return (context, cancellationToken) =>
{
var timeoutAction = HookTimeoutHelper.CreateTimeoutHookAction(
return HookTimeoutHelper.CreateTimeoutHookAction(
hook,
context,
cancellationToken);

await timeoutAction();
};
}

Expand Down
Loading