paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 21:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazLogger: Thread safety

Browse Source 
git-svn-id: trunk@57736 -
This commit is contained in:
martin 2018-04-28 09:54:03 +00:00
parent e3b8d6813a
commit 4a5241032e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/lazutils/lazlogger.pas
View File

@ -43,6 +43,7 @@ type
FLogText: Text;
FLogTextInUse, FLogTextFailed: Boolean;
FUseStdOut: Boolean;
FWriteToFileLock: TRTLCriticalSection;
procedure DoOpenFile;
procedure DoCloseFile;
function GetWriteTarget: TLazLoggerWriteTarget;
@ -268,6 +269,7 @@ end;
constructor TLazLoggerFileHandle.Create;
begin
InitCriticalSection(FWriteToFileLock);
FLogTextInUse := False;
FLogTextFailed := False;
{$ifdef WinCE}
@ -285,6 +287,7 @@ destructor TLazLoggerFileHandle.Destroy;
begin
inherited Destroy;
DoCloseFile;
DoneCriticalsection(FWriteToFileLock);
end;
procedure TLazLoggerFileHandle.OpenFile;
@ -301,6 +304,8 @@ end;
procedure TLazLoggerFileHandle.WriteToFile(const s: string);
begin
EnterCriticalsection(FWriteToFileLock);
try
DoOpenFile;
if FActiveLogText = nil then exit;
@ -308,10 +313,15 @@ begin
if FCloseLogFileBetweenWrites then
DoCloseFile;
finally
LeaveCriticalsection(FWriteToFileLock);
end;
end;
procedure TLazLoggerFileHandle.WriteLnToFile(const s: string);
begin
EnterCriticalsection(FWriteToFileLock);
try
DoOpenFile;
if FActiveLogText = nil then exit;
@ -319,6 +329,9 @@ begin
if FCloseLogFileBetweenWrites then
DoCloseFile;
finally
LeaveCriticalsection(FWriteToFileLock);
end;
end;
{ TLazLoggerFile }
@ -817,6 +830,6 @@ end;
initialization
LazDebugLoggerCreator := @CreateDebugLogger;
RecreateDebugLogger
RecreateDebugLogger;
end.