Merge testing/2.0 into master

.gitignore

@@ -13,6 +13,7 @@ artifacts/
 *.userosscache
 *.sln.docstates
 *.lock.json
+*.xml
 
 # Build results
 [Dd]ebug/

Microsoft.Diagnostics.Runtime.sln

@@ -9,6 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Runti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Runtime.UnitTests", "src\Microsoft.Diagnostics.Runtime.UnitTests\Microsoft.Diagnostics.Runtime.UnitTests.csproj", "{214A7EC8-4D32-4202-8D8B-1761743EE527}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Runtime.Utilities", "src\Microsoft.Diagnostics.Runtime.Utilities\Microsoft.Diagnostics.Runtime.Utilities.csproj", "{46E0ED79-1CAD-4876-919D-A736CE47A4F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParallelStressTest", "ParallelStressTest\ParallelStressTest.csproj", "{9440A1F6-BF51-48C0-A382-09AE99C0DC30}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +83,46 @@ Global
 		{214A7EC8-4D32-4202-8D8B-1761743EE527}.Release|x64.Build.0 = Release|Any CPU
 		{214A7EC8-4D32-4202-8D8B-1761743EE527}.Release|x86.ActiveCfg = Release|Any CPU
 		{214A7EC8-4D32-4202-8D8B-1761743EE527}.Release|x86.Build.0 = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|Win32.Build.0 = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|x64.Build.0 = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Win32.ActiveCfg = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|Win32.Build.0 = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|x64.ActiveCfg = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|x64.Build.0 = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{46E0ED79-1CAD-4876-919D-A736CE47A4F6}.Release|x86.Build.0 = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|Win32.Build.0 = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|x64.Build.0 = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Debug|x86.Build.0 = Debug|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Win32.ActiveCfg = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|Win32.Build.0 = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|x64.ActiveCfg = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|x64.Build.0 = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|x86.ActiveCfg = Release|Any CPU
+		{9440A1F6-BF51-48C0-A382-09AE99C0DC30}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ParallelStressTest/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

ParallelStressTest/ParallelStressTest.csproj

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9440A1F6-BF51-48C0-A382-09AE99C0DC30}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ParallelStressTest</RootNamespace>
+    <AssemblyName>ParallelStressTest</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\src\Microsoft.Diagnostics.Runtime\Microsoft.Diagnostics.Runtime.csproj">
+      <Project>{a82126ca-23aa-41f1-8586-a5938d44d0a7}</Project>
+      <Name>Microsoft.Diagnostics.Runtime</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

ParallelStressTest/Program.cs

