Add SB API class SBWatchpointLocation and some extra methods to the SBTarget class to

iterate on the available watchpoint locations and to perform watchpoint manipulations.

I still need to export the SBWatchpointLocation class as well as the added watchpoint
manipulation methods to the Python interface.  And write test cases for them.

llvm-svn: 140575

lldb/source/API/SBTarget.cpp

@@ -766,27 +766,6 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex,
     return sb_bp;
 }
 
-SBBreakpoint
-SBTarget::FindBreakpointByID (break_id_t bp_id)
-{
-    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    SBBreakpoint sb_breakpoint;
-    if (m_opaque_sp && bp_id != LLDB_INVALID_BREAK_ID)
-    {
-        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
-        *sb_breakpoint = m_opaque_sp->GetBreakpointByID (bp_id);
-    }
-
-    if (log)
-    {
-        log->Printf ("SBTarget(%p)::FindBreakpointByID (bp_id=%d) => SBBreakpoint(%p)", 
-                     m_opaque_sp.get(), (uint32_t) bp_id, sb_breakpoint.get());
-    }
-
-    return sb_breakpoint;
-}
-
 uint32_t
 SBTarget::GetNumBreakpoints () const
 {
@@ -830,6 +809,27 @@ SBTarget::BreakpointDelete (break_id_t bp_id)
     return result;
 }
 
+SBBreakpoint
+SBTarget::FindBreakpointByID (break_id_t bp_id)
+{
+    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    SBBreakpoint sb_breakpoint;
+    if (m_opaque_sp && bp_id != LLDB_INVALID_BREAK_ID)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        *sb_breakpoint = m_opaque_sp->GetBreakpointByID (bp_id);
+    }
+
+    if (log)
+    {
+        log->Printf ("SBTarget(%p)::FindBreakpointByID (bp_id=%d) => SBBreakpoint(%p)", 
+                     m_opaque_sp.get(), (uint32_t) bp_id, sb_breakpoint.get());
+    }
+
+    return sb_breakpoint;
+}
+
 bool
 SBTarget::EnableAllBreakpoints ()
 {
@@ -866,6 +866,106 @@ SBTarget::DeleteAllBreakpoints ()
     return false;
 }
 
