multithreaded filter readded

BRUNER Patrick · BRUNER Patrick · commit f047451c76b9 · 2026-03-02T14:52:45.000+01:00
diff --git a/src/LogExpert.Core/Classes/Filter/FilterStarter.cs b/src/LogExpert.Core/Classes/Filter/FilterStarter.cs
@@ -65,7 +65,7 @@ public FilterStarter (ColumnizerCallback callback, int minThreads)
 
     #region Public methods
 
-    public async void DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
+    public async Task DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
     {
         FilterResultLines.Clear();
         LastFilterLinesList.Clear();
@@ -85,8 +85,11 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou
         }
 
         var workStartLine = startLine;
+
         _progressLineCount = 0;
         _progressCallback = progressCallback;
+
+        var tasks = new List<Task>();
         while (workStartLine < startLine + maxCount)
         {
             if (workStartLine + interval > maxCount)
@@ -100,11 +103,14 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou
 
             _logger.Info(CultureInfo.InvariantCulture, "FilterStarter starts worker for line {0}, lineCount {1}", workStartLine, interval);
 
-            var filter = await Task.Run(() => DoWork(filterParams, workStartLine, interval, ThreadProgressCallback)).ConfigureAwait(false);
-            FilterDoneCallback(filter);
+            var capturedStartLine = workStartLine;
+            var capturedInterval = interval;
+
+            tasks.Add(Task.Run(() => DoWork(filterParams, capturedStartLine, capturedInterval, ThreadProgressCallback)));
             workStartLine += interval;
         }
 
+        await Task.WhenAll(tasks).ConfigureAwait(false);
         MergeResults();
     }
 
diff --git a/src/LogExpert.UI/Controls/LogWindow/LogWindow.cs b/src/LogExpert.UI/Controls/LogWindow/LogWindow.cs
@@ -1332,8 +1332,9 @@ private void OnSelectionChangedTriggerSignal (object sender, EventArgs e)
             {
                 if (IsMultiFile)
                 {
-                    MethodInvoker invoker = DisplayCurrentFileOnStatusline;
-                    _ = invoker.BeginInvoke(null, null);
+                    //MethodInvoker invoker = DisplayCurrentFileOnStatusline;
+                    _ = Task.Run(DisplayCurrentFileOnStatusline);   
+                    //_ = invoker.BeginInvoke(null, null);
                 }
                 else
                 {
@@ -2936,12 +2937,12 @@ private void LoadingFinished ()
     private void LogEventWorker ()
     {
         Thread.CurrentThread.Name = "LogEventWorker";
-        while (true)
+        while (!cts.Token.IsCancellationRequested)
         {
             //_logger.Debug($"Waiting for signal");
             _ = _logEventArgsEvent.WaitOne();
             //_logger.Debug($"Wakeup signal received.");
-            while (true)
+            while (!cts.Token.IsCancellationRequested)
             {
                 LogEventArgs e;
                 //var lastLineCount = 0;
@@ -2973,9 +2974,24 @@ private void LogEventWorker ()
                 //    }
                 //}
 
-                _ = Invoke(UpdateGrid, [e]);
-                CheckFilterAndHighlight(e);
-                _timeSpreadCalc.SetLineCount(e.LineCount);
+                if (IsDisposed || Disposing || _waitingForClose)
+                {
+                    return;
+                }
+                else
+                {
+                    try
+                    {
+                        _ = Invoke(UpdateGrid, [e]);
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                        return;
+                    }
+                    
+                    CheckFilterAndHighlight(e);
+                    _timeSpreadCalc.SetLineCount(e.LineCount);
+                }
             }
         }
     }
@@ -3132,8 +3148,7 @@ private void CheckFilterAndHighlight (LogEventArgs e)
                 var (suppressLed, stopTail, setBookmark, bookmarkComment) = GetHighlightActions(matchingList);
                 if (setBookmark)
                 {
-                    SetBookmarkFx fx = SetBookmarkFromTrigger;
-                    _ = fx.BeginInvoke(i, bookmarkComment, null, null);
+                    _ = Task.Run(() => SetBookmarkFromTrigger(i, bookmarkComment));
                 }
 
                 if (stopTail && _guiStateArgs.FollowTail)
@@ -3142,7 +3157,8 @@ private void CheckFilterAndHighlight (LogEventArgs e)
                     FollowTailChanged(false, true);
                     if (firstStopTail && wasFollow)
                     {
-                        _ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);
+                        //_ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);
+                        _ = Task.Run(() => SelectAndEnsureVisible(i, false));
                         firstStopTail = false;
                     }
                 }
