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

Merged revision(s) 57736 #4a5241032e from trunk:

Browse Source 
LazLogger: Thread safety
........

git-svn-id: branches/fixes_1_8@57938 -
This commit is contained in:
maxim 2018-05-14 22:38:58 +00:00
parent a03b5355f8
commit c8adbabb46
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

@ -45,6 +45,7 @@ type
FLogText: Text;
FLogTextInUse, FLogTextFailed: Boolean;
FUseStdOut: Boolean;
FWriteToFileLock: TRTLCriticalSection;
procedure DoOpenFile;
procedure DoCloseFile;
function GetWriteTarget: TLazLoggerWriteTarget;
@ -270,6 +271,7 @@ end;
constructor TLazLoggerFileHandle.Create;
begin
InitCriticalSection(FWriteToFileLock);
FLogTextInUse := False;
FLogTextFailed := False;
{$ifdef WinCE}
@ -287,6 +289,7 @@ destructor TLazLoggerFileHandle.Destroy;
begin
inherited Destroy;
DoCloseFile;
DoneCriticalsection(FWriteToFileLock);
end;
procedure TLazLoggerFileHandle.OpenFile;
@ -303,6 +306,8 @@ end;
procedure TLazLoggerFileHandle.WriteToFile(const s: string);
begin
EnterCriticalsection(FWriteToFileLock);
try
DoOpenFile;
if FActiveLogText = nil then exit;
@ -310,10 +315,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;
@ -321,6 +331,9 @@ begin
if FCloseLogFileBetweenWrites then
DoCloseFile;
finally
LeaveCriticalsection(FWriteToFileLock);
end;
end;
{ TLazLoggerFile }
@ -825,6 +838,6 @@ end;
initialization
LazDebugLoggerCreator := @CreateDebugLogger;
RecreateDebugLogger
RecreateDebugLogger;
end.