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

FpDebug: Linux, check if thread is known.

Browse Source 
(cherry picked from commit 9fd6981814)
This commit is contained in:
Martin 2024-11-22 11:33:33 +01:00
parent 085045f648
commit ffdc389c25
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/fpdebug/fpdbglinuxclasses.pas
View File

@ -394,6 +394,14 @@ var
GConsoleTty: string; GConsoleTty: string;
GSlavePTyFd: cint; GSlavePTyFd: cint;
function dbgsThreadId(AThread: TDbgThread): string;
begin
if AThread = nil then
result := 'nil'
else
result := inttostr(AThread.ID);
end;
Function WIFSTOPPED(Status: Integer): Boolean; Function WIFSTOPPED(Status: Integer): Boolean;
begin begin
WIFSTOPPED:=((Status and $FF)=$7F); WIFSTOPPED:=((Status and $FF)=$7F);
@ -1545,12 +1553,12 @@ begin
if (FSOLibEventBreakpoint <> nil) and not FSOLibEventBreakpoint.Enabled then if (FSOLibEventBreakpoint <> nil) and not FSOLibEventBreakpoint.Enabled then
FSOLibEventBreakpoint.Enabled:=True; FSOLibEventBreakpoint.Enabled:=True;
{$IFDEF DebuglnLinuxDebugEvents} {$IFDEF DebuglnLinuxDebugEvents}
debuglnEnter(['>>>>> TDbgLinuxProcess.Continue TID:', AThread.ID, ' SingleStep:', SingleStep ]); try debuglnEnter(['>>>>> TDbgLinuxProcess.Continue TID:', dbgsThreadId(AThread), ' SingleStep:', SingleStep ]); try
{$ENDIF} {$ENDIF}
FSingleSteppingThreadID := -1; FSingleSteppingThreadID := -1;
// Terminating process and all threads // Terminating process and all threads
if FIsTerminating then begin if FIsTerminating and (AThread <> nil) then begin
fpseterrno(0); fpseterrno(0);
AThread.BeforeContinue; AThread.BeforeContinue;
fpPTrace(PTRACE_KILL, AThread.ID, pointer(1), nil); fpPTrace(PTRACE_KILL, AThread.ID, pointer(1), nil);
@ -1559,7 +1567,7 @@ begin
exit; exit;
end; end;
if TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored if (AThread <> nil) and TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored
AThread.NextIsSingleStep:=SingleStep; AThread.NextIsSingleStep:=SingleStep;
// check for pending events in other threads // check for pending events in other threads
@ -1618,7 +1626,7 @@ begin
exit; exit;
end; end;
if TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored if (AThread <> nil) and TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored
if HasInsertedBreakInstructionAtLocation(AThread.GetInstructionPointerRegisterValue) then begin if HasInsertedBreakInstructionAtLocation(AThread.GetInstructionPointerRegisterValue) then begin
TempRemoveBreakInstructionCode(AThread.GetInstructionPointerRegisterValue); TempRemoveBreakInstructionCode(AThread.GetInstructionPointerRegisterValue);
TDbgLinuxThread(AThread).FIsSteppingBreakPoint := True; TDbgLinuxThread(AThread).FIsSteppingBreakPoint := True;
@ -1653,7 +1661,7 @@ begin
end; end;
end; end;
if TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored if (AThread <> nil) and TDbgLinuxThread(AThread).FIsPaused then // in case of deInternal, it may not be paused and can be ignored
if not FIsTerminating then begin if not FIsTerminating then begin
fpseterrno(0); fpseterrno(0);
//AThread.BeforeContinue; //AThread.BeforeContinue;