Skip to content
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

Implement singleton pattern for ComWrappers #675

Merged
merged 5 commits into from
Jan 19, 2021
Merged

Implement singleton pattern for ComWrappers #675

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c18732
implement singleton pattern for ComWrappers
j0shuams Jan 19, 2021
8c18a46
move singleton pattern to comwrapperssupport
j0shuams Jan 19, 2021
d3313d7
PR feedback
j0shuams Jan 19, 2021
461569c
PR Feedback 2
j0shuams Jan 19, 2021
00f2b7a
Merge branch 'master' into jlarkin/fix-invalid-op
j0shuams Jan 19, 2021
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
33 changes: 25 additions & 8 deletions src/WinRT.Runtime/ComWrappersSupport.net5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using WinRT.Interop;
using static System.Runtime.InteropServices.ComWrappers;
Expand All @@ -15,6 +12,20 @@ namespace WinRT
{
public static partial class ComWrappersSupport
{
// Instance field and property for Singleton pattern: ComWrappers `set` method should be idempotent
private static DefaultComWrappers _instance;
private static DefaultComWrappers DefaultComWrappersInstance
{
get
{
if (_instance == null)
{
_instance = new DefaultComWrappers();
}
return _instance;
}
}

internal static readonly ConditionalWeakTable<object, InspectableInfo> InspectableInfoTable = new ConditionalWeakTable<object, InspectableInfo>();
internal static readonly ThreadLocal<Type> CreateRCWType = new ThreadLocal<Type>();

Expand All @@ -30,8 +41,9 @@ private static ComWrappers ComWrappers
{
if (_comWrappers is null)
{
_comWrappers = new DefaultComWrappers();
ComWrappers.RegisterForTrackerSupport(_comWrappers);
var comWrappersToSet = DefaultComWrappersInstance;
ComWrappers.RegisterForTrackerSupport(comWrappersToSet);
_comWrappers = comWrappersToSet;
}
}
}
Expand All @@ -41,8 +53,13 @@ private static ComWrappers ComWrappers
{
lock (_comWrappersLock)
{
_comWrappers = value;
ComWrappers.RegisterForTrackerSupport(_comWrappers);
if (value == null && _comWrappers == DefaultComWrappersInstance)
{
return;
}
var comWrappersToSet = value ?? DefaultComWrappersInstance;
ComWrappers.RegisterForTrackerSupport(comWrappersToSet);
_comWrappers = comWrappersToSet;
}
}
}
Expand Down Expand Up @@ -152,7 +169,7 @@ private static T FindDelegate<T>(IntPtr thisPtr)
/// </remarks>
public static void InitializeComWrappers(ComWrappers wrappers = null)
{
ComWrappers = wrappers ?? new DefaultComWrappers();
ComWrappers = wrappers;
}

internal static Func<IInspectable, object> GetTypedRcwFactory(string runtimeClassName) => TypedObjectFactoryCache.GetOrAdd(runtimeClassName, className => CreateTypedRcwFactory(className));
Expand Down