@@ -3180,8 +3196,9 @@ private void CheckFilterAndHighlight (LogEventArgs e)
                     var (suppressLed, stopTail, setBookmark, bookmarkComment) = GetHighlightActions(matchingList);
                     if (setBookmark)
                     {
-                        SetBookmarkFx fx = SetBookmarkFromTrigger;
-                        _ = fx.BeginInvoke(i, bookmarkComment, null, null);
+                        //SetBookmarkFx fx = SetBookmarkFromTrigger;
+                        _ = Task.Run(() => SetBookmarkFromTrigger(i, bookmarkComment));
+                        //_ = fx.BeginInvoke(i, bookmarkComment, null, null);
                     }
 
                     if (stopTail && _guiStateArgs.FollowTail)
@@ -3190,7 +3207,8 @@ private void CheckFilterAndHighlight (LogEventArgs e)
                         FollowTailChanged(false, true);
                         if (firstStopTail && wasFollow)
                         {
-                            _ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);
+                            //_ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);
+                            _ = Task.Run(() => SelectAndEnsureVisible(i, false));
                             firstStopTail = false;
                         }
                     }
@@ -3223,8 +3241,9 @@ private void LaunchHighlightPlugins (IList<HighlightEntry> matchingList, int lin
                 var plugin = PluginRegistry.PluginRegistry.Instance.FindKeywordActionPluginByName(entry.ActionEntry.PluginName);
                 if (plugin != null)
                 {
-                    ActionPluginExecuteFx fx = plugin.Execute;
-                    _ = fx.BeginInvoke(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer, null, null);
+                    //ActionPluginExecuteFx fx = plugin.Execute;
+                    _ = Task.Run(() => plugin.Execute(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer));
+                    //_ = fx.BeginInvoke(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer, null, null);
                 }
             }
         }
@@ -4359,11 +4378,8 @@ private async void FilterSearch (string text)
 
         var settings = ConfigManager.Settings;
 
-        //FilterFx fx = settings.preferences.multiThreadFilter ? MultiThreadedFilter : new FilterFx(Filter);
         FilterFxAction = settings.Preferences.MultiThreadFilter ? MultiThreadedFilter : Filter;
-
-        //Task.Run(() => fx.Invoke(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));
-        var filterFxActionTask = Task.Run(() => Filter(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList)).ConfigureAwait(false);
+        var filterFxActionTask = Task.Run(() => FilterFxAction(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList)).ConfigureAwait(false);
 
         await filterFxActionTask;
         FilterComplete();
@@ -4388,7 +4404,7 @@ private void MultiThreadedFilter (FilterParams filterParams, List<int> filterRes
         OnRegisterCancelHandler(cancelHandler);
         long startTime = Environment.TickCount;
 
-        fs.DoFilter(filterParams, 0, _logFileReader.LineCount, FilterProgressCallback);
+        fs.DoFilter(filterParams, 0, _logFileReader.LineCount, FilterProgressCallback).GetAwaiter().GetResult();
 
         long endTime = Environment.TickCount;
 
@@ -6609,7 +6625,7 @@ public IList<HighlightMatchEntry> FindHighlightMatches (ITextValueMemory line)
                 GetHighlightEntryMatches(line, _currentHighlightGroup.HighlightEntryList, resultList);
             }
 
-            lock (_tempHighlightEntryList)
+            lock (_tempHighlightEntryListLock)
             {
                 GetHighlightEntryMatches(line, _tempHighlightEntryList, resultList);
             }
