improved responsiveness of simulation progress on heavy load

VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs

@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Forms.VisualStyles;
 using System.Windows.Input;
 using System.Xml;
 using System.Xml.Linq;
@@ -355,12 +356,21 @@ namespace VECTO3GUI2020.ViewModel.Implementation
 			}
 			SimulationRunning = true;
 			try {
-				await Task.Run(() => RunSimulationAsync(_cancellationTokenSource.Token,
+				//await Task.Run(() => RunSimulationAsync(_cancellationTokenSource.Token,
+				//	outputMessages: _outputMessage,
+				//	progress: _progress,
+				//	status: _status,
+				//	jobToSimulate: jobToSimulate));
+				await Task.Factory.StartNew(() => RunSimulationAsync(_cancellationTokenSource.Token,
 					outputMessages: _outputMessage,
 					progress: _progress,
 					status: _status,
-					jobToSimulate: jobToSimulate));
-			} catch (Exception ex) {
+					jobToSimulate: jobToSimulate),
+						TaskCreationOptions.LongRunning | 
+						TaskCreationOptions.PreferFairness).Unwrap();
+
+			}
+			catch (Exception ex) {
 				_outputViewModel.AddMessage(new MessageEntry() {
 					Type = MessageType.ErrorMessage,
 					Message = ex.Message
@@ -379,6 +389,11 @@ namespace VECTO3GUI2020.ViewModel.Implementation
 			IProgress<string> status, 
 			IDocumentViewModel jobToSimulate = null)
 		{
+			if (Thread.CurrentThread.Name == null) {
+				Thread.CurrentThread.Name = "JobListThread";
+			};
+
+
             progress.Report(0);
 			status.Report("starting...");
 			
@@ -580,6 +595,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
 
 			var start = Stopwatch.StartNew();
 			jobContainer.Execute(true);
+			
 			while (!jobContainer.AllCompleted)
 			{
 				if (ct.IsCancellationRequested)
@@ -598,23 +614,25 @@ namespace VECTO3GUI2020.ViewModel.Implementation
 
 					return;
 				}
-
+				Debug.WriteLine(Thread.CurrentThread.Name);
 				var jobProgress = jobContainer.GetProgress();
 				var sumProgress = jobProgress.Sum(x => x.Value.Progress);
 				var duration = start.Elapsed.TotalSeconds;
-				jobProgress.Select(x => x.Value.Progress);
-
-
+				//jobProgress.Select(x => x.Value.Progress);
 
+				
+				
 				progress.Report(Convert.ToInt32(sumProgress * 100 / jobProgress.Count));
 				status.Report(string.Format(
 					"Duration: {0:F1}s, Current Progress: {1:P} ({2})", duration, sumProgress / jobProgress.Count,
 					string.Join(", ", jobProgress.Select(x => string.Format("{0,4:P}", x.Value.Progress)))));
-                var justFinished = jobProgress.Where(x => x.Value.Done & !finishedRuns.Contains(x.Key))
+                
+				var justFinished = jobProgress.Where(x => x.Value.Done & !finishedRuns.Contains(x.Key))
 					.ToDictionary(x => x.Key, x => x.Value);
 				PrintRuns(justFinished, fileWriters, outputMessages);
 				finishedRuns.AddRange(justFinished.Select(x => x.Key));
-				await Task.Delay(100);
+
+				Task.Delay(200, ct).Wait(200); //Used to reduce updates of UI Thread, under heavy load it's possible that Task.Delay() is not scheduled and we hang here, therefore the Timeout.
 			}
 			start.Stop();
 
@@ -818,7 +836,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
 			{
 				return _cancelSimulationCommand ?? (_cancelSimulationCommand = new RelayCommand(() => {
 						_outputViewModel.AddMessage(new MessageEntry() {
-							Message="Canceling Simulation",
+							Message="Canceling Simulation - this operation can take some time",
 							Type=MessageType.InfoMessage,
 						});
 						_simulationLoggingEnabled = false;

VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs

@@ -58,7 +58,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 			private bool followUpSimulatorFactoryFetched = false;
 
-			private readonly HashSet<int> _unfinishedRuns = new HashSet<int>();
+			private readonly ConcurrentDictionary<int, byte> _unfinishedRuns = new ConcurrentDictionary<int, byte>();
+			//private readonly HashSet<int> _unfinishedRuns = new HashSet<int>();
 			private readonly ReaderWriterLockSlim _unfinishedRunsRwLock = new ReaderWriterLockSlim();
 
 
@@ -66,7 +67,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			{
 				_simulatorFactory = simulatorFactory;
 				foreach (var runId in runIds) {
-					_unfinishedRuns.Add(runId);
+					_unfinishedRuns[runId] = Byte.MinValue;
 				}
 			}
 
@@ -74,7 +75,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			{
 				try {
 					_unfinishedRunsRwLock.EnterWriteLock();
-					_unfinishedRuns.Remove(runId);
+					_unfinishedRuns.TryRemove(runId, out var tmpByte);
 					if (AllCompletedUnsafe()) {
 						_outputWriter = _simulatorFactory.ReportWriter;
 					}
@@ -117,7 +118,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 		private readonly SummaryDataContainer _sumWriter;
 		internal readonly List<RunEntry> Runs = new List<RunEntry>();
-		private readonly HashSet<int> _unfinishedRuns = new HashSet<int>();
+		//private readonly HashSet<int> _unfinishedRuns = new HashSet<int>();
+		private readonly ConcurrentDictionary<int, byte> _unfinishedRuns = new ConcurrentDictionary<int, byte>();
 		private ReaderWriterLockSlim _runsRwLock = new ReaderWriterLockSlim();
 		private ConcurrentDictionary<int, RunContainer> _runContainerMap  = new ConcurrentDictionary<int, RunContainer>();
 		private static int _jobNumber;
@@ -162,7 +164,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				try {
 					_runsRwLock.EnterWriteLock();
 					Runs.Add(new RunEntry(run, this));
-					_unfinishedRuns.Add(run.RunIdentifier);
+					_unfinishedRuns[run.RunIdentifier] = Byte.MinValue;
+					//_unfinishedRuns.Add(run.RunIdentifier);
 				} finally {
 					_runsRwLock.ExitWriteLock();
 				}
@@ -215,7 +218,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 					{
 						var entry = new RunEntry(run, this, factory.JobNumber);
 						Runs.Add(entry);
-						_unfinishedRuns.Add(run.RunIdentifier);
+						_unfinishedRuns[run.RunIdentifier] = Byte.MinValue;
+						//_unfinishedRuns.Add(run.RunIdentifier);
 						runIDs.Add(entry.RunId);
 					}
 				}
@@ -339,7 +343,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 			try {
 				_runsRwLock.EnterWriteLock();
-				_unfinishedRuns.Remove(runId);
+				//_unfinishedRuns.Remove(runId);
+				_unfinishedRuns.TryRemove(runId, out var tmpVal);
 				if (AllCompletedUnsafe())
 				{
 					_sumWriter.Finish();
@@ -374,18 +379,25 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 		{
 			get
 			{
+				return _unfinishedRuns.Count == 0;
+/*
 				try {
+					
+
 					_runsRwLock.EnterReadLock();
 					return AllCompletedUnsafe();
 				} finally {
 					_runsRwLock.ExitReadLock();
 				}
+*/
 			}
 		}
 
 		public Dictionary<int, ProgressEntry> GetProgress()
 		{
-			return Runs.ToDictionary(
+			try {
+				_runsRwLock.EnterReadLock();
+				return Runs.ToDictionary(
 					r => r.Run.RunIdentifier,
 					r => new ProgressEntry
 					{
@@ -401,6 +413,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 						Canceled = r.Canceled,
 						Error = r.ExecException
 					});
+			} finally {
+				_runsRwLock.ExitReadLock();
+			}
+			
 
 		}
 
@@ -471,16 +487,16 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 						ExecTime = stopWatch.Elapsed.TotalMilliseconds;
 						JobContainer.JobCompleted(RunId, _runContainerId);
 						_done = true;
-
-						//Notify which job has completed (ID)
 					}
 				});
 			}
 
 			public Task RunWorkerAsync()
 			{
-				if (Running == false) {
-					RunTask.Start();
+				
+				if (!Running && !Started) {
+					Started = true;
+					RunTask.Start(TaskScheduler.Current);
 				}
 				return RunTask;
 			}