admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make native pipeline consume available output in the process block

Browse Source
This commit is contained in:
Sergei Vorobev
2016-11-15 14:49:39 -08:00
parent 6acc1e0629
commit 747f5ff164
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/NativeCommandProcessor.cs
+19 -4
View File
@@ -323,6 +323,8 @@ namespace System.Management.Automation
{
_inputWriter.Add(Command.CurrentPipelineObject);
}
ConsumeAvailableNativeProcessOutput();
}
/// <summary>
@@ -801,10 +803,14 @@ namespace System.Management.Automation
}
/// <summary>
/// Read the output from the native process and send it down the line
/// Read the output from the native process and send it down the line.
/// </summary>
private void ConsumeAvailableNativeProcessOutput()
/// <returns>
/// True if there was any new input available, otherwise false.
/// </returns>
private bool ConsumeAvailableNativeProcessOutput()
{
bool isNewData = false;
if (_background == false)
{
if (_startInfo.RedirectStandardOutput || _startInfo.RedirectStandardError)
@@ -813,9 +819,11 @@ namespace System.Management.Automation
while (_nativeProcessOutputQueue.TryDequeue(out record))
{
ProcessOutputRecord(record);
isNewData = true;
}
}
}
return isNewData;
}
internal override void Complete()
@@ -827,9 +835,16 @@ namespace System.Management.Automation
//Wait for input writer to finish.
_inputWriter.Done();
//Wait for process to exit
_nativeProcess.WaitForExit();
//Wait for the process to exit and consume available output
while (!_nativeProcess.HasExited)
{
// TODO: Currently the main pipeline Thread is just spinning.
// It would be much better to park it until new input is available.
ConsumeAvailableNativeProcessOutput();
}
// read all the available output one more time
_nativeProcess.WaitForExit();
ConsumeAvailableNativeProcessOutput();
// Capture screen output if we are transcribing