Add thread-id field in *stopped notification (MI)

[ki.stfu]

Summary

Add thread-id field in *stopped notification (MI) + tests

All tests pass on OS X

[abidh]

Looks ok to me. Please note that I made a small change in this test earlier today. On Linux, the stop reason is different and the test was failing. I am now only checking only for the *stopped. I then run to main to make sure that we have not run to the end. But test can be changed to ignore stop reason and still check for thread id.

[ki.stfu]

In D7501#120702, @abidh wrote:

On Linux, the stop reason is different and the test was failing. I am now only checking only for the *stopped. I then run to main to make sure that we have not run to the end. But test can be changed to ignore stop reason and still check for thread id.

What is the stop reason on Linux? Is not it "signal-received"?

[abidh]

What is the stop reason on Linux? Is not it "signal-received"?

In Command line lldb:
process launch -s
Process 20587 launching
Process 20587 launched: '/home/abidh/demos/struct' (x86_64)
Process 20587 stopped

• thread #1: tid = 20587, 0x00007ffff7ddb2d0, name = 'struct', stop reason = trace

In lldb-mi:
*stopped,reason="end-stepping-range",frame={addr="0x7ffff7ddb2d0",func="??",args=[],file="??",fullname="??",line="-1"},thread-id="1",stopped-threads="all"

[ki.stfu]

Update test after r228584

test/tools/lldb-mi/TestMiNotification.py

def test_lldbmi_stopped_when_stopatentry_local(self):
         self.runCmd("-file-exec-and-symbols %s" % self.myexe)
         self.expect("\^done")
 
         # Run with stop-at-entry flag
         self.runCmd("-interpreter-exec command \"process launch -s\"")
         self.expect("\^done")
 
         # Test that *stopped is printed
-        self.expect("\*stopped.*")
+        # Note that message is different in Darwin and Linux:
+        # Darwin: "*stopped,reason=\"signal-received\",signal=\"17\",thread-id=\"1\",stopped-threads=\"all\"" 
+        # Linux:  "*stopped,reason=\"end-stepping-range\",frame={addr=\"0x[0-9a-f]+\",func=\"??\",args=\[\],file=\"??\",fullname=\"??\",line=\"-1\"},thread-id=\"1\",stopped-threads=\"all\"
+        self.expect("\*stopped,reason=\"(signal-received|end-stepping-range)\",.+,thread-id=\"1\",stopped-threads=\"all\"")
         
         # Run to main to make sure we have not exited the application
         self.runCmd("-break-insert -f main")
         self.expect("\^done,bkpt={number=\"1\"")
         self.runCmd("-exec-continue")
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
def test_lldbmi_stopped_when_stopatentry_remote(self):
         self.expect("\^done")
 
         try:
             # Run with stop-at-entry flag
             self.runCmd("-interpreter-exec command \"process launch -s\"")
             self.expect("\^done")
 
             # Test that *stopped is printed
-            self.expect("\*stopped,reason=\"signal-received\",signal=\"17\",stopped-threads=\"all\"")
+            self.expect("\*stopped,reason=\"signal-received\",signal=\"17\",thread-id=\"1\",stopped-threads=\"all\"")
 
             # Exit
             self.runCmd("-gdb-exit")
             self.runCmd("") #FIXME lldb-mi hangs here on Linux; extra return is needed
             self.expect("\^exit")
 
         finally:
             # Clean up
             debugserver_child.terminate(force = True)
 
 if __name__ == '__main__':
     unittest2.main()

tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

switch (nStopReason)
                             break;
                         }
                     }
                 }
             }
         }
         default:
         {
-            // MI print "*stopped,reason=\"signal-received\",signal=\"%lld\",stopped-threads=\"all\""
+            // MI print "*stopped,reason=\"signal-received\",signal=\"%lld\",thread-id=\"%d\",stopped-threads=\"all\""
             const CMICmnMIValueConst miValueConst("signal-received");
             const CMICmnMIValueResult miValueResult("reason", miValueConst);
             CMICmnMIOutOfBandRecord miOutOfBandRecord(CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, miValueResult);
             const CMIUtilString strReason(CMIUtilString::Format("%lld", nStopReason));
             const CMICmnMIValueConst miValueConst2(strReason);
             const CMICmnMIValueResult miValueResult2("signal", miValueConst2);
             bOk = miOutOfBandRecord.Add(miValueResult2);
-            const CMICmnMIValueConst miValueConst3("all");
-            const CMICmnMIValueResult miValueResult3("stopped-threads", miValueConst3);
+            const CMIUtilString strThreadId(CMIUtilString::Format("%d", sbProcess.GetSelectedThread().GetIndexID()));
+            const CMICmnMIValueConst miValueConst3(strThreadId);
+            const CMICmnMIValueResult miValueResult3("thread-id", miValueConst3);
             bOk = bOk && miOutOfBandRecord.Add(miValueResult3);
+            const CMICmnMIValueConst miValueConst4("all");
+            const CMICmnMIValueResult miValueResult4("stopped-threads", miValueConst4);
+            bOk = bOk && miOutOfBandRecord.Add(miValueResult4);
             bOk = bOk && MiOutOfBandRecordToStdout(miOutOfBandRecord);
             bOk = bOk && TextToStdout("(gdb)");
         }
     } // switch( nStopReason )
 
     return bOk;
 }