Skip to content

[release/8.0] Improve perf of ActivatorUtilities.CreateInstance() #91881

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
carlossanlop merged 9 commits into from
Sep 11, 2023
Merged

[release/8.0] Improve perf of ActivatorUtilities.CreateInstance() #91881

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a761b06
Improve perf of ActivatorUtilities.CreateInstance()
steveharter Aug 29, 2023
e3f67c7
Support MetadataUpdateHandler for hot reload
steveharter Aug 30, 2023
62a573d
Support unloadable assembly contexts
steveharter Aug 31, 2023
6d5f666
Add tests
steveharter Sep 1, 2023
814b3c9
Rename new test classes
steveharter Sep 1, 2023
f9673be
Remove Mono from test; remove cache for NetFramework; remove use of C…
steveharter Sep 5, 2023
91815d1
Misc naming etc; non-functional
steveharter Sep 6, 2023
c85ea34
Update some comments
steveharter Sep 7, 2023
94f794b
Simplify use of ConditionalWeakTable.Add
steveharter Sep 11, 2023
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
Prev Previous commit
Simplify use of ConditionalWeakTable.Add
  • Loading branch information
@steveharter
steveharter authored and github-actions committed Sep 11, 2023
commit 94f794b87e8e95fb166af88a2abb2e2c9096c8b4
23 changes: 4 additions & 19 deletions ...libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,25 +183,10 @@ private static ConstructorInfoEx[] GetOrAddConstructors(

value = CreateConstructorInfoExs(type);

#if NET7_0_OR_GREATER
// ConditionalWeakTable doesn't support GetOrAdd(), so use TryAdd().
if (s_collectibleConstructorInfos.Value.TryAdd(type, value))
{
return value;
}
#else
try
{
s_collectibleConstructorInfos.Value.Add(type, value);
return value;
}
catch (ArgumentException) { }
#endif

// Use the instance from another thread that just added the same type.
bool success = s_collectibleConstructorInfos.Value.TryGetValue(type, out value);
Debug.Assert(success);
return value!;
// ConditionalWeakTable doesn't support GetOrAdd() so use AddOrUpdate(). This means threads
// can have different instances for the same type, but that is OK since they are equivalent.
s_collectibleConstructorInfos.Value.AddOrUpdate(type, value);
return value;
}
#endif // NETCOREAPP

Expand Down