Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions src/OneScript.StandardLibrary/Processes/ProcessContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class ProcessContext : AutoContext<ProcessContext>, IDisposable
private StdTextReadStream _stdOutContext;
private StdTextReadStream _stdErrContext;
private StdTextWriteStream _stdInContext;
private ProcessOutputWrapper _stdOutWrapper;
private ProcessOutputWrapper _stdErrWrapper;

private readonly IValue _outputEncoding;

Expand Down Expand Up @@ -107,15 +109,14 @@ public void Start()

if (IsOutputRedirected)
{
var stream = new ProcessOutputWrapper(_p, ProcessOutputWrapper.OutputVariant.Stdout);
stream.StartReading();
_stdOutContext = new StdTextReadStream(stream);
_stdOutWrapper = new ProcessOutputWrapper(_p.StandardOutput);
_stdOutWrapper.StartReading();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
_stdOutContext = new StdTextReadStream(_stdOutWrapper);

stream = new ProcessOutputWrapper(_p, ProcessOutputWrapper.OutputVariant.Stderr);
stream.StartReading();

_stdErrContext = new StdTextReadStream(stream);
_stdErrWrapper = new ProcessOutputWrapper(_p.StandardError);
_stdErrWrapper.StartReading();

_stdErrContext = new StdTextReadStream(_stdErrWrapper);
}
}

Expand Down Expand Up @@ -149,7 +150,14 @@ public bool HasExited
{
get
{
return _p.HasExited;
if (!_p.HasExited)
return false;

// Процесс завершился, но фоновое чтение могло еще не добрать
// хвост вывода из пайпа: цикл "Пока НЕ Завершен ИЛИ ЕстьДанные"
// не должен завершиться раньше, чем вывод станет доступен
return (_stdOutWrapper?.IsDrained ?? true)
&& (_stdErrWrapper?.IsDrained ?? true);
}
}

Expand All @@ -176,6 +184,12 @@ public bool WaitForExit(IValue timeout = null)
if (timeout == null)
{
_p.WaitForExit();

// Прочитать() после ожидания должен видеть весь вывод:
// дожидаемся, пока фоновое чтение доберет хвост потоков
_stdOutWrapper?.WaitSourceDrained();
_stdErrWrapper?.WaitSourceDrained();

return true;
}

Expand Down
Loading