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

* Use FGeneralCriticalSection for LogIndent and LogUnindent.

Browse Source 
Add FIndentCount integer field.
    Add FWorkerPrefix string field.
    Use try/finally block to keep track of LogLevel

git-svn-id: trunk@49266 -
This commit is contained in:
pierre 2021-04-26 20:43:07 +00:00
parent 77cc2f4ced
commit 4391075617
1 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1230,6 +1230,7 @@ Type
FInteractive : boolean;
FProgressMax : integer;
FProgressCount : integer;
FIndentCount : integer;
FExternalPackages : TPackages;
// Events
FOnLog: TLogEvent;
@ -1238,7 +1239,9 @@ Type
FOnFinishCopy: TNotifyEvent;
FCachedlibcPath: string;
{$ifndef NO_THREADING}
FGeneralCriticalSection: TRTLCriticalSection;
{$endif NO_THREADING}
{$ifdef HAS_UNIT_ZIPPER}
FZipper: TZipper;
FGZFileStream: TGZFileStream;
@ -1452,6 +1455,7 @@ Type
FCompilationOK: boolean;
FDone: boolean;
FErrorMessage: string;
FWorkerPrefix: string;
FNotifyMainThreadEvent: PRTLEvent;
FNotifyStartTask: PRTLEvent;
FPackage: TPackage;
@ -3407,17 +3411,17 @@ begin
begin
{ synchronise with ReadWriteBarrier in mainthread for same reason as above }
ReadWriteBarrier;
FBuildEngine.log(vlInfo,'Compiling: '+APackage.Name);
FBuildEngine.log(vlInfo,FWorkerPrefix+'Compiling: '+APackage.Name);
FCompilationOK:=false;
try
FBuildEngine.Compile(APackage);
FCompilationOK:=true;
FBuildEngine.log(vlInfo,'Done compiling: '+APackage.Name);
FBuildEngine.log(vlInfo,FWorkerPrefix+'Done compiling: '+APackage.Name);
RaiseMainEvent;
except
on E: Exception do
begin
FErrorMessage := 'Failed compiling: '+APackage.Name+': '+E.Message;
FErrorMessage := FWorkerPrefix+'Failed compiling: '+APackage.Name+': '+E.Message;
FBuildEngine.log(vlInfo,FErrorMessage);
RaiseMainEvent;
end;
@ -6007,6 +6011,7 @@ begin
// With --start-dir=/path/to/sources.
FStartDir:=includeTrailingPathDelimiter(GetCurrentDir);
FExternalPackages:=TPackages.Create(TPackage);
FIndentCount:=0;
FNotifyEventCollection := TNotifyEventCollection.create([neaAfterCompile, neaBeforeCompile, neaAfterInstall, neaBeforeInstall,
neaAfterClean, neaBeforeClean, neaAfterArchive, neaBeforeArchive,
neaAfterManifest, neaBeforeManifest, neaAfterPkgList, neaBeforePkgList,
@ -6021,6 +6026,8 @@ destructor TBuildEngine.Destroy;
begin
FreeAndNil(FExternalPackages);
FreeAndNil(FNotifyEventCollection);
If FIndentCount<>0 then
Log(vlDebug,Format('Log level at exit is %d',[FIndentCount]));
{$ifndef NO_THREADING}
DoneCriticalsection(FGeneralCriticalSection);
@ -6419,13 +6426,33 @@ end;
procedure TBuildEngine.LogIndent;
begin
GLogPrefix:=GLogPrefix+' ';
{$ifndef NO_THREADING}
EnterCriticalSection(FGeneralCriticalSection);
{$endif NO_THREADING}
Inc(FIndentCount);
if not (vlDebug in Installer.FLogLevels) then
GLogPrefix:=GLogPrefix+' '
else
GLogPrefix:=IntToStr(FIndentCount)+'> ';
{$ifndef NO_THREADING}
LeaveCriticalSection(FGeneralCriticalSection);
{$endif NO_THREADING}
end;
procedure TBuildEngine.LogUnIndent;
begin
Delete(GLogPrefix,1,2);
{$ifndef NO_THREADING}
EnterCriticalSection(FGeneralCriticalSection);
{$endif NO_THREADING}
Dec(FIndentCount);
if not (vlDebug in Installer.FLogLevels) then
Delete(GLogPrefix,1,2)
else
GLogPrefix:=IntToStr(FIndentCount)+'> ';
{$ifndef NO_THREADING}
LeaveCriticalSection(FGeneralCriticalSection);
{$endif NO_THREADING}
end;
@ -6433,10 +6460,19 @@ procedure TBuildEngine.Log(Level: TVerboseLevel; Msg: String);
begin
If Assigned(FOnLog) then
begin
{$ifndef NO_THREADING}
EnterCriticalSection(FGeneralCriticalSection);
try
{$endif NO_THREADING}
if Level in [vlInfo,vlDebug] then
FOnLog(Level,GLogPrefix+Msg)
else
FOnLog(Level,Msg);
{$ifndef NO_THREADING}
finally
LeaveCriticalSection(FGeneralCriticalSection);
end;
{$endif NO_THREADING}
end;
end;
@ -6905,32 +6941,34 @@ begin
begin
// Debug information
Log(vlDebug,SDbgResolvingSourcesOfTarget,[T.Name,MakeTargetString(ACPU,AOS)]);
LogIndent;
try
LogIndent;
case T.TargetType of
ttProgram,
ttSharedLibrary,
ttUnit,
ttImplicitUnit :
begin
if T.FTargetSourceFileName<>'' then
Log(vlDebug,SDbgSourceAlreadyResolved,[T.Name])
else
FindMainSource(T);
if T.Dependencies.Count>0 then
FindIncludeSources(T);
end;
ttExampleUnit,
ttExampleProgram :
begin
if T.FTargetSourceFileName<>'' then
Log(vlDebug,SDbgSourceAlreadyResolved,[T.Name])
else
FindExampleSource(T);
end;
case T.TargetType of
ttProgram,
ttSharedLibrary,
ttUnit,
ttImplicitUnit :
begin
if T.FTargetSourceFileName<>'' then
Log(vlDebug,SDbgSourceAlreadyResolved,[T.Name])
else
FindMainSource(T);
if T.Dependencies.Count>0 then
FindIncludeSources(T);
end;
ttExampleUnit,
ttExampleProgram :
begin
if T.FTargetSourceFileName<>'' then
Log(vlDebug,SDbgSourceAlreadyResolved,[T.Name])
else
FindExampleSource(T);
end;
end;
finally
LogUnIndent;
end;
LogUnIndent;
end;
end;
finally
@ -7484,6 +7522,7 @@ Var
Env : TStrings;
begin
Log(vlInfo,SInfoCompilingTarget,[ATarget.Name]);
try
LogIndent;
ExecuteCommands(ATarget.Commands,caBeforeCompile);
If Assigned(ATarget.BeforeCompile) then
@ -7514,7 +7553,9 @@ begin
ATarget.AfterCompile(ATarget);
ExecuteCommands(ATarget.Commands,caAfterCompile);
end;
finally
LogUnIndent;
end;
end;
@ -7525,6 +7566,7 @@ Var
D : TDependency;
begin
Log(vlDebug, Format(SDbgCompilingDependenciesOfTarget, [ATarget.Name]));
try
LogIndent;
For I:=0 to ATarget.Dependencies.Count-1 do
begin
@ -7558,7 +7600,9 @@ begin
Error(SErrDepUnknownTarget,[D.Value, ATarget.Name, APackage.Name]);
end;
end;
finally
LogUnIndent;
end;
end;
@ -7567,6 +7611,7 @@ begin
if ATarget.State<>tsNeutral then
Error(SErrInvalidState,[ATarget.Name]);
Log(vlDebug, Format(SDbgConsideringTarget, [ATarget.Name]));
try
LogIndent;
ATarget.FTargetState:=tsConsidering;
ResolveDependencies(ATarget.Dependencies,ATarget.Collection as TTargets);
@ -7578,7 +7623,9 @@ begin
end
else
ATarget.FTargetState:=tsNoCompile;
finally
LogUnIndent;
end;
end;
@ -8037,6 +8084,7 @@ begin
if APackage.State<>tsNeutral then
Error(SErrInvalidState,[APackage.Name]);
Log(vlDebug,SDbgConsideringPackage,[APackage.Name]);
try
LogIndent;
if Defaults.ThreadsAmount=-1 then
APackage.FTargetState:=tsConsidering;
@ -8049,6 +8097,7 @@ begin
else if CheckDependencies(APackage, true)=cdNotYetAvailable then
begin
log(vlInfo,'Delaying package '+apackage.name);
//LogUnIndent; Done in Finally below
result := False;
Exit;
end;
@ -8062,7 +8111,9 @@ begin
APackage.FTargetState:=tsNoCompile;
inc(FProgressCount);
end;
finally
LogUnIndent;
end;
end;
@ -8696,7 +8747,10 @@ begin
begin
Threads[Thr] := TCompileWorkerThread.Create(self,NotifyThreadWaiting);
if assigned(Threads[Thr]) then
inc(ThreadCount);
begin
inc(ThreadCount);
Threads[Thr].FWorkerPrefix:=Format('(%d/%d) ',[Thr,Defaults.ThreadsAmount]);
end;
end;
except
on E: Exception do
@ -8712,6 +8766,7 @@ begin
while not Finished do
begin
RTLeventWaitFor(NotifyThreadWaiting);
RTLeventResetEvent(NotifyThreadWaiting);
for Thr:=0 to Defaults.ThreadsAmount-1 do
if assigned(Threads[Thr]) and not Finished then
ProcessThreadResult(Threads[Thr]);