Possible fix for #211 - total freeze of Visual Studio

Author: VioletGiraffe

CPPCheckPlugin/AtomicBool.cs

@@ -0,0 +1,33 @@
+using System.Runtime.CompilerServices;
+
+namespace VSPackage.CPPCheckPlugin
+{
+	public class AtomicBool
+	{
+		public AtomicBool()
+		{
+		}
+
+		[MethodImpl(MethodImplOptions.Synchronized)]
+		public AtomicBool(bool value)
+		{
+			_value = value;
+		}
+
+		[MethodImpl(MethodImplOptions.Synchronized)]
+		public static implicit operator bool(AtomicBool a)
+		{
+			return a._value;
+		}
+
+		public bool Value
+		{
+			[MethodImpl(MethodImplOptions.Synchronized)]
+			get => _value;
+			[MethodImpl(MethodImplOptions.Synchronized)]
+			set { _value = value; }
+		}
+
+		private bool _value = false;
+	}
+}

CPPCheckPlugin/CPPCheckPlugin.csproj

@@ -181,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AnalyzerCppcheck.cs" />
+    <Compile Include="AtomicBool.cs" />
     <Compile Include="ChecksPanel.cs" />
     <Compile Include="CppcheckMessagesList.xaml.cs">
       <DependentUpon>CppcheckMessagesList.xaml</DependentUpon>

CPPCheckPlugin/CPPCheckPluginPackage.cs

@@ -193,7 +193,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
 			{
 				CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck);
-				menuCheckSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
+				menuCheckSelections = new MenuCommand(onCheckSelectedProjects, selectionsMenuCommandID);
 				mcs.AddCommand(menuCheckSelections);
 			}
 
@@ -211,7 +211,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
 			{
 				CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginMultiItemProjectCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck1);
-				checkMultiSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
+				checkMultiSelections = new MenuCommand(onCheckSelectedProjects, selectionsMenuCommandID);
 				mcs.AddCommand(checkMultiSelections);
 			}
 
@@ -247,8 +247,7 @@ private void onCheckCurrentProjectRequested(object sender, EventArgs e)
 		{
 			JoinableTaskFactory.Run(async () =>
 			{
-				await JoinableTaskFactory.SwitchToMainThreadAsync();
-				_ = checkFirstActiveProjectAsync();
+				await checkFirstActiveProjectAsync();
 			});
 		}
 
@@ -269,7 +268,7 @@ private void onCheckAllProjectsRequested(object sender, EventArgs e)
 			});
 		}
 
-		private void onCheckSelectionsRequested(object sender, EventArgs e)
+		private void onCheckSelectedProjects(object sender, EventArgs e)
 		{
 			JoinableTaskFactory.Run(async () =>
 			{
@@ -461,6 +460,7 @@ private async Task<SourceFilesWithConfiguration> getAllSupportedFilesFromProject
 		private async Task checkFirstActiveProjectAsync()
 		{
 			await JoinableTaskFactory.SwitchToMainThreadAsync();
+			
 
 			var activeProjects = await findSelectedCppProjectsAsync();
 			Assumes.NotNull(activeProjects);
@@ -507,7 +507,10 @@ private async Task checkProjectsAsync(List<Project> projects)
 
 				foreach (ProjectItem projectItem in project.ProjectItems)
 				{
+					Stopwatch sw = Stopwatch.StartNew();
 					await scanProjectItemForSourceFilesAsync(projectItem, sourceFiles, config, project);
+					sw.Stop();
+					await AddTextToOutputWindowAsync("scanProjectItemForSourceFilesAsync for " + projectItem.Name + " took " + sw.ElapsedMilliseconds + " ms\n");
 				}
 
 				// Although we're using the same base configuration, it's possible for each file to override that.
@@ -783,17 +786,17 @@ private async void scanProgressUpdated(int filesScanned)
 					statusBar.Clear();
 				}
 			}
-			catch (Exception) { }
+			catch (Exception) {}
 		}
 
 		private async void updateStatusBarProgress(bool inProgress, string label, int currentPercentage)
 		{
-			await JoinableTaskFactory.SwitchToMainThreadAsync();
 			try
 			{
+				await JoinableTaskFactory.SwitchToMainThreadAsync();
 				_dte.StatusBar.Progress(inProgress, label, currentPercentage, 100);
 			}
-			catch (Exception) { }
+			catch (Exception) {}
 		}
 
 		private async void checkProgressUpdated(object sender, ICodeAnalyzer.ProgressEvenArgs e)

CPPCheckPlugin/ICodeAnalyzer.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.IO;
+using System.Threading;
 
 namespace VSPackage.CPPCheckPlugin
 {
@@ -160,8 +161,11 @@ public void abortThreadIfAny()
 			{
 				try
 				{
-					_terminateThread = true;
-					_thread.Join();
+					_terminateThread.Value = true;
+					if (!_thread.Join(TimeSpan.FromSeconds(5)))
+					{
+						_thread.Abort();
+					}
 				}
 				catch (Exception ex)
 				{
@@ -173,7 +177,7 @@ public void abortThreadIfAny()
 
 		private void analyzerThreadFunc(string analyzerExePath)
 		{
-			_terminateThread = false;
+			_terminateThread.Value = false;
 			foreach (var arguments in _allArguments)
 			{
 				// Don't start subsequent processes if we've been requested to cancel.
@@ -326,7 +330,7 @@ protected virtual void Dispose(bool disposing)
 		protected int _numCores;
 
 		private System.Threading.Thread _thread = null;
-		private bool _terminateThread = false;
+		private AtomicBool _terminateThread = new AtomicBool(false);
 		private List<string> _allArguments;
 	}
 }