paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-05 19:10:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* pas2jni: Minor optimizations.

Browse Source 
git-svn-id: trunk@32747 -
This commit is contained in:
yury 2015-12-26 21:55:32 +00:00
parent c83fa22b2b
commit 98ebcdc179
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
utils/pas2jni/ppuparser.pas
View File

@ -574,6 +574,7 @@ begin
try
jp:=TJSONParser.Create(s, [joUTF8]);
try
s:='';
jdata:=jp.Parse;
junit:=TJSONObject(jdata.Items[0]);
finally
@ -681,24 +682,28 @@ end;
function TPPUParser.ReadProcessOutput(const AExeName, AParams: string; var AOutput, AError: string): integer;
procedure _ReadOutput(o: TInputPipeStream; var s: string);
procedure _ReadOutput(o: TInputPipeStream; var s: string; var idx: integer);
var
i, j: integer;
i: integer;
begin
with o do
while NumBytesAvailable > 0 do begin
i:=NumBytesAvailable;
j:=Length(s);
SetLength(s, j + i);
ReadBuffer(s[j + 1], i);
if idx + i > Length(s) then
SetLength(s, idx + i*10 + idx div 10);
ReadBuffer(s[idx + 1], i);
Inc(idx, i);
end;
end;
var
p: TProcess;
oidx, eidx: integer;
begin
AOutput:='';
AError:='';
oidx:=0;
eidx:=0;
p:=TProcess.Create(nil);
try
p.Executable:=AExeName;
@ -712,9 +717,13 @@ begin
raise Exception.CreateFmt('Unable to run "%s".'+LineEnding+'%s', [p.Executable, Exception(ExceptObject).Message]);
end;
repeat
_ReadOutput(p.Output, AOutput);
_ReadOutput(p.Stderr, AError);
if p.Output.NumBytesAvailable = 0 then
TThread.Yield;
_ReadOutput(p.Output, AOutput, oidx);
_ReadOutput(p.Stderr, AError, eidx);
until not p.Running and (p.Output.NumBytesAvailable = 0) and (p.Stderr.NumBytesAvailable = 0);
SetLength(AOutput, oidx);
SetLength(AError, eidx);
Result:=p.ExitStatus;
finally
p.Free;