Author: jingham
Date: Thu Jan 7 18:20:47 2016
New Revision: 257120
URL: http://llvm.org/viewvc/llvm-project?rev=257120&view=rev
Log:
Fix a glitch in the Driver's batch mode when used with "attach".
Batch mode is supposed to stop execution and return control to the user when an
exceptional stop occurs (crash, signal or instrumentation). But attach always
stops
with a SIGSTOP on OSX (maybe on Linux too?) which would short circuit the rest
of the
commands given.
This change allows a command result object to indicate that it expected to
leave the
process stopped with an exceptional stop reason, and it is okay for batch mode
to keep going.
<rdar://problem/22243143>
Modified:
lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/main.c
lldb/trunk/source/Commands/CommandObjectProcess.cpp
lldb/trunk/source/Interpreter/CommandInterpreter.cpp
lldb/trunk/source/Interpreter/CommandReturnObject.cpp
Modified: lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h Thu Jan 7
18:20:47 2016
@@ -169,6 +169,18 @@ public:
void
SetInteractive (bool b);
+
+ bool
+ GetAbnormalStopWasExpected() const
+ {
+ return m_abnormal_stop_was_expected;
+ }
+
+ void
+ SetAbnormalStopWasExpected(bool signal_was_expected)
+ {
+ m_abnormal_stop_was_expected = signal_was_expected;
+ }
private:
enum
@@ -182,7 +194,13 @@ private:
lldb::ReturnStatus m_status;
bool m_did_change_process_state;
- bool m_interactive; // If true, then the input handle from the debugger
will be hooked up
+ bool m_interactive; // If true, then the input handle from the
debugger will be hooked up
+ bool m_abnormal_stop_was_expected; // This is to support
eHandleCommandFlagStopOnCrash vrs. attach.
+ // The attach command often ends up
with the process stopped due to a signal.
+ // Normally that would mean stop on
crash should halt batch execution, but we
+ // obviously don't want that for
attach. Using this flag, the attach command
+ // (and anything else for which this
is relevant) can say that the signal is
+ // expected, and batch command
execution can continue.
};
} // namespace lldb_private
Modified:
lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
Thu Jan 7 18:20:47 2016
@@ -14,21 +14,12 @@ class DriverBatchModeTest (TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfRemote # test not remote-ready llvm.org/pr24813
- @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
- @expectedFlakeyLinux("llvm.org/pr25172")
- @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for
windows")
- def test_driver_batch_mode(self):
- """Test that the lldb driver's batch mode works correctly."""
- self.build()
- self.setTearDownCleanup()
- self.batch_mode()
-
def setUp(self):
# Call super's setUp().
TestBase.setUp(self)
# Our simple source filename.
self.source = 'main.c'
+ self.victim = None
def expect_string (self, string):
import pexpect
@@ -40,12 +31,20 @@ class DriverBatchModeTest (TestBase):
except pexpect.TIMEOUT:
self.fail ("Timed out waiting for '%s'"%(string))
- def batch_mode (self):
+ @skipIfRemote # test not remote-ready llvm.org/pr24813
+ @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
+ @expectedFlakeyLinux("llvm.org/pr25172")
+ @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for
windows")
+ def test_batch_mode_run_crash (self):
+ """Test that the lldb driver's batch mode works correctly."""
+ self.build()
+ self.setTearDownCleanup()
+
import pexpect
exe = os.path.join(os.getcwd(), "a.out")
prompt = "(lldb) "
- # First time through, pass CRASH so the process will crash and stop in
batch mode.
+ # Pass CRASH so the process will crash and stop in batch mode.
run_commands = ' -b -o "break set -n main" -o "run" -o "continue" -k
"frame var touch_me_not"'
self.child = pexpect.spawn('%s %s %s %s -- CRASH' %
(lldbtest_config.lldbExec, self.lldbOption, run_commands, exe))
child = self.child
@@ -68,7 +67,21 @@ class DriverBatchModeTest (TestBase):
self.deletePexpectChild()
- # Now do it again, and see make sure if we don't crash, we quit:
+
+ @skipIfRemote # test not remote-ready llvm.org/pr24813
+ @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
+ @expectedFlakeyLinux("llvm.org/pr25172")
+ @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for
windows")
+ def test_batch_mode_run_exit (self):
+ """Test that the lldb driver's batch mode works correctly."""
+ self.build()
+ self.setTearDownCleanup()
+
+ import pexpect
+ exe = os.path.join(os.getcwd(), "a.out")
+ prompt = "(lldb) "
+
+ # Now do it again, and make sure if we don't crash, we quit:
run_commands = ' -b -o "break set -n main" -o "run" -o "continue" '
self.child = pexpect.spawn('%s %s %s %s -- NOCRASH' %
(lldbtest_config.lldbExec, self.lldbOption, run_commands, exe))
child = self.child
@@ -87,3 +100,69 @@ class DriverBatchModeTest (TestBase):
index = self.child.expect([pexpect.EOF, pexpect.TIMEOUT])
self.assertTrue(index == 0, "lldb didn't close on successful batch
completion.")
+ def closeVictim(self):
+ if self.victim != None:
+ self.victim.close()
+ self.victim = None
+
+ @skipIfRemote # test not remote-ready llvm.org/pr24813
+ @expectedFlakeyFreeBSD("llvm.org/pr25172 fails rarely on the buildbot")
+ @expectedFlakeyLinux("llvm.org/pr25172")
+ @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for
windows")
+ def test_batch_mode_attach_exit (self):
+ """Test that the lldb driver's batch mode works correctly."""
+ self.build()
+ self.setTearDownCleanup()
+
+ import pexpect
+ exe = os.path.join(os.getcwd(), "a.out")
+ prompt = "(lldb) "
+
+ # Finally, start up the process by hand, attach to it, and wait for
its completion.
+ # Attach is funny, since it looks like it stops with a signal on most
Unixen so
+ # care must be taken not to treat that as a reason to exit batch mode.
+
+ # Start up the process by hand and wait for it to get to the wait loop.
+
+ self.victim = pexpect.spawn('%s WAIT' %(exe))
+ if self.victim == None:
+ self.fail("Could not spawn ", exe, ".")
+
+ self.addTearDownHook (self.closeVictim)
+
+ if self.TraceOn():
+ self.victim.logfile_read = sys.stdout
+
+ self.victim.expect("PID: ([0-9]+) END")
+ if self.victim.match == None:
+ self.fail("Couldn't get the target PID.")
+
+ victim_pid = int(self.victim.match.group(1))
+
+ self.victim.expect("Waiting")
+
+ run_commands = ' -b -o "process attach -p %d" -o "breakpoint set -p
\'Stop here to unset keep_waiting\' -N keep_waiting" -o "continue" -o "break
delete keep_waiting" -o "expr keep_waiting = 0" -o "continue" ' % (victim_pid)
+ self.child = pexpect.spawn('%s %s %s %s' % (lldbtest_config.lldbExec,
self.lldbOption, run_commands, exe))
+
+ child = self.child
+ # Turn on logging for what the child sends back.
+ if self.TraceOn():
+ child.logfile_read = sys.stdout
+
+ # We should see the "run":
+ self.expect_string ("attach")
+
+ self.expect_string(prompt + "continue")
+
+ self.expect_string(prompt + "continue")
+
+ # Then we should see the process exit:
+ self.expect_string ("Process %d exited with status"%(victim_pid))
+
+ victim_index = self.victim.expect([pexpect.EOF, pexpect.TIMEOUT])
+ self.assertTrue(victim_index == 0, "Victim didn't really exit.")
+
+ index = self.child.expect([pexpect.EOF, pexpect.TIMEOUT])
+ self.assertTrue(index == 0, "lldb didn't close on successful batch
completion.")
+
+
Modified: lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/main.c
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/main.c?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/main.c
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/main.c Thu Jan
7 18:20:47 2016
@@ -1,10 +1,33 @@
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
int
main (int argc, char **argv)
{
- if (argc >= 2 && strcmp (argv[1], "CRASH") == 0)
+ int do_crash = 0;
+ int do_wait = 0;
+
+ for (int idx = 1; idx < argc; idx++)
+ {
+ if (strcmp(argv[idx], "CRASH") == 0)
+ do_crash = 1;
+ if (strcmp(argv[idx], "WAIT") == 0)
+ do_wait = 1;
+ }
+ printf("PID: %d END\n", getpid());
+
+ if (do_wait)
+ {
+ int keep_waiting = 1;
+ while (keep_waiting)
+ {
+ printf ("Waiting\n");
+ sleep(1); // Stop here to unset keep_waiting
+ }
+ }
+
+ if (do_crash)
{
char *touch_me_not = (char *) 0;
printf ("About to crash.\n");
Modified: lldb/trunk/source/Commands/CommandObjectProcess.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectProcess.cpp?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectProcess.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectProcess.cpp Thu Jan 7 18:20:47 2016
@@ -550,6 +550,7 @@ protected:
result.AppendMessage(stream.GetData());
result.SetStatus (eReturnStatusSuccessFinishNoResult);
result.SetDidChangeProcessState (true);
+ result.SetAbnormalStopWasExpected(true);
}
else
{
Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Thu Jan 7 18:20:47
2016
@@ -3038,7 +3038,10 @@ CommandInterpreter::IOHandlerInputComple
for (ThreadSP thread_sp :
process_sp->GetThreadList().Threads())
{
StopReason reason = thread_sp->GetStopReason();
- if (reason == eStopReasonSignal || reason ==
eStopReasonException || reason == eStopReasonInstrumentation)
+ if ((reason == eStopReasonSignal
+ || reason == eStopReasonException
+ || reason == eStopReasonInstrumentation)
+ && !result.GetAbnormalStopWasExpected())
{
should_stop = true;
break;
Modified: lldb/trunk/source/Interpreter/CommandReturnObject.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandReturnObject.cpp?rev=257120&r1=257119&r2=257120&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandReturnObject.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandReturnObject.cpp Thu Jan 7 18:20:47
2016
@@ -47,7 +47,8 @@ CommandReturnObject::CommandReturnObject
m_err_stream (),
m_status (eReturnStatusStarted),
m_did_change_process_state (false),
- m_interactive (true)
+ m_interactive (true),
+ m_abnormal_stop_was_expected(false)
{
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