+uint32_t
+SBTarget::GetNumWatchpointLocations () const
+{
+    if (m_opaque_sp)
+    {
+        // The breakpoint list is thread safe, no need to lock
+        return m_opaque_sp->GetWatchpointLocationList().GetSize();
+    }
+    return 0;
+}
+
+SBWatchpointLocation
+SBTarget::GetWatchpointLocationAtIndex (uint32_t idx) const
+{
+    SBWatchpointLocation sb_watchpoint_location;
+    if (m_opaque_sp)
+    {
+        // The breakpoint list is thread safe, no need to lock
+        *sb_watchpoint_location = m_opaque_sp->GetWatchpointLocationList().GetByIndex(idx);
+    }
+    return sb_watchpoint_location;
+}
+
+bool
+SBTarget::WatchpointLocationDelete (watch_id_t wp_id)
+{
+    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    bool result = false;
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        result = m_opaque_sp->RemoveWatchpointLocationByID (wp_id);
+    }
+
+    if (log)
+    {
+        log->Printf ("SBTarget(%p)::WatchpointLocationDelete (wp_id=%d) => %i", m_opaque_sp.get(), (uint32_t) wp_id, result);
+    }
+
+    return result;
+}
+
+SBWatchpointLocation
+SBTarget::FindWatchpointLocationByID (watch_id_t wp_id)
+{
+    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    SBWatchpointLocation sb_watchpoint_location;
+    if (m_opaque_sp && wp_id != LLDB_INVALID_WATCH_ID)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        *sb_watchpoint_location = m_opaque_sp->GetWatchpointLocationList().FindByID(wp_id);
+    }
+
+    if (log)
+    {
+        log->Printf ("SBTarget(%p)::FindWatchpointLocationByID (bp_id=%d) => SBWatchpointLocation(%p)", 
+                     m_opaque_sp.get(), (uint32_t) wp_id, sb_watchpoint_location.get());
+    }
+
+    return sb_watchpoint_location;
+}
+
+bool
+SBTarget::EnableAllWatchpointLocations ()
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        m_opaque_sp->EnableAllWatchpointLocations ();
+        return true;
+    }
+    return false;
+}
+
+bool
+SBTarget::DisableAllWatchpointLocations ()
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        m_opaque_sp->DisableAllWatchpointLocations ();
+        return true;
+    }
+    return false;
+}
+
+bool
+SBTarget::DeleteAllWatchpointLocations ()
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetAPIMutex());
+        m_opaque_sp->RemoveAllWatchpointLocations ();
+        return true;
+    }
+    return false;
+}
+
 
 lldb::SBModule
 SBTarget::AddModule (const char *path,

lldb/source/API/SBWatchpointLocation.cpp

@@ -0,0 +1,183 @@
+//===-- SBWatchpointLocation.cpp --------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/API/SBWatchpointLocation.h"
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBStream.h"
+
+#include "lldb/lldb-types.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/Breakpoint/WatchpointLocation.h"
+#include "lldb/Breakpoint/WatchpointLocationList.h"
+#include "lldb/Core/Log.h"
+#include "lldb/Core/Stream.h"
+#include "lldb/Core/StreamFile.h"
+#include "lldb/Target/Target.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+
+SBWatchpointLocation::SBWatchpointLocation () :
+    m_opaque_sp ()
+{
+}
+
+SBWatchpointLocation::SBWatchpointLocation (const lldb::WatchpointLocationSP &watch_loc_sp) :
+    m_opaque_sp (watch_loc_sp)
+{
+    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    if (log)
+    {
+        SBStream sstr;
+        GetDescription (sstr, lldb::eDescriptionLevelBrief);
+        log->Printf ("SBWatchpointLocation::SBWatchpointLocation (const lldb::WatchpointLocationsSP &watch_loc_sp"
+                     "=%p)  => this.sp = %p (%s)", watch_loc_sp.get(), m_opaque_sp.get(), sstr.GetData());
+    }
+}
+
+SBWatchpointLocation::SBWatchpointLocation(const SBWatchpointLocation &rhs) :
+    m_opaque_sp (rhs.m_opaque_sp)
+{
+}
+
+const SBWatchpointLocation &
+SBWatchpointLocation::operator = (const SBWatchpointLocation &rhs)
+{
+    if (this != &rhs)
+        m_opaque_sp = rhs.m_opaque_sp;
+    return *this;
+}
+
+
+SBWatchpointLocation::~SBWatchpointLocation ()
+{
+}
+
+bool
+SBWatchpointLocation::IsValid() const
+{
+    return m_opaque_sp.get() != NULL;
+}
+
+addr_t
+SBWatchpointLocation::GetWatchAddress () const
+{
+    addr_t ret_addr = LLDB_INVALID_ADDRESS;
+
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        ret_addr = m_opaque_sp->GetLoadAddress();
+    }
+
+    return ret_addr;
+}
+
+size_t
+SBWatchpointLocation::GetWatchSize () const
+{
+    size_t watch_size = 0;
+
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        watch_size = m_opaque_sp->GetByteSize();
+    }
+
+    return watch_size;
+}
+
+void
+SBWatchpointLocation::SetEnabled (bool enabled)
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        m_opaque_sp->SetEnabled (enabled);
+    }
+}
+
+bool
+SBWatchpointLocation::IsEnabled ()
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        return m_opaque_sp->IsEnabled();
+    }
+    else
+        return false;
+}
+
+uint32_t
+SBWatchpointLocation::GetIgnoreCount ()
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        return m_opaque_sp->GetIgnoreCount();
+    }
+    else
+        return 0;
+}
+
+void
+SBWatchpointLocation::SetIgnoreCount (uint32_t n)
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        m_opaque_sp->SetIgnoreCount (n);
+    }
+}
+
+bool
+SBWatchpointLocation::GetDescription (SBStream &description, DescriptionLevel level)
+{
+    if (m_opaque_sp)
+    {
+        Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
+        description.ref();
+        m_opaque_sp->GetDescription (description.get(), level);
+        description.get()->EOL();
+    }
+    else
+        description.Printf ("No value");
+
+    return true;
+}
+
+lldb_private::WatchpointLocation *
+SBWatchpointLocation::operator->() const
+{
+    return m_opaque_sp.get();
+}
+
+lldb_private::WatchpointLocation *
+SBWatchpointLocation::get() const
+{
+    return m_opaque_sp.get();
+}
+
+lldb::WatchpointLocationSP &
+SBWatchpointLocation::operator *()
+{
+    return m_opaque_sp;
+}
+
+const lldb::WatchpointLocationSP &
+SBWatchpointLocation::operator *() const
+{
+    return m_opaque_sp;
+}
+