Progress changes with each poolmember updating the pool with progress changes to keep track of partial item progress

Author: powercode

src/PSParallel/InvokeParallelCommand.cs

@@ -178,8 +178,7 @@ protected override void EndProcessing()
 					m_progressManager.TotalCount = m_input.Count;
 					foreach (var i in m_input)
 					{
-						var processed = m_powershellPool.ProcessedCount + m_powershellPool.GetPartiallyProcessedCount();
-						m_progressManager.UpdateCurrentProgressRecord($"Starting processing of {i}", processed);
+						m_progressManager.UpdateCurrentProgressRecord($"Starting processing of {i}", m_powershellPool.ProcessedCount);
 						WriteProgress(m_progressManager.ProgressRecord);
 						while (!m_powershellPool.TryAddInput(ScriptBlock, i))
 						{
@@ -263,7 +262,7 @@ private void WriteOutputs()
 				}		
 				if(!NoProgress)
 				{		
-					m_progressManager.UpdateCurrentProgressRecord(m_powershellPool.ProcessedCount + m_powershellPool.GetPartiallyProcessedCount());
+					m_progressManager.UpdateCurrentProgressRecord(m_powershellPool.ProcessedCount);
 					WriteProgress(m_progressManager.ProgressRecord);
 				}
 			}

src/PSParallel/PowerShellPoolMember.cs

@@ -125,9 +125,11 @@ private void InformationOnDataAdded(object sender, DataAddedEventArgs dataAddedE
 
 		private void ProgressOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
 		{
-			var record = ((PSDataCollection<ProgressRecord>)sender)[dataAddedEventArgs.Index];			
+			var record = ((PSDataCollection<ProgressRecord>)sender)[dataAddedEventArgs.Index];
+			var change = record.PercentComplete - m_percentComplete;
 			m_percentComplete = record.PercentComplete;
 			m_poolStreams.Progress.Add(record);
+			m_pool.AddProgressChange(change);
 		}
 
 		private void ErrorOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)

src/PSParallel/PowershellPool.cs

@@ -19,8 +19,11 @@ sealed class PowershellPool : IDisposable
 		private readonly List<PowerShellPoolMember> m_poolMembers;
 		private readonly BlockingCollection<PowerShellPoolMember> m_availablePoolMembers = new BlockingCollection<PowerShellPoolMember>(new ConcurrentQueue<PowerShellPoolMember>());
 		public readonly PowerShellPoolStreams Streams = new PowerShellPoolStreams();
+		private int m_totalPercentComplete;
 
-		public int ProcessedCount => m_processedCount;		
+		public int ProcessedCount => m_processedCount + PartiallyProcessedCount;
+
+		private int PartiallyProcessedCount => m_totalPercentComplete / 100;
 
 		public PowershellPool(int poolSize, InitialSessionState initialSessionState, CancellationToken cancellationToken)
 		{
@@ -39,26 +42,6 @@ public PowershellPool(int poolSize, InitialSessionState initialSessionState, Can
 			m_runspacePool.SetMaxRunspaces(poolSize);
 		}
 
-		public int GetPartiallyProcessedCount()
-		{
-			var totalPercentComplete = 0;
-			var count = m_poolMembers.Count;
-			for (int i = 0; i < count; ++i)
-			{
-				var percentComplete = m_poolMembers[i].PercentComplete;
-				if (percentComplete < 0)
-				{
-					percentComplete = 0;
-				}
-				else if(percentComplete > 100)
-				{
-					percentComplete = 100;
-				}
-				totalPercentComplete += percentComplete;
-			}			
-			return totalPercentComplete / 100;
-		}
-
 		public bool TryAddInput(ScriptBlock scriptblock,PSObject inputObject)
 		{			
 			PowerShellPoolMember poolMember;
@@ -126,6 +109,7 @@ public void ReportAvailable(PowerShellPoolMember poolmember)
 		{
 			Interlocked.Decrement(ref m_busyCount);
 			Interlocked.Increment(ref m_processedCount);
+			Interlocked.Add(ref m_totalPercentComplete, poolmember.PercentComplete);
 			while (!m_availablePoolMembers.TryAdd(poolmember, 1000, m_cancellationToken))
 			{
 				m_cancellationToken.ThrowIfCancellationRequested();
@@ -149,5 +133,10 @@ public void Stop()
 			}
 			WaitForAllPowershellCompleted(5000);
 		}
+
+		public void AddProgressChange(int change)
+		{
+			Interlocked.Add(ref m_totalPercentComplete, change);
+		}
 	}
 }

src/PSParallel/ProgressManager.cs

@@ -1,13 +1,12 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Management.Automation;
 
 namespace PSParallel
 {
 	class ProgressManager
 	{
 		public int TotalCount { get; set; }
-		private ProgressRecord m_progressRecord;
+		private readonly ProgressRecord m_progressRecord;
 		private readonly Stopwatch m_stopwatch;		
 
 		public ProgressManager(int activityId, string activity, string statusDescription, int parentActivityId = -1, int totalCount = 0)
@@ -58,41 +57,4 @@ public ProgressRecord Completed()
 		private int GetPercentComplete(int count) => count*100/TotalCount;
 		public int ActivityId => m_progressRecord.ActivityId;
 	}
-
-
-	class ProgressProjector
-	{
-		private readonly Stopwatch m_stopWatch;
-		private int m_percentComplete;		
-		public ProgressProjector()
-		{
-			m_stopWatch = new Stopwatch();
-			m_percentComplete = -1;
-		}
-
-		public void ReportProgress(int percentComplete)
-		{
-			if (percentComplete > 100)
-			{
-				percentComplete = 100;
-			}			
-			m_percentComplete = percentComplete;			
-		}
-
-		public bool IsValid => m_percentComplete > 0 && m_stopWatch.IsRunning;
-		public TimeSpan Elapsed => m_stopWatch.Elapsed;
-		
-		public TimeSpan ProjectedTotalTime => new TimeSpan(Elapsed.Ticks * 100 / m_percentComplete);
-
-		public void Start()
-		{
-			m_stopWatch.Start();
-			m_percentComplete = 0;
-		}
-
-		public void Stop()
-		{
-			m_stopWatch.Stop();
-		}
-	}
 }