paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 07:20:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazLogger: Improve Indent handling with threads. Ensure inc/dec is not overwritten by other threads

Browse Source 
git-svn-id: trunk@60267 -
This commit is contained in:
martin 2019-01-31 22:55:20 +00:00
parent fd3473241b
commit 211ab886b0
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/lazutils/lazlogger.pas
View File

@ -627,23 +627,29 @@ end;
procedure TLazLoggerFile.IncreaseIndent;
var
i: Integer;
l: LongInt;
begin
inc(FDebugNestLvl);
l := InterLockedIncrement(FDebugNestLvl);
CreateIndent;
for i := 0 to BlockHandlerCount - 1 do
BlockHandler[i].EnterBlock(Self, FDebugNestLvl);
BlockHandler[i].EnterBlock(Self, l);
end;
procedure TLazLoggerFile.DecreaseIndent;
var
i: Integer;
l: LongInt;
begin
if not FDebugNestAtBOL then DebugLn;
if FDebugNestLvl > 0 then begin
l := InterLockedDecrement(FDebugNestLvl);
if l < 0 then
l := InterLockedIncrement(FDebugNestLvl);
if l >= 0 then begin
inc(l);
for i := 0 to BlockHandlerCount - 1 do
BlockHandler[i].ExitBlock(Self, FDebugNestLvl);
dec(FDebugNestLvl);
BlockHandler[i].ExitBlock(Self, l);
end;
CreateIndent;
end;
@ -681,11 +687,13 @@ procedure TLazLoggerFile.CreateIndent;
var
s: String;
NewLen: Integer;
l: Integer;
begin
NewLen := FDebugNestLvl * NestLvlIndent;
l := InterlockedCompareExchange(FDebugNestLvl, -1, -1);
NewLen := l * NestLvlIndent;
if NewLen < 0 then NewLen := 0;
if (NewLen >= MaxNestPrefixLen) then begin
s := IntToStr(FDebugNestLvl);
s := IntToStr(l);
NewLen := MaxNestPrefixLen - Length(s);
if NewLen < 1 then
NewLen := 1;
@ -722,7 +730,7 @@ begin
*)
if s <> '' then begin
if FDebugNestAtBOL and (FDebugNestLvl <> 0) then begin
if FDebugNestAtBOL then begin
EnterCriticalsection(FIndentCriticalSection);
s := FDebugIndent + s;
LeaveCriticalsection(FIndentCriticalSection);
@ -749,7 +757,7 @@ var
begin
if not IsInitialized then Init;
if FDebugNestAtBOL and (s <> '') and (FDebugNestLvl <> 0) then begin
if FDebugNestAtBOL and (s <> '') then begin
EnterCriticalsection(FIndentCriticalSection);
s := FDebugIndent + s;
LeaveCriticalsection(FIndentCriticalSection);
@ -824,7 +832,7 @@ end;
function TLazLoggerFile.CurrentIndentLevel: Integer;
begin
Result := FDebugNestLvl;
Result := InterlockedCompareExchange(FDebugNestLvl, -1, -1);
end;
procedure TLazLoggerFile.AddBlockHandler(AHandler: TLazLoggerBlockHandler);