Make Thread a readonly struct

dotnet · May 10, 2024 · 1ad1da3 · 1ad1da3
1 parent fa4f669
commit 1ad1da3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/native/managed/cdacreader/src/Contracts/Registry.cs b/src/native/managed/cdacreader/src/Contracts/Registry.cs
@@ -18,7 +18,7 @@ public Registry(Target target)
         _target = target;
     }
 
-    public Thread Thread => GetContract<Thread>();
+    public IThread Thread => GetContract<IThread>();
 
     private T GetContract<T>() where T : IContract
     {

diff --git a/src/native/managed/cdacreader/src/Contracts/Thread.cs b/src/native/managed/cdacreader/src/Contracts/Thread.cs
@@ -10,26 +10,28 @@ public record struct ThreadStoreData(
     int ThreadCount,
     TargetPointer FirstThread);
 
-internal class Thread : IContract
+internal interface IThread : IContract
 {
-    public static Thread NotImplemented = new Thread();
-
-    public static string Name { get; } = nameof(Thread);
-
-    public static IContract Create(Target target, int version)
+    static string IContract.Name { get; } = nameof(Thread);
+    static IContract IContract.Create(Target target, int version)
     {
         TargetPointer threadStore = target.ReadGlobalPointer(Constants.Globals.ThreadStore);
         return version switch
         {
             1 => new Thread_1(target, threadStore),
-            _ => NotImplemented,
+            _ => default(Thread),
         };
     }
 
     public virtual ThreadStoreData GetThreadStoreData() => throw new NotImplementedException();
 }
 
-internal sealed class Thread_1 : Thread
+internal readonly struct Thread : IThread
+{
+    // Everything throws NotImplementedException
+}
+
+internal readonly struct Thread_1 : IThread
 {
     private readonly Target _target;
     private readonly TargetPointer _threadStoreAddr;
@@ -40,7 +42,7 @@ internal Thread_1(Target target, TargetPointer threadStore)
         _threadStoreAddr = threadStore;
     }
 
-    public override ThreadStoreData GetThreadStoreData()
+    ThreadStoreData IThread.GetThreadStoreData()
     {
         Data.ThreadStore? threadStore;
         if (!_target.ProcessedData.TryGet(_threadStoreAddr.Value, out threadStore))

diff --git a/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs b/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs
@@ -111,7 +111,7 @@ public unsafe int GetThreadStoreData(DacpThreadStoreData* data)
     {
         try
         {
-            Contracts.Thread thread = _target.Contracts.Thread;
+            Contracts.IThread thread = _target.Contracts.Thread;
             Contracts.ThreadStoreData threadStoreData = thread.GetThreadStoreData();
             data->threadCount = threadStoreData.ThreadCount;
             data->firstThread = threadStoreData.FirstThread.Value;