@@ -0,0 +1,165 @@
+using Microsoft.Diagnostics.Runtime;
+using Microsoft.Diagnostics.Runtime.Implementation;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace ParallelStressTest
+{
+    static class Program
+    {
+        const bool BackgroundClear = true;
+        const int Iterations = int.MaxValue;
+        const int Threads = 8;
+        static readonly object _sync = new object();
+        private static ClrObject[] _expectedObjects;
+        private static ClrSegment[] _segments;
+        private static readonly ManualResetEvent _event = new ManualResetEvent(initialState: false);
+
+        private static volatile ClrRuntime _runtimeForClearing;
+
+        static void Main(string[] args)
+        {
+            if (args.Length != 1)
+            {
+                Console.WriteLine("Must specify a crash dump to inspect.");
+                Environment.Exit(1);
+            }
+
+            using DataTarget dt = DataTarget.LoadCrashDump(args[0]);
+            using (ClrRuntime runtime = dt.ClrVersions.Single().CreateRuntime())
+            {
+                _expectedObjects = runtime.Heap.EnumerateObjects().ToArray();
+                _segments = runtime.Heap.Segments.ToArray();
+            }
+
+            if (BackgroundClear)
+            {
+                Thread t = new Thread(ClearThreadProc);
+                t.Start();
+            }
+
+            TimeSpan elapsed = default;
+            for (int i = 0; i < Iterations; i++)
+            {
+                Console.Write($"\rIteration: {i + 1:n0} {elapsed}");
+
+                dt.DataReader.FlushCachedData();
+                using ClrRuntime runtime = dt.ClrVersions.Single().CreateRuntime();
+
+                lock (_sync)
+                    _runtimeForClearing = runtime;
+
+                Thread[] threads = new Thread[Threads];
+
+                for (int j = 0; j < Threads; j++)
+                    threads[j] = CreateAndStartThread(runtime);
+
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                _event.Set();
+
+                foreach (Thread thread in threads)
+                    thread.Join();
+
+                sw.Stop();
+                elapsed = sw.Elapsed;
+
+                lock (_sync)
+                    _runtimeForClearing = null;
+
+                _event.Reset();
+            }
+        }
+
+        private static void ClearThreadProc()
+        {
+            while (true)
+            {
+                lock (_sync)
+                {
+                    if (_runtimeForClearing != null)
+                        _runtimeForClearing.FlushCachedData();
+                }
+
+                Thread.Sleep(500);
+            }
+        }
+
+        private static Thread CreateAndStartThread(ClrRuntime runtime)
+        {
+            Thread t = new Thread(() => WorkerThread(runtime));
+            t.Start();
+
+            return t;
+        }
+
+        private static void WorkerThread(ClrRuntime runtime)
+        {
+            ClrmdHeap.LogHeapWalkSteps(32);
+
+            _event.WaitOne();
+
+            if (_segments.Length != runtime.Heap.Segments.Count)
+            {
+                Fail(false, $"Segment count mismatch.  Expected {_segments.Length} segments, found {runtime.Heap.Segments.Count}.");
+            }
+
+            for (int i = 0; i < _segments.Length; i++)
+                if (runtime.Heap.Segments[i].FirstObject != _segments[i].FirstObject || runtime.Heap.Segments[i].CommittedEnd != _segments[i].CommittedEnd)
+                    Fail(false, $"Segment[{i}] range [{runtime.Heap.Segments[i].FirstObject:x12}-{runtime.Heap.Segments[i].CommittedEnd:x12}], expected [{_segments[i].FirstObject:x12}-{_segments[i].CommittedEnd:x12}]");
+
+            int count = 0;
+            IEnumerator<ClrObject> enumerator = runtime.Heap.EnumerateObjects().GetEnumerator();
+            while (enumerator.MoveNext())
+            {
+                ClrObject curr = enumerator.Current;
+                if (curr.Address != _expectedObjects[count].Address)
+                    Fail(true, $"Object {count} was incorrect address: Expected {_expectedObjects[count].Address:x12}, got {curr.Address:x12}");
+
+                if (curr.Type != _expectedObjects[count].Type)
+                    Fail(true, $"Object {count} was incorrect type: Expected {_expectedObjects[count].Type.Name}, got {curr.Type?.Name ?? ""}");
+
+                count++;
+            }
+
+            if (count != _expectedObjects.Count())
+                Fail(true, $"Expected {_expectedObjects.Length:n0} objects, found {count:n0}.");
+        }
+
+        private static void Fail(bool printHeapSteps, string reason)
+        {
+            lock (_sync)
+            {
+                Console.WriteLine();
+                Console.WriteLine($"Thread {Thread.CurrentThread.ManagedThreadId:x}");
+                Console.WriteLine(reason);
+
+                if (printHeapSteps)
+                {
+                    int i = ClrmdHeap.Step;
+                    do
+                    {
+                        i = (i + 1) % ClrmdHeap.Steps.Count;
+                        HeapWalkStep step = ClrmdHeap.Steps[i];
+                        Console.WriteLine($"obj:{step.Address:x12} mt:{step.MethodTable:x12} base:{step.BaseSize:x8} comp:{step.ComponentSize:x8} count:{step.Count:x8}");
+                    } while (i != ClrmdHeap.Step);
+                }
+            }
+
+            Break();
+        }
+
+
+        private static void Break()
+        {
+            if (Debugger.IsAttached)
+                Debugger.Break();
+
+            while (!Debugger.IsAttached)
+                Thread.Sleep(1000);
+        }
+    }
+}

ParallelStressTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ParallelStressTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ParallelStressTest")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("9440a1f6-bf51-48c0-a382-09ae99c0dc30")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

eng/Versions.props

@@ -2,9 +2,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- This repo version -->
-    <VersionPrefix>1.1.0</VersionPrefix>
-    <PreReleaseVersionLabel>
-    </PreReleaseVersionLabel>
+    <VersionPrefix>2.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
   </PropertyGroup>
 </Project>

src/.editorconfig

@@ -282,3 +282,6 @@ dotnet_diagnostic.CA1717.severity = none
 
 # CA1060: Move pinvokes to native methods class
 dotnet_diagnostic.CA1060.severity = none
+
+# xUnit1004: Test methods should not be skipped
+dotnet_diagnostic.xUnit1004.severity = none

src/Microsoft.Diagnostics.Runtime.Native/src/Common/NativeRuntime.cs

@@ -23,9 +23,7 @@ public NativeHeap Heap
         {
             get
             {
-                if (_heap == null)
-                    _heap = new NativeHeap(this);
-
+                _heap ??= new NativeHeap(this);
                 return _heap;
             }
         }
@@ -38,15 +36,15 @@ public NativeRuntime(ModuleInfo module, DataTarget dt, DacLibrary lib)
             _dataReader = dt.DataReader;
             _modules = dt.EnumerateModules().ToArray();
 
-            if (SOSNative == null)
+            if (SOSNative is null)
                 throw new ClrDiagnosticsException("Unsupported dac version.", ClrDiagnosticsExceptionKind.DacError);
         }
 
         public IReadOnlyList<NativeThread> Threads
         {
             get
             {
-                if (_threads == null)
+                if (_threads is null)
                     InitThreads();
 
                 return _threads;
@@ -75,9 +73,9 @@ private void InitThreads()
 
             _threads = threads.ToArray();
         }
-        
+
         /*
-         
+
         internal unsafe IList<ClrRoot> EnumerateStackRoots(ClrThread thread)
         {
             int contextSize;