Ticket #9854: 9854.patch

src/apps/debugger/controllers/TeamDebugger.cpp

@@ -1270 +1270 @@
             TRACE_EVENTS("B_DEBUGGER_MESSAGE_POST_SYSCALL: syscall: %"
                 B_PRIu32 "\n", postSyscallEvent->GetSyscallInfo().Syscall());
             handled = _HandlePostSyscall(postSyscallEvent);
+            if (handled && handler != NULL)
+                handler->HandleThreadDebugged(NULL);
             break;
         }
         case B_DEBUGGER_MESSAGE_PRE_SYSCALL:
@@ -1460 +1462 @@
             break;
     }
 
+    AutoLocker< ::Team> teamLocker(fTeam);
+    ::Thread* thread = fTeam->ThreadByID(event->Thread());
+    if (thread != NULL && thread->GetDebugRequestPending())
+        return true;
+
     return false;
 }
 

src/apps/debugger/controllers/ThreadHandler.cpp

@@ -243 +243 @@
             return;
         case MSG_THREAD_STOP:
             fStepMode = STEP_NONE;
-            fDebuggerInterface->StopThread(ThreadID());
+            if (fDebuggerInterface->StopThread(ThreadID()) == B_OK)
+                fThread->SetDebugRequestPending();
             return;
         case MSG_THREAD_STEP_OVER:
         case MSG_THREAD_STEP_INTO:

src/apps/debugger/model/Thread.cpp

@@ -19 +19 @@
     fID(threadID),
     fState(THREAD_STATE_UNKNOWN),
     fReturnValueInfos(NULL),
+    fDebugRequestPending(false),
     fStoppedReason(THREAD_STOPPED_UNKNOWN),
     fCpuState(NULL),
     fStackTrace(NULL)
@@ -78 +79 @@
         SetCpuState(NULL);
         SetStackTrace(NULL);
         ClearReturnValueInfos();
+        fDebugRequestPending = false;
     }
 
     fTeam->NotifyThreadStateChanged(this);
@@ -119 +121 @@
     fTeam->NotifyThreadStackTraceChanged(this);
 }
 
+void
+Thread::SetDebugRequestPending()
+{
+    fDebugRequestPending = true;
+}
+
 
 status_t
 Thread::AddReturnValueInfo(ReturnValueInfo* info)

src/apps/debugger/model/Thread.h

@@ -71 +71 @@
             StackTrace*         GetStackTrace() const   { return fStackTrace; }
             void                SetStackTrace(StackTrace* trace);
 
+            bool                GetDebugRequestPending() const
+                                    { return fDebugRequestPending; }
+            void                SetDebugRequestPending();
+
             ReturnValueInfoList*
                                 ReturnValueInfos() const
                                 { return fReturnValueInfos; }
@@ -84 +88 @@
             uint32              fState;
             ReturnValueInfoList*
                                 fReturnValueInfos;
+            bool                fDebugRequestPending;
             uint32              fStoppedReason;
             BString             fStoppedReasonInfo;
             CpuState*           fCpuState;