[Lldb-commits] [lldb] [lldb] [mostly NFC] Large WP foundation: WatchpointResources (PR #68845)

[Jonas Devlieghere via lldb-commits]

================
@@ -0,0 +1,154 @@
+//===-- WatchpointResourceList.cpp ----------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Breakpoint/WatchpointResourceList.h"
+#include "lldb/Breakpoint/WatchpointResource.h"
+#include "lldb/Utility/LLDBLog.h"
+#include "lldb/Utility/Log.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+WatchpointResourceList::WatchpointResourceList() : m_resources(), m_mutex() {}
+
+WatchpointResourceList::~WatchpointResourceList() { Clear(); }
+
+wp_resource_id_t
+WatchpointResourceList::Add(const WatchpointResourceSP &wp_res_sp) {
+  Log *log = GetLog(LLDBLog::Watchpoints);
+  std::lock_guard<std::mutex> guard(m_mutex);
+
+  LLDB_LOGF(log, "WatchpointResourceList::Add(addr 0x%" PRIx64 " size %zu)",
+            wp_res_sp->GetAddress(), wp_res_sp->GetByteSize());
+
+  // The goal is to have the wp_resource_id_t match the actual hardware
+  // watchpoint register number.  If we assume that the remote stub is
+  // setting them in the register context in the same order that they
+  // are sent from lldb, and if a watchpoint is removed and then a new
+  // one is added and gets the same register number, then we can
+  // iterate over all used IDs looking for the first unused number.
+
+  // If the Process was able to find the actual hardware watchpoint register
+  // number that was used, it can set the ID for the WatchpointResource
+  // before we get here.
+
+  if (wp_res_sp->GetID() == LLDB_INVALID_WATCHPOINT_RESOURCE_ID) {
+    std::set<wp_resource_id_t> used_ids;
+    size_t size = m_resources.size();
+    for (size_t i = 0; i < size; ++i)
+      used_ids.insert(m_resources[i]->GetID());
+
+    wp_resource_id_t best = 0;
+    for (wp_resource_id_t id : used_ids)
+      if (id == best)
+        best++;
+      else
+        break;
+
+    LLDB_LOGF(log,
+              "WatchpointResourceList::Add assigning next "
+              "available WatchpointResource ID, %u",
+              best);
+    wp_res_sp->SetID(best);
+  }
+
+  m_resources.push_back(wp_res_sp);
+  return wp_res_sp->GetID();
+}
+
+bool WatchpointResourceList::Remove(wp_resource_id_t id) {
+  std::lock_guard<std::mutex> guard(m_mutex);
+  Log *log = GetLog(LLDBLog::Watchpoints);
+  for (collection::iterator pos = m_resources.begin(); pos != m_resources.end();
+       ++pos) {
+    if ((*pos)->GetID() == id) {
+      LLDB_LOGF(log,
+                "WatchpointResourceList::Remove(addr 0x%" PRIx64 " size %zu)",
+                (*pos)->GetAddress(), (*pos)->GetByteSize());
+      m_resources.erase(pos);
+      return true;
+    }
+  }
+  return false;
+}
+
+bool WatchpointResourceList::RemoveByAddress(addr_t addr) {
+  std::lock_guard<std::mutex> guard(m_mutex);
+  Log *log = GetLog(LLDBLog::Watchpoints);
+  for (collection::iterator pos = m_resources.begin(); pos != m_resources.end();
+       ++pos) {
+    if ((*pos)->Contains(addr)) {
+      LLDB_LOGF(log,
+                "WatchpointResourceList::RemoveByAddress(addr 0x%" PRIx64
+                " size %zu)",
+                (*pos)->GetAddress(), (*pos)->GetByteSize());
+      m_resources.erase(pos);
+      return true;
+    }
+  }
+  return false;
+}
+
+WatchpointResourceSP WatchpointResourceList::FindByAddress(addr_t addr) {
+  std::lock_guard<std::mutex> guard(m_mutex);
+  for (collection::iterator pos = m_resources.begin(); pos != m_resources.end();
+       ++pos)
+    if ((*pos)->Contains(addr))
+      return *pos;
----------------
JDevlieghere wrote:

Can you use a range-based for loop here and below?

https://github.com/llvm/llvm-project/pull/68845