@@ -7751,8 +7767,9 @@ public void PatternStatisticSelectRange (PatternArgs patternArgs)
 
     public void PatternStatistic (PatternArgs patternArgs)
     {
-        var fx = new PatternStatisticFx(TestStatistic);
-        _ = fx.BeginInvoke(patternArgs, null, null);
+        //var fx = new PatternStatisticFx(TestStatistic);
+        _ = Task.Run(() => TestStatistic(patternArgs));
+        //_ = fx.BeginInvoke(patternArgs, null, null);
     }
 
     public void ExportBookmarkList ()

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public FilterStarter (ColumnizerCallback callback, int minThreads)`
`65`	`65`
`66`	`66`	`#region Public methods`
`67`	`67`
`68`		`- public async void DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)`
	`68`	`+ public async Task DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)`
`69`	`69`	`{`
`70`	`70`	`FilterResultLines.Clear();`
`71`	`71`	`LastFilterLinesList.Clear();`
`@@ -85,8 +85,11 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`var workStartLine = startLine;`
	`88`	`+`
`88`	`89`	`_progressLineCount = 0;`
`89`	`90`	`_progressCallback = progressCallback;`
	`91`	`+`
	`92`	`+ var tasks = new List<Task>();`
`90`	`93`	`while (workStartLine < startLine + maxCount)`
`91`	`94`	`{`
`92`	`95`	`if (workStartLine + interval > maxCount)`
`@@ -100,11 +103,14 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou`
`100`	`103`
`101`	`104`	`_logger.Info(CultureInfo.InvariantCulture, "FilterStarter starts worker for line {0}, lineCount {1}", workStartLine, interval);`
`102`	`105`
`103`		`- var filter = await Task.Run(() => DoWork(filterParams, workStartLine, interval, ThreadProgressCallback)).ConfigureAwait(false);`
`104`		`- FilterDoneCallback(filter);`
	`106`	`+ var capturedStartLine = workStartLine;`
	`107`	`+ var capturedInterval = interval;`
	`108`	`+`
	`109`	`+ tasks.Add(Task.Run(() => DoWork(filterParams, capturedStartLine, capturedInterval, ThreadProgressCallback)));`
`105`	`110`	`workStartLine += interval;`
`106`	`111`	`}`
`107`	`112`
	`113`	`+ await Task.WhenAll(tasks).ConfigureAwait(false);`
`108`	`114`	`MergeResults();`
`109`	`115`	`}`
`110`	`116`
Original file line number	Diff line number	Diff line change
`@@ -1332,8 +1332,9 @@ private void OnSelectionChangedTriggerSignal (object sender, EventArgs e)`
`1332`	`1332`	`{`
`1333`	`1333`	`if (IsMultiFile)`
`1334`	`1334`	`{`
`1335`		`- MethodInvoker invoker = DisplayCurrentFileOnStatusline;`
`1336`		`- _ = invoker.BeginInvoke(null, null);`
	`1335`	`+ //MethodInvoker invoker = DisplayCurrentFileOnStatusline;`
	`1336`	`+ _ = Task.Run(DisplayCurrentFileOnStatusline);`
	`1337`	`+ //_ = invoker.BeginInvoke(null, null);`
`1337`	`1338`	`}`
`1338`	`1339`	`else`
`1339`	`1340`	`{`
`@@ -2936,12 +2937,12 @@ private void LoadingFinished ()`
`2936`	`2937`	`private void LogEventWorker ()`
`2937`	`2938`	`{`
`2938`	`2939`	`Thread.CurrentThread.Name = "LogEventWorker";`
`2939`		`- while (true)`
	`2940`	`+ while (!cts.Token.IsCancellationRequested)`
`2940`	`2941`	`{`
`2941`	`2942`	`//_logger.Debug($"Waiting for signal");`
`2942`	`2943`	`_ = _logEventArgsEvent.WaitOne();`
`2943`	`2944`	`//_logger.Debug($"Wakeup signal received.");`
`2944`		`- while (true)`
	`2945`	`+ while (!cts.Token.IsCancellationRequested)`
`2945`	`2946`	`{`
`2946`	`2947`	`LogEventArgs e;`
`2947`	`2948`	`//var lastLineCount = 0;`
`@@ -2973,9 +2974,24 @@ private void LogEventWorker ()`
`2973`	`2974`	`// }`
`2974`	`2975`	`//}`
`2975`	`2976`
`2976`		`- _ = Invoke(UpdateGrid, [e]);`
`2977`		`- CheckFilterAndHighlight(e);`
`2978`		`- _timeSpreadCalc.SetLineCount(e.LineCount);`
	`2977`	`+ if (IsDisposed \|\| Disposing \|\| _waitingForClose)`
	`2978`	`+ {`
	`2979`	`+ return;`
	`2980`	`+ }`
	`2981`	`+ else`
	`2982`	`+ {`
	`2983`	`+ try`
	`2984`	`+ {`
	`2985`	`+ _ = Invoke(UpdateGrid, [e]);`
	`2986`	`+ }`
	`2987`	`+ catch (ObjectDisposedException)`
	`2988`	`+ {`
	`2989`	`+ return;`
	`2990`	`+ }`
	`2991`	`+`
	`2992`	`+ CheckFilterAndHighlight(e);`
	`2993`	`+ _timeSpreadCalc.SetLineCount(e.LineCount);`
	`2994`	`+ }`
`2979`	`2995`	`}`
`2980`	`2996`	`}`
`2981`	`2997`	`}`
`@@ -3132,8 +3148,7 @@ private void CheckFilterAndHighlight (LogEventArgs e)`
`3132`	`3148`	`var (suppressLed, stopTail, setBookmark, bookmarkComment) = GetHighlightActions(matchingList);`
`3133`	`3149`	`if (setBookmark)`
`3134`	`3150`	`{`
`3135`		`- SetBookmarkFx fx = SetBookmarkFromTrigger;`
`3136`		`- _ = fx.BeginInvoke(i, bookmarkComment, null, null);`
	`3151`	`+ _ = Task.Run(() => SetBookmarkFromTrigger(i, bookmarkComment));`
`3137`	`3152`	`}`
`3138`	`3153`
`3139`	`3154`	`if (stopTail && _guiStateArgs.FollowTail)`
`@@ -3142,7 +3157,8 @@ private void CheckFilterAndHighlight (LogEventArgs e)`
`3142`	`3157`	`FollowTailChanged(false, true);`
`3143`	`3158`	`if (firstStopTail && wasFollow)`
`3144`	`3159`	`{`
`3145`		`- _ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);`
	`3160`	`+ //_ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);`
	`3161`	`+ _ = Task.Run(() => SelectAndEnsureVisible(i, false));`
`3146`	`3162`	`firstStopTail = false;`
`3147`	`3163`	`}`
`3148`	`3164`	`}`
`@@ -3180,8 +3196,9 @@ private void CheckFilterAndHighlight (LogEventArgs e)`
`3180`	`3196`	`var (suppressLed, stopTail, setBookmark, bookmarkComment) = GetHighlightActions(matchingList);`
`3181`	`3197`	`if (setBookmark)`
`3182`	`3198`	`{`
`3183`		`- SetBookmarkFx fx = SetBookmarkFromTrigger;`
`3184`		`- _ = fx.BeginInvoke(i, bookmarkComment, null, null);`
	`3199`	`+ //SetBookmarkFx fx = SetBookmarkFromTrigger;`
	`3200`	`+ _ = Task.Run(() => SetBookmarkFromTrigger(i, bookmarkComment));`
	`3201`	`+ //_ = fx.BeginInvoke(i, bookmarkComment, null, null);`
`3185`	`3202`	`}`
`3186`	`3203`
`3187`	`3204`	`if (stopTail && _guiStateArgs.FollowTail)`
`@@ -3190,7 +3207,8 @@ private void CheckFilterAndHighlight (LogEventArgs e)`
`3190`	`3207`	`FollowTailChanged(false, true);`
`3191`	`3208`	`if (firstStopTail && wasFollow)`
`3192`	`3209`	`{`
`3193`		`- _ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);`
	`3210`	`+ //_ = Invoke(new SelectLineFx(SelectAndEnsureVisible), [i, false]);`
	`3211`	`+ _ = Task.Run(() => SelectAndEnsureVisible(i, false));`
`3194`	`3212`	`firstStopTail = false;`
`3195`	`3213`	`}`
`3196`	`3214`	`}`
`@@ -3223,8 +3241,9 @@ private void LaunchHighlightPlugins (IList<HighlightEntry> matchingList, int lin`
`3223`	`3241`	`var plugin = PluginRegistry.PluginRegistry.Instance.FindKeywordActionPluginByName(entry.ActionEntry.PluginName);`
`3224`	`3242`	`if (plugin != null)`
`3225`	`3243`	`{`
`3226`		`- ActionPluginExecuteFx fx = plugin.Execute;`
`3227`		`- _ = fx.BeginInvoke(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer, null, null);`
	`3244`	`+ //ActionPluginExecuteFx fx = plugin.Execute;`
	`3245`	`+ _ = Task.Run(() => plugin.Execute(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer));`
	`3246`	`+ //_ = fx.BeginInvoke(entry.SearchText, entry.ActionEntry.ActionParam, callback, CurrentColumnizer, null, null);`
`3228`	`3247`	`}`
`3229`	`3248`	`}`
`3230`	`3249`	`}`
`@@ -4359,11 +4378,8 @@ private async void FilterSearch (string text)`
`4359`	`4378`
`4360`	`4379`	`var settings = ConfigManager.Settings;`
`4361`	`4380`
`4362`		`- //FilterFx fx = settings.preferences.multiThreadFilter ? MultiThreadedFilter : new FilterFx(Filter);`
`4363`	`4381`	`FilterFxAction = settings.Preferences.MultiThreadFilter ? MultiThreadedFilter : Filter;`
`4364`		`-`
`4365`		`- //Task.Run(() => fx.Invoke(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));`
`4366`		`- var filterFxActionTask = Task.Run(() => Filter(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList)).ConfigureAwait(false);`
	`4382`	`+ var filterFxActionTask = Task.Run(() => FilterFxAction(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList)).ConfigureAwait(false);`
`4367`	`4383`
`4368`	`4384`	`await filterFxActionTask;`
`4369`	`4385`	`FilterComplete();`
`@@ -4388,7 +4404,7 @@ private void MultiThreadedFilter (FilterParams filterParams, List<int> filterRes`
`4388`	`4404`	`OnRegisterCancelHandler(cancelHandler);`
`4389`	`4405`	`long startTime = Environment.TickCount;`
`4390`	`4406`
`4391`		`- fs.DoFilter(filterParams, 0, _logFileReader.LineCount, FilterProgressCallback);`
	`4407`	`+ fs.DoFilter(filterParams, 0, _logFileReader.LineCount, FilterProgressCallback).GetAwaiter().GetResult();`
`4392`	`4408`
`4393`	`4409`	`long endTime = Environment.TickCount;`
`4394`	`4410`
`@@ -6609,7 +6625,7 @@ public IList<HighlightMatchEntry> FindHighlightMatches (ITextValueMemory line)`
`6609`	`6625`	`GetHighlightEntryMatches(line, _currentHighlightGroup.HighlightEntryList, resultList);`
`6610`	`6626`	`}`
`6611`	`6627`
`6612`		`- lock (_tempHighlightEntryList)`
	`6628`	`+ lock (_tempHighlightEntryListLock)`
`6613`	`6629`	`{`
`6614`	`6630`	`GetHighlightEntryMatches(line, _tempHighlightEntryList, resultList);`
`6615`	`6631`	`}`
`@@ -7751,8 +7767,9 @@ public void PatternStatisticSelectRange (PatternArgs patternArgs)`
`7751`	`7767`
`7752`	`7768`	`public void PatternStatistic (PatternArgs patternArgs)`
`7753`	`7769`	`{`
`7754`		`- var fx = new PatternStatisticFx(TestStatistic);`
`7755`		`- _ = fx.BeginInvoke(patternArgs, null, null);`
	`7770`	`+ //var fx = new PatternStatisticFx(TestStatistic);`
	`7771`	`+ _ = Task.Run(() => TestStatistic(patternArgs));`
	`7772`	`+ //_ = fx.BeginInvoke(patternArgs, null, null);`
`7756`	`7773`	`}`
`7757`	`7774`
`7758`	`7775`	`public void ExportBookmarkList ()`