From f9ef60d2369f0798e8b939ce1798a7a4f0234b40 Mon Sep 17 00:00:00 2001 From: Johnny Chen Date: Wed, 23 May 2012 22:34:34 +0000 Subject: [PATCH] Add SBProcess::GetNumSupportedHardwareWatchpoints() API and export it through the Python scripting bridge. Add/modify some test cases. llvm-svn: 157353 --- lldb/include/lldb/API/SBProcess.h | 3 +++ lldb/scripts/Python/interface/SBProcess.i | 3 +++ lldb/source/API/SBProcess.cpp | 23 ++++++++++++++++++++ .../python_api/default-constructor/sb_process.py | 1 + lldb/test/python_api/process/TestProcessAPI.py | 25 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/lldb/include/lldb/API/SBProcess.h b/lldb/include/lldb/API/SBProcess.h index 5bff877..f8ad294 100644 --- a/lldb/include/lldb/API/SBProcess.h +++ b/lldb/include/lldb/API/SBProcess.h @@ -188,6 +188,9 @@ public: GetDescription (lldb::SBStream &description); uint32_t + GetNumSupportedHardwareWatchpoints (lldb::SBError &error) const; + + uint32_t LoadImage (lldb::SBFileSpec &image_spec, lldb::SBError &error); lldb::SBError diff --git a/lldb/scripts/Python/interface/SBProcess.i b/lldb/scripts/Python/interface/SBProcess.i index 2069adf..049d2a1 100644 --- a/lldb/scripts/Python/interface/SBProcess.i +++ b/lldb/scripts/Python/interface/SBProcess.i @@ -282,6 +282,9 @@ public: GetDescription (lldb::SBStream &description); uint32_t + GetNumSupportedHardwareWatchpoints (lldb::SBError &error) const; + + uint32_t LoadImage (lldb::SBFileSpec &image_spec, lldb::SBError &error); lldb::SBError diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp index 813b41c..67027a6 100644 --- a/lldb/source/API/SBProcess.cpp +++ b/lldb/source/API/SBProcess.cpp @@ -1001,6 +1001,29 @@ SBProcess::GetDescription (SBStream &description) } uint32_t +SBProcess::GetNumSupportedHardwareWatchpoints (lldb::SBError &sb_error) const +{ + LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + + uint32_t num = 0; + ProcessSP process_sp(GetSP()); + if (process_sp) + { + Mutex::Locker api_locker (process_sp->GetTarget().GetAPIMutex()); + sb_error.SetError(process_sp->GetWatchpointSupportInfo (num)); + LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + if (log) + log->Printf ("SBProcess(%p)::GetNumSupportedHardwareWatchpoints () => %u", + process_sp.get(), num); + } + else + { + sb_error.SetErrorString ("SBProcess is invalid"); + } + return num; +} + +uint32_t SBProcess::LoadImage (lldb::SBFileSpec &sb_image_spec, lldb::SBError &sb_error) { ProcessSP process_sp(GetSP()); diff --git a/lldb/test/python_api/default-constructor/sb_process.py b/lldb/test/python_api/default-constructor/sb_process.py index ce4c5c6b..38ee86f 100644 --- a/lldb/test/python_api/default-constructor/sb_process.py +++ b/lldb/test/python_api/default-constructor/sb_process.py @@ -44,5 +44,6 @@ def fuzz_obj(obj): obj.LoadImage(lldb.SBFileSpec(), error) obj.UnloadImage(0) obj.Clear() + obj.GetNumSupportedHardwareWatchpoints(error) for thread in obj: print thread diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py index 95c964c..4718b27 100644 --- a/lldb/test/python_api/process/TestProcessAPI.py +++ b/lldb/test/python_api/process/TestProcessAPI.py @@ -63,6 +63,12 @@ class ProcessAPITestCase(TestBase): self.buildDefault() self.remote_launch_should_fail() + @python_api_test + def test_get_num_supported_hardware_watchpoints(self): + """Test SBProcess.GetNumSupportedHardwareWatchpoints() API with a process.""" + self.buildDefault() + self.get_num_supported_hardware_watchpoints() + def setUp(self): # Call super's setUp(). TestBase.setUp(self) @@ -310,6 +316,25 @@ class ProcessAPITestCase(TestBase): success = process.RemoteLaunch(None, None, None, None, None, None, 0, False, error) self.assertTrue(not success, "RemoteLaunch() should fail for process state != eStateConnected") + def get_num_supported_hardware_watchpoints(self): + """Test SBProcess.GetNumSupportedHardwareWatchpoints() API with a process.""" + exe = os.path.join(os.getcwd(), "a.out") + self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) + + target = self.dbg.CreateTarget(exe) + self.assertTrue(target, VALID_TARGET) + + breakpoint = target.BreakpointCreateByLocation("main.cpp", self.line) + self.assertTrue(breakpoint, VALID_BREAKPOINT) + + # Launch the process, and do not stop at the entry point. + process = target.LaunchSimple(None, None, os.getcwd()) + + error = lldb.SBError(); + num = process.GetNumSupportedHardwareWatchpoints(error) + if self.TraceOn() and error.Success(): + print "Number of supported hardware watchpoints: %d" % num + if __name__ == '__main__': import atexit -- 2.7.4