Return the lock to ConsoleHostUserInterface.cs

iSazonov · iSazonov · commit 0a494c130b13 · 2017-03-13T17:07:02.000+03:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -1390,9 +1390,10 @@ public override void WriteProgress(Int64 sourceId, ProgressRecord record)
                 }
                 else
                 {
-                    // lock (_instanceLock) is moved into HandleIncomingProgressRecord
-                    // to exclude unneeded locks
-                    HandleIncomingProgressRecord(sourceId, record);
+                    lock (_instanceLock)
+                    {
+                        HandleIncomingProgressRecord(sourceId, record);
+                    }
                 }
             }
         }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
@@ -90,17 +90,13 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
                 }
             }
 
-            if (progPaneUpdateFlag)
+            if (progPaneUpdateFlag || record.RecordType == ProgressRecordType.Completed)
             {
-                // Update the progress pane only when the timer set up the flag
-                // as a result, we do not block WriteProgress and whole script
-                // and eliminate unnecessary console locks and updates
-                lock (_instanceLock)
-                {
-                    _pendingProgress?.Update(sourceId, record);
-                    _progPane?.Show(_pendingProgress);
-                    progPaneUpdateFlag = false;
-                }
+                // Update the progress pane only when the timer set up the update flag or WriteProgress is completed.
+                // As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates.
+                _pendingProgress.Update(sourceId, record);
+                _progPane.Show(_pendingProgress);
+                progPaneUpdateFlag = false;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1390,9 +1390,10 @@ public override void WriteProgress(Int64 sourceId, ProgressRecord record)`
`1390`	`1390`	`}`
`1391`	`1391`	`else`
`1392`	`1392`	`{`
`1393`		`- // lock (_instanceLock) is moved into HandleIncomingProgressRecord`
`1394`		`- // to exclude unneeded locks`
`1395`		`- HandleIncomingProgressRecord(sourceId, record);`
	`1393`	`+ lock (_instanceLock)`
	`1394`	`+ {`
	`1395`	`+ HandleIncomingProgressRecord(sourceId, record);`
	`1396`	`+ }`
`1396`	`1397`	`}`
`1397`	`1398`	`}`
`1398`	`1399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,17 +90,13 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- if (progPaneUpdateFlag)`
	`93`	`+ if (progPaneUpdateFlag \|\| record.RecordType == ProgressRecordType.Completed)`
`94`	`94`	`{`
`95`		`- // Update the progress pane only when the timer set up the flag`
`96`		`- // as a result, we do not block WriteProgress and whole script`
`97`		`- // and eliminate unnecessary console locks and updates`
`98`		`- lock (_instanceLock)`
`99`		`- {`
`100`		`- _pendingProgress?.Update(sourceId, record);`
`101`		`- _progPane?.Show(_pendingProgress);`
`102`		`- progPaneUpdateFlag = false;`
`103`		`- }`
	`95`	`+ // Update the progress pane only when the timer set up the update flag or WriteProgress is completed.`
	`96`	`+ // As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates.`
	`97`	`+ _pendingProgress.Update(sourceId, record);`
	`98`	`+ _progPane.Show(_pendingProgress);`
	`99`	`+ progPaneUpdateFlag = false;`
`104`	`100`	`}`
`105`	`101`	`}`
`106`	`102`