Fix a missing "*stopped" notification in LLDB-MI after "process launch -s" in case of remote-macosx

[ki.stfu]

Summary

This patch fixes *stopped notification for remote target when started with eLaunchFlagStopAtEntry (for example, using "process launch -s").

See explanation below:

Target::Launch (ProcessLaunchInfo &launch_info, Stream *stream)
{
...
if (state != eStateConnected && platform_sp && platform_sp->CanDebugProcess ())
{
   ...
}
else
{
   ...
   if (m_process_sp)
      error = m_process_sp->Launch (launch_info);
}

if (error.Success())
{
    if (launch_info.GetFlags().Test(eLaunchFlagStopAtEntry) == false)
    {
        ....
    }
    -- missing event if eLaunchFlagStopAtEntry is set --
    m_process_sp->RestoreProcessEvents ();
}
...
return error

Also this patch contains tests and you can check how it works.

[ki.stfu]

Today I'll try to add a test case for it.

[ki.stfu]

add tests

[ki.stfu]

test/tools/lldb-mi/TestMiNotification.py

37

I got an ImportError on another machine.

[ki.stfu]

Fixed ImportError when run tests by using "./dotest.py -v --executable $BUILDDIR/bin/lldb tools/lldb-mi/".
Previously these tests were run by using "./dotest.py -v --executable $BUILDDIR/bin/lldb -f MiNotificationTestCase" command and tests were passed.

[ki.stfu]

Can anyone take a look?

[ki.stfu]

source/Target/Process.cpp

3128

I looked again at event subsystem and I think here should be "HandlePrivateEvent (event_sp)".

[clayborg]

Looks good.

[ki.stfu]

Update patch:

• "HandlePrivateEvent(event_sp)" is used instead of "m_private_state_broadcaster.BroadcastEvent(event_sp)".
• test/tools/lldb-mi/TestMiNotification.py was removed from this review because it will be added in http://reviews.llvm.org/D7410 soon.

Can anyone commit it for me?

UPDATE:
I can commit it by myself.

[clayborg]

Looks good.

[ki.stfu]

Update patch:

• Enable test_lldbmi_stopped_when_stopatentry_local test
• Fix and enable test_lldbmi_stopped_when_stopatentry_remote test

Patch ready for submitting. All tests pass on OS X.

@abidh, Can you check these tests on Linux, please?

[abidh]

The test time outs for me on Linux (Ubuntu 14.04). There is some issue on Linux that we need to figure out. There are 2 stepping tests too which fails. I xfailed them yesterday. I will try to debug them next week.

[ki.stfu]

Ok. But can I commit this patch?

[abidh]

I dont have any objection if you xfail the tests on Linux. I can have a look at those fails later. But lets wait a few hours and see if Greg has any further comments.

[clayborg]

Still looks good. Feel free to xfail the linux tests for now until you can figure out what is going on.

[ki.stfu]

@clayborg, @abidh,

Extra fixes were made in r228824

source/Target/Process.cpp

                             StartPrivateStateThread ();
 
                         m_stop_info_override_callback = GetTarget().GetArchitecture().GetStopInfoOverrideCallback();
+
+                        // Target was stopped at entry as was intended. Need to notify the listeners
+                        // about it.
+                        if (launch_info.GetFlags().Test(eLaunchFlagStopAtEntry) == true)
+                            m_private_state_broadcaster.BroadcastEvent(event_sp);
                     }
                     else if (state == eStateExited)
                     {

test/tools/lldb-mi/TestMiNotification.py

+"""
+Test that the lldb-mi driver nofities user properly.
+"""
+
+import lldbmi_testcase
+from lldbtest import *
+import unittest2
+
+class MiNotificationTestCase(lldbmi_testcase.MiTestCaseBase):
+
+    @lldbmi_test
+    @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
+    def test_lldbmi_stopped_when_stopatentry_local(self):
+        """Test that 'lldb-mi --interpreter' notifies after it was stopped on entry (local)."""
+
+        self.spawnLldbMi(args = None)
+
+        # Load executable
+        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,reason=\"signal-received\",signal=\"17\",stopped-threads=\"all\"") #FIXME add thread-id
+
+    @lldbmi_test
+    @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    def test_lldbmi_stopped_when_stopatentry_remote(self):
+        """Test that 'lldb-mi --interpreter' notifies after it was stopped on entry (remote)."""
+
+        # Prepare debugserver
+        import os, sys
+        lldb_gdbserver_folder = os.path.abspath(os.path.join(os.path.dirname(os.getcwd()), "lldb-gdbserver"))
+        sys.path.append(lldb_gdbserver_folder)
+        import lldbgdbserverutils
+        debugserver_exe = lldbgdbserverutils.get_debugserver_exe()
+        if not debugserver_exe:
+            raise Exception("debugserver not found")
+        hostname = "localhost"
+        import random
+        port = 12000 + random.randint(0,3999) # the same as GdbRemoteTestCaseBase.get_next_port
+        import pexpect
+        debugserver_child = pexpect.spawn("%s %s:%d" % (debugserver_exe, hostname, port))
+
+        self.spawnLldbMi(args = None)
+
+        # Connect to debugserver
+        self.runCmd("-interpreter-exec command \"platform select remote-macosx --sysroot /\"")
+        self.expect("\^done")
+        self.runCmd("-file-exec-and-symbols %s" % self.myexe)
+        self.expect("\^done")
+        self.runCmd("-interpreter-exec command \"process connect connect://%s:%d\"" % (hostname, port))
+        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\"") #FIXME add thread-id
+
+        finally:
+            # Clean up
+            debugserver_child.terminate(force = True)
+
+if __name__ == '__main__':
+    unittest2.main()