support filter

Author: Jim.Jiang

src/DotnetDumpMonitor/DotnetDumpMonitor.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="CliWrap" Version="3.6.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageReference Include="DataGridExtensions" Version="2.5.14" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>

src/DotnetDumpMonitor/MainWindow.xaml

@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
     xmlns:local="clr-namespace:DotnetDumpMonitor"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:DotnetDumpMonitor.ViewModels"
@@ -27,6 +28,13 @@
                 <Button
                     Height="25"
                     Margin="10,0,10,0"
+                    Command="{Binding ResetBaseCommand}"
+                    Content="Reset base"
+                    DockPanel.Dock="Right"
+                    IsEnabled="{Binding ProcessesLoaded}" />
+                <Button
+                    Height="25"
+                    Margin="10,0,0,0"
                     Command="{Binding SetCurrentAsBaseCommand}"
                     Content="Set current as base"
                     DockPanel.Dock="Right"
@@ -45,6 +53,7 @@
             </DockPanel>
             <DataGrid
                 Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Path=ActualHeight}"
+                dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 AutoGenerateColumns="False"
                 EnableRowVirtualization="True"
                 IsReadOnly="True"

src/DotnetDumpMonitor/ViewModels/MainWindowViewModel.cs

@@ -94,10 +94,8 @@ private async Task InitWindow()
         [RelayCommand]
         private async Task RefreshProcesses()
         {
-            _lastObjectDumpInfos = null;
-            _baseObjectDumpInfos = null;
+            Clean();
             SelectProcess = null;
-            DiffObjectDumpInfos.Clear();
             Processes.Clear();
             var cmd = await Cli.Wrap("dotnet-gcdump")
                 .WithArguments(args => args
@@ -126,6 +124,18 @@ private async Task SetCurrentAsBase()
             Log.Logger.Information("SetCurrentAsBase");
         }
 
+        [RelayCommand]
+        private async Task ResetBase()
+        {
+            _baseObjectDumpInfos = null;
+            if (SelectProcess == null)
+            {
+                return;
+            }
+            await RefreshObjectDumpInfos(SelectProcess);
+            Log.Logger.Information("SetCurrentAsBase");
+        }
+
         public async Task RefreshObjectDumpInfos(ProcessDumpInfo processDumpInfo)
         {
             List<string> lines = new();
@@ -141,7 +151,6 @@ public async Task RefreshObjectDumpInfos(ProcessDumpInfo processDumpInfo)
                  }))
                  .WithValidation(CommandResultValidation.None)
                  .ExecuteAsync();
-
             var objectDumpInfos = lines
                 //"      3,882,796  GC Heap bytes"
                 //"         48,015  GC Heap objects"
@@ -164,43 +173,33 @@ public async Task RefreshObjectDumpInfos(ProcessDumpInfo processDumpInfo)
                     return null;
                 })
                 .Where(x => x != null)
-                .Cast<ObjectDumpInfo>()
-                .Where(a => a.Lib.Contains("RoomsHost"));
+                .Cast<ObjectDumpInfo>();
+            //.Where(a => a.Lib.Contains("RoomsHost"));
 
 
             _lastObjectDumpInfos = objectDumpInfos;
 
-            if (_baseObjectDumpInfos == null)
-            {
-                _baseObjectDumpInfos = objectDumpInfos;
-            }
-            else
+            var diffObjectDumpInfos = await Task.Run(() =>
             {
-                var diffObjectDumpInfos = await Task.Run(() =>
+                List<ObjectDumpInfo> insideDiffObjectDumpInfos = new();
+                foreach (var objectDumpInfo in objectDumpInfos)
                 {
-                    List<ObjectDumpInfo> insideDiffObjectDumpInfos = new();
-                    foreach (var objectDumpInfo in objectDumpInfos)
+                    var lastObjectDumpInfo = _baseObjectDumpInfos?.FirstOrDefault(x => x.Lib == objectDumpInfo.Lib && x.Name == objectDumpInfo.Name);
+                    if (lastObjectDumpInfo == null || lastObjectDumpInfo.Count < objectDumpInfo.Count)
                     {
-                        var lastObjectDumpInfo = _baseObjectDumpInfos?.FirstOrDefault(x => x.Lib == objectDumpInfo.Lib && x.Name == objectDumpInfo.Name);
-                        if (lastObjectDumpInfo == null || lastObjectDumpInfo.Count < objectDumpInfo.Count)
-                        {
-                            if (objectDumpInfo.Count >= 1)
-                            {
-                                insideDiffObjectDumpInfos.Add(objectDumpInfo);
-                            }
-                        }
+                        insideDiffObjectDumpInfos.Add(objectDumpInfo);
                     }
-                    return insideDiffObjectDumpInfos;
-                });
-                DiffObjectDumpInfos.Clear();
-                if (!ProcessesLoaded)
-                {
-                    return;
-                }
-                foreach (var objectDumpInfo in diffObjectDumpInfos)
-                {
-                    DiffObjectDumpInfos.Add(objectDumpInfo);
                 }
+                return insideDiffObjectDumpInfos;
+            });
+            DiffObjectDumpInfos.Clear();
+            if (!ProcessesLoaded || processDumpInfo != SelectProcess)
+            {
+                return;
+            }
+            foreach (var objectDumpInfo in diffObjectDumpInfos)
+            {
+                DiffObjectDumpInfos.Add(objectDumpInfo);
             }
         }
 
@@ -211,7 +210,15 @@ async partial void OnSelectProcessChanged(ProcessDumpInfo? value)
             {
                 return;
             }
+            Clean();
             await RefreshObjectDumpInfos(value);
         }
+
+        private void Clean()
+        {
+            _lastObjectDumpInfos = null;
+            _baseObjectDumpInfos = null;
+            DiffObjectDumpInfos.Clear();
+        }
     }
 }