introduce "auto" options when picking CPU logic cores

celeron533 · Feb 3, 2024 · 107da13 · 107da13
1 parent 18d0b31
commit 107da13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/DicomGrep/MainWindow.xaml b/DicomGrep/MainWindow.xaml
@@ -110,6 +110,7 @@
                         <StackPanel Orientation="Horizontal">
                             <Label Content="Treads: "/>
                             <ComboBox ItemsSource="{Binding CPULogicCores}" SelectedValue="{Binding SearchThreads}" MinWidth="70"/>
+                            <Label Content="0=auto"/>
                         </StackPanel>
                     </StackPanel>
                 </StackPanel>

diff --git a/DicomGrep/Services/ConfigurationService.cs b/DicomGrep/Services/ConfigurationService.cs
@@ -87,7 +87,7 @@ private static Configuration DefaultConfiguration()
                 IncludeSubfolders = true,
                 MatchPattern = MatchPatternEnum.Normal,
                 SearchInResults = false,
-                SearchThreads = 1
+                SearchThreads = 0
             };
 
             return new Configuration

diff --git a/DicomGrep/ViewModels/MainViewModel.cs b/DicomGrep/ViewModels/MainViewModel.cs
@@ -130,10 +130,10 @@ public int SearchThreads
             set { SetProperty(ref _searchThreads, value); }
         }
 
-        public ObservableCollection<int> CPULogicCores { set; get; } = new ObservableCollection<int>();
-
         #endregion Search Criteria END
 
+        public ObservableCollection<int> CPULogicCores { set; get; } = new ObservableCollection<int>();
+
         private int _totalFileCount;
         public int TotalFileCount
         {
@@ -348,7 +348,8 @@ public MainViewModel()
 
         private IEnumerable<int> GetCPULogicCoresList()
         {
-            for (int i = 1; i <= Environment.ProcessorCount; i++)
+            // 0 means auto
+            for (int i = 0; i <= Environment.ProcessorCount; i++)
             {
                 yield return i;
             }

diff --git a/DicomGrepCore/Services/SearchService.cs b/DicomGrepCore/Services/SearchService.cs
@@ -70,7 +70,7 @@ public void Search(SearchCriteria criteria, CancellationTokenSource tokenSource)
 
             ParallelOptions options = new ParallelOptions
             {
-                MaxDegreeOfParallelism = criteria.SearchThreads,
+                MaxDegreeOfParallelism = criteria.SearchThreads <= 0 ? Environment.ProcessorCount : criteria.SearchThreads ,
                 CancellationToken = this.token
             };
             try