forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #336 - Out of order messages

This commit is contained in:
Basile Burg 2018-06-23 14:52:12 +02:00
parent 3a6e482650
commit 58621ce6dd
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ce_processes.pas
View File

@ -35,9 +35,11 @@ type
fTerminateChecker: TTimer; fTerminateChecker: TTimer;
fDoneTerminated: boolean; fDoneTerminated: boolean;
fHasRead: boolean; fHasRead: boolean;
fRedirectStdErr: boolean;
procedure checkTerminated(sender: TObject); procedure checkTerminated(sender: TObject);
procedure setOnTerminate(value: TNotifyEvent); procedure setOnTerminate(value: TNotifyEvent);
procedure setOnReadData(value: TNotifyEvent); procedure setOnReadData(value: TNotifyEvent);
procedure appendStdErr;
protected protected
procedure internalDoOnReadData(sender: TObject); virtual; procedure internalDoOnReadData(sender: TObject); virtual;
procedure internalDoOnTerminate(sender: TObject); virtual; procedure internalDoOnTerminate(sender: TObject); virtual;
@ -161,10 +163,9 @@ begin
inherited; inherited;
FOutputStack := TMemoryStream.Create; FOutputStack := TMemoryStream.Create;
FTerminateChecker := TTimer.Create(nil); FTerminateChecker := TTimer.Create(nil);
FTerminateChecker.Interval := 50; FTerminateChecker.Interval := 100;
fTerminateChecker.OnTimer := @checkTerminated; fTerminateChecker.OnTimer := @checkTerminated;
fTerminateChecker.Enabled := false; fTerminateChecker.Enabled := false;
//fTerminateChecker.AutoEnabled:= true;
TAsyncProcess(self).OnTerminate := @internalDoOnTerminate; TAsyncProcess(self).OnTerminate := @internalDoOnTerminate;
TAsyncProcess(self).OnReadData := @internalDoOnReadData; TAsyncProcess(self).OnReadData := @internalDoOnReadData;
end; end;
@ -178,6 +179,8 @@ end;
procedure TCEProcess.Execute; procedure TCEProcess.Execute;
begin begin
fRedirectStdErr := poStderrToOutPut in Options;
Options := Options - [poStderrToOutPut];
fHasRead := false; fHasRead := false;
fOutputStack.Clear; fOutputStack.Clear;
fDoneTerminated := false; fDoneTerminated := false;
@ -196,8 +199,24 @@ begin
sum := fOutputStack.Size; sum := fOutputStack.Size;
while (Output <> nil) and (NumBytesAvailable > 0) do while (Output <> nil) and (NumBytesAvailable > 0) do
begin begin
fOutputStack.SetSize(sum + 1024); fOutputStack.SetSize(sum + NumBytesAvailable);
cnt := Output.Read((fOutputStack.Memory + sum)^, 1024); cnt := Output.Read((fOutputStack.Memory + sum)^, NumBytesAvailable);
sum += cnt;
end;
fOutputStack.SetSize(sum);
end;
procedure TCEProcess.appendStdErr;
var
sum, cnt: Integer;
begin
if not (poUsePipes in Options) then
exit;
sum := fOutputStack.Size;
while (Stderr <> nil) and (Stderr.NumBytesAvailable > 0) do
begin
fOutputStack.SetSize(sum + Stderr.NumBytesAvailable);
cnt := Stderr.Read((fOutputStack.Memory + sum)^, Stderr.NumBytesAvailable);
sum += cnt; sum += cnt;
end; end;
fOutputStack.SetSize(sum); fOutputStack.SetSize(sum);
@ -206,7 +225,7 @@ end;
procedure TCEProcess.getFullLines(list: TStrings; consume: boolean = true); procedure TCEProcess.getFullLines(list: TStrings; consume: boolean = true);
var var
stored: Integer; stored: Integer;
lastTerm: Integer; lastEOL: Integer;
toread: Integer; toread: Integer;
buff: Byte = 0; buff: Byte = 0;
str: TMemoryStream; str: TMemoryStream;
@ -218,16 +237,17 @@ begin
fOutputStack.Clear; fOutputStack.Clear;
end else end else
begin begin
lastTerm := fOutputStack.Position; lastEOL := fOutputStack.Position;
stored := fOutputStack.Position; stored := fOutputStack.Position;
while fOutputStack.Read(buff, 1) = 1 do while fOutputStack.Read(buff, 1) = 1 do
if buff = 10 then lastTerm := fOutputStack.Position; if buff = 10 then
lastEOL := fOutputStack.Position;
fOutputStack.Position := stored; fOutputStack.Position := stored;
if lastTerm <> stored then if lastEOL <> stored then
begin begin
str := TMemoryStream.Create; str := TMemoryStream.Create;
try try
toread := lastTerm - stored; toread := lastEOL - stored;
str.SetSize(toRead); str.SetSize(toRead);
fOutputStack.Read(str.Memory^, toread); fOutputStack.Read(str.Memory^, toread);
list.LoadFromStream(str); list.LoadFromStream(str);
@ -272,6 +292,11 @@ begin
UnhookProcessHandle; UnhookProcessHandle;
fillOutputStack; fillOutputStack;
// note: redirection is to output stream is done by hand at the end
// because of sync issue (https://github.com/BBasile/Coedit/issues/336).
if fRedirectStdErr then
appendStdErr;
if fRealOnTerminate <> nil then if fRealOnTerminate <> nil then
fRealOnTerminate(self); fRealOnTerminate(self);
end; end;