paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 17:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix linux deadlock when inferiors generate lots of output to stderr

Browse Source 
git-svn-id: trunk@28972 -
This commit is contained in:
pierre 2014-11-03 07:41:25 +00:00
parent 75afdf052b
commit 8f58b93e39
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fpmkunit/src/fpmkunit.pp
View File

@ -1736,11 +1736,6 @@ var
until ConsoleOutput.Position >= BytesRead; until ConsoleOutput.Position >= BytesRead;
ConsoleOutput.Position := BuffPos; ConsoleOutput.Position := BuffPos;
end
else
begin
// no data, wait 100 ms
Sleep(100);
end; end;
Result := n; Result := n;
@ -1759,7 +1754,19 @@ begin
P.Execute; P.Execute;
while P.Running do while P.Running do
ReadFromStream(false); begin
// Only call ReadFromStream if Data from corresponding stream
// is already available, otherwise, on linux, the read call
// is blocking, and thus it is not possible to be sure to handle
// big data amounts bboth on output and stderr pipes. PM.
if P.Output.NumBytesAvailable > 0 then
ReadFromStream(false)
else if P.StdErr.NumBytesAvailable > 0 then
ReadFromStream(true)
else
// no data, wait 100 ms
Sleep(100);
end;
// read last part // read last part
repeat repeat