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

LazDebuggerFp: fixed race conditions / Cache variables must only be used for calls by main-thread.

Browse Source 
git-svn-id: trunk@64888 -
This commit is contained in:
martin 2021-03-28 20:26:25 +00:00
parent e75dd9a3a6
commit 176d2080c3
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
View File

@ -1383,6 +1383,10 @@ end;
function TFpDbgMemReader.ReadRegister(ARegNum: Cardinal; out AValue: TDbgPtr;
AContext: TFpDbgLocationContext): Boolean;
begin
// Shortcut, if in debug-thread / do not use Self.F*
if ThreadID = FFpDebugDebugger.FWorkerThreadId then
exit(inherited ReadRegister(ARegNum, AValue, AContext));
FRegNum := ARegNum;
FRegContext := AContext;
FRegValue := 0; // TODO: error detection
@ -3266,11 +3270,12 @@ function TFpDebugDebugger.ExecuteInDebugThread(AMethod: TFpDbgAsyncMethod
var
WorkItem: TFpThreadWorkerAsyncMeth;
begin
Result := True;
if ThreadID = FWorkerThreadId then begin
AMethod();
exit;
end;
assert(ThreadID <> FWorkerThreadId, 'TFpDebugDebugger.ExecuteInDebugThread: ThreadID <> FWorkerThreadId');
//Result := True;
//if ThreadID = FWorkerThreadId then begin
// AMethod();
// exit;
//end;
Result := False;
@ -3478,6 +3483,11 @@ end;
function TFpDebugDebugger.AddBreak(const ALocation: TDbgPtr; AnEnabled: Boolean
): TFpDbgBreakpoint;
begin
// Shortcut, if in debug-thread / do not use Self.F*
if ThreadID = FWorkerThreadId then
if ALocation = 0 then exit(FDbgController.CurrentProcess.AddBreak(nil, AnEnabled))
else exit(FDbgController.CurrentProcess.AddBreak(ALocation, AnEnabled));
FCacheLocation:=ALocation;
FCacheBoolean:=AnEnabled;
FCacheBreakpoint := nil;
@ -3488,6 +3498,11 @@ end;
function TFpDebugDebugger.AddBreak(const AFuncName: String; ALib: TDbgLibrary;
AnEnabled: Boolean): TFpDbgBreakpoint;
begin
// Shortcut, if in debug-thread / do not use Self.F*
if ThreadID = FWorkerThreadId then
if ALib <> nil then exit(ALib.AddBreak(AFuncName, AnEnabled))
else exit(TDbgInstance(FDbgController.CurrentProcess).AddBreak(AFuncName, AnEnabled));
FCacheFileName:=AFuncName;
FCacheLib:=ALib;
FCacheBoolean:=AnEnabled;
@ -3498,6 +3513,10 @@ end;
function TFpDebugDebugger.ReadData(const AAdress: TDbgPtr; const ASize: Cardinal; out AData): Boolean;
begin
// Shortcut, if in debug-thread / do not use Self.F*
if ThreadID = FWorkerThreadId then
exit(FDbgController.CurrentProcess.ReadData(AAdress, ASize, AData));
FCacheLocation := AAdress;
FCacheLine:=ASize;
FCachePointer := @AData;
@ -3509,6 +3528,10 @@ end;
function TFpDebugDebugger.ReadData(const AAdress: TDbgPtr;
const ASize: Cardinal; out AData; out ABytesRead: Cardinal): Boolean;
begin
// Shortcut, if in debug-thread / do not use Self.F*
if ThreadID = FWorkerThreadId then
exit(FDbgController.CurrentProcess.ReadData(AAdress, ASize, AData, ABytesRead));
FCacheLocation := AAdress;
FCacheLine:=ASize;
FCachePointer := @AData;