version 1.4

-----------------------------------------
- add dcd (Dump concurrent dictionary) command
- fix deprecated symbols
- use netstandard DynaMD version and 1.0 version of ClrMD
- fix miscellaneous issues in DML

Author: Christophe Nasarre

src/ClrMDStudio/Analyzers/HeapAnalyzer.cs

@@ -132,7 +132,7 @@ public void Run(string args)
             {
                 ClrMDHelper helper = new ClrMDHelper(_host.Session.Clr);
                 var clr = _host.Session.Clr;
-                var heap = clr.GetHeap();
+                var heap = clr.Heap;
 
                 //var segments = heap.Segments;
                 //var segmentsInfo = new List<SegmentInfo>(segments.Count);

src/ClrMDStudio/Analyzers/ThreadAnalyzer.cs

@@ -28,7 +28,7 @@ public void Run(string args)
             try
             {
                 var clr = _host.Session.Clr;
-                var threadPool = clr.GetThreadPool();
+                var threadPool = clr.ThreadPool;
                 _host.WriteLine(string.Format(
                     "ThreadPool: {0} threads (#idle = {1} + #running = {2} | #dead = {3} | #max = {4})",
                     threadPool.TotalThreads.ToString(),

src/ClrMDStudio/Analyzers/ThreadPoolAnalyzer.cs

@@ -148,7 +148,7 @@ public void Run(string args)
                         _host.WriteLine(string.Format(" {0,4}\r\n", _workItemCount.ToString()));
                     }
 
-                    var threadPool = _host.Session.Clr.GetThreadPool();
+                    var threadPool = _host.Session.Clr.ThreadPool;
                     _host.WriteLine(string.Format(
                         "\r\nCPU = {0}% for {1} threads (#idle = {2} + #running = {3} | #dead = {4} | #max = {5})",
                         threadPool.CpuUtilization.ToString(),
@@ -297,7 +297,7 @@ private string GetCallStackInfo(ClrMDHelper helper, ClrThread thread)
                 string shortTypeName = "";
                 if (bi.ObjRef != 0)
                 {
-                    ClrType type = _host.Session.Clr.GetHeap().GetObjectType(bi.ObjRef);
+                    ClrType type = _host.Session.Clr.Heap.GetObjectType(bi.ObjRef);
                     if (type != null)
                     {
                         string typeName = type.Name;
@@ -386,7 +386,7 @@ public void RunDone()
             //
             try
             {
-                var heap = _host.Session.Clr.GetHeap();
+                var heap = _host.Session.Clr.Heap;
                 var clr = _host.Session.Clr;
 
                 _host.WriteLine("global work item queue________________________________");
@@ -487,7 +487,7 @@ public void RunDone()
                         _host.WriteLine(string.Format(" {0,4}\r\n", _workItemCount.ToString()));
                     }
 
-                    var threadPool = _host.Session.Clr.GetThreadPool();
+                    var threadPool = _host.Session.Clr.ThreadPool;
                     _host.WriteLine(string.Format(
                         "\r\nCPU = {0}% for {1} threads (#idle = {2} + #running = {3} | #dead = {4} | #max = {5})",
                         threadPool.CpuUtilization.ToString(),
@@ -639,7 +639,7 @@ public void RunWithAPI()
 
             try
             {
-                var threadPool = _host.Session.Clr.GetThreadPool();
+                var threadPool = _host.Session.Clr.ThreadPool;
 
                 foreach (var work in threadPool.EnumerateManagedWorkItems())
                 {
@@ -747,7 +747,7 @@ public void RunOriginal()
 
 
                 // provide a summary sorted by count
-                var threadPool = _host.Session.Clr.GetThreadPool();
+                var threadPool = _host.Session.Clr.ThreadPool;
                 _host.WriteLine(string.Format(
                     "CPU = {0}% for {1} threads (#idle = {2} + #running = {3} | #dead = {4} | #max = {5})",
                     threadPool.CpuUtilization.ToString(),
@@ -781,16 +781,7 @@ public void RunOriginal()
         private string GetFrameInformation(ClrThread thread, ClrStackFrame frame, ClrStackFrame firstFrame)
         {
             // get the method call from the given frame
-            string info = "";
-            var sourceLocation = frame.GetFileAndLineNumber();
-            if (sourceLocation == null)
-            {
-                info = frame.DisplayString;
-            }
-            else  // it seems that GetFileAndLineNumber() does not work --> need to figure out what is the other ClrMD API to dig into the symbols
-            {
-                info = frame.DisplayString + "[" + sourceLocation.FilePath + ", Line " + sourceLocation.LineNumber.ToString() + "]";
-            }
+            string info = frame.DisplayString;
 
             // look for locking information
             if (firstFrame.Method.Name.Contains("Wait") || (firstFrame.Method.Name == "Enter") && (firstFrame.Method.Type.Name == "System.Threading.Monitor"))

src/ClrMDStudio/ClrMDHelper.cs

@@ -197,7 +197,7 @@ public ClrMDHelper(ClrRuntime clr)
                 throw new ArgumentNullException("clr");
 
             _clr = clr;
-            _heap = clr.GetHeap();
+            _heap = clr.Heap;
 
             _eventTypes = new HashSet<string>();
             _eventTypes.Add("System.Threading.Mutex");

src/ClrMDStudio/ClrMDStudio.csproj

@@ -81,19 +81,20 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DynaMD, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynaMD.1.0.2-pre\lib\net452\DynaMD.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\DynaMD.1.0.7.1\lib\net452\DynaMD.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Diagnostics.Runtime, Version=0.8.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Diagnostics.Runtime.0.8.31-beta\lib\net40\Microsoft.Diagnostics.Runtime.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Diagnostics.Runtime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Runtime.1.0.0\lib\net45\Microsoft.Diagnostics.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="ParallelExtensionsExtras, Version=1.2.3.0, Culture=neutral, PublicKeyToken=665f4d61f853b5a9, processorArchitecture=MSIL">
       <HintPath>..\packages\ParallelExtensionsExtras.1.2.0.0\lib\net40\ParallelExtensionsExtras.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>

src/ClrMDStudio/DebuggingSession.cs

@@ -23,7 +23,7 @@ public ClrHeap ManagedHeap
                     if (Clr == null)
                         throw new InvalidOperationException("First open a Clr/Target to get a ManagedHeap");
 
-                    _managedHeap = Clr.GetHeap();
+                    _managedHeap = Clr.Heap;
                 }
                 return _managedHeap;
             }
@@ -102,7 +102,7 @@ public bool Open(string dumpFilename)
             else
             {
                 // special case for mini dumps
-                if (Clr.GetThreadPool() == null)
+                if (Clr.ThreadPool == null)
                 {
                     throw new InvalidOperationException("Impossible to get CLR information: might be a mini-dump...");
                 }

src/ClrMDStudio/packages.config

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DynaMD" version="1.0.2-pre" targetFramework="net461" />
-  <package id="Microsoft.Diagnostics.Runtime" version="0.8.31-beta" targetFramework="net461" />
+  <package id="DynaMD" version="1.0.7.1" targetFramework="net461" />
+  <package id="Microsoft.Diagnostics.Runtime" version="1.0.0" targetFramework="net461" />
   <package id="ParallelExtensionsExtras" version="1.2.0.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
 </packages>

src/gsose/Common.cs

@@ -22,21 +22,33 @@ static DebuggerExtensions()
             AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
         }
 
-        static readonly string ClrMD = "Microsoft.Diagnostics.Runtime";
+        static readonly string[] _dependencies = new string[]
+        {
+            "Microsoft.Diagnostics.Runtime",
+            "DynaMD",
+            "System.Runtime.CompilerServices.Unsafe",
+            "System.ValueTuple",
+        };
+
         private static Assembly ResolveAssembly(object sender, ResolveEventArgs args)
         {
-            if (args.Name.Contains(ClrMD))
+            var dependency = _dependencies.FirstOrDefault((name) => args.Name.Contains(name));
+            if (dependency != null)
             {
+                Console.Write($"Loading {dependency}...");
+
                 string codebase = Assembly.GetExecutingAssembly().CodeBase;
 
                 if (codebase.StartsWith("file://"))
                     codebase = codebase.Substring(8).Replace('/', '\\');
 
                 string directory = Path.GetDirectoryName(codebase);
-                string path = Path.Combine(directory, ClrMD) + ".dll";
+                string path = Path.Combine(directory, dependency) + ".dll";
+                Console.WriteLine($" from {path}");
                 return Assembly.LoadFile(path);
             }
 
+            Console.WriteLine($"Unknown gsose reference: {args.Name}");
             return null;
         }
 

src/gsose/ConcurrentDictionary.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Diagnostics.Runtime;
+using RGiesecke.DllExport;
+
+namespace gsose
+{
+    public partial class DebuggerExtensions
+    {
+        [DllExport("dcd")]
+        public static void dcd(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            OnDumpConcurrentDictionary(client, args);
+        }
+
+        [DllExport("DumpConcurrentDictionary")]
+        public static void DumpConcurrentDictionary(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            OnDumpConcurrentDictionary(client, args);
+        }
+
+        public static void OnDumpConcurrentDictionary(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            // Must be the first thing in our extension.
+            if (!InitApi(client))
+                return;
+
+            // parse the command argument
+            if (args.StartsWith("0x"))
+            {
+                // remove "0x" for parsing
+                args = args.Substring(2).TrimStart('0');
+            }
+
+            // remove the leading 0000 that WinDBG often add in 64 bit
+            args = args.TrimStart('0');
+
+            if (!ulong.TryParse(args, System.Globalization.NumberStyles.HexNumber,
+                System.Globalization.CultureInfo.InvariantCulture, out var address))
+            {
+                Console.WriteLine("numeric address value expected");
+                return;
+            }
+
+            ShowConcurrentDictionary(address);
+        }
+
+        private static void ShowConcurrentDictionary(ulong address)
+        {
+            var heap = Runtime.Heap;
+            ClrType t = heap.GetObjectType(address);
+            if (t == null)
+            {
+                Console.WriteLine("this is not a heap object");
+                return;
+            }
+
+            try
+            {
+                var cd = heap.GetProxy(address);
+                var buckets = cd.m_tables.m_buckets;
+                Console.WriteLine($"{buckets.Length} buckets");
+
+                foreach (var bucket in buckets)
+                {
+                    if (bucket == null) continue;
+
+                    var key = (int)bucket.m_key;
+                    var addr = (ulong)bucket.m_value;
+                    var value = heap.GetObjectType(addr).GetValue(addr);
+
+                    Console.WriteLine($"{key} = {value}");
+                }
+            }
+            catch (NullReferenceException)
+            {
+                Console.WriteLine("this is not a concurrent dictionary");
+            }
+        }
+    }
+}

src/gsose/ConcurrentQueue.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Diagnostics.Runtime;
+using RGiesecke.DllExport;
+
+namespace gsose
+{
+    public partial class DebuggerExtensions
+    {
+        [DllExport("dcq")]
+        public static void dcq(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            OnDumpConcurrentQueue(client, args);
+        }
+
+        [DllExport("DumpConcurrentQueue")]
+        public static void DumpConcurrentQueue(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            OnDumpConcurrentQueue(client, args);
+        }
+
+        public static void OnDumpConcurrentQueue(IntPtr client, [MarshalAs(UnmanagedType.LPStr)] string args)
+        {
+            // Must be the first thing in our extension.
+            if (!InitApi(client))
+                return;
+
+            // parse the command argument
+            if (args.StartsWith("0x"))
+            {
+                // remove "0x" for parsing
+                args = args.Substring(2).TrimStart('0');
+            }
+
+            // remove the leading 0000 that WinDBG often add in 64 bit
+            args = args.TrimStart('0');
+
+            if (!ulong.TryParse(args, System.Globalization.NumberStyles.HexNumber,
+                System.Globalization.CultureInfo.InvariantCulture, out var address))
+            {
+                Console.WriteLine("numeric address value expected");
+                return;
+            }
+
+            ShowConcurrentQueue(address);
+        }
+
+        private static void ShowConcurrentQueue(ulong address)
+        {
+            var heap = Runtime.Heap;
+            ClrType t = heap.GetObjectType(address);
+            if (t == null)
+            {
+                Console.WriteLine("this is not a heap object");
+                return;
+            }
+
+            try
+            {
+                var cq = heap.GetProxy(address);
+                var head = cq.m_head;
+
+                // TODO: implement concurrent queue dump
+                Console.WriteLine("Not yet implemented...");
+            }
+            catch (NullReferenceException)
+            {
+                Console.WriteLine("this is not a concurrent dictionary");
+            }
+        }
+    }
+}