Rename sampling monitor back to resource monitor

Author: huuanhhuyn

cpp/include/raft/core/detail/nvtx_range_stack.hpp

@@ -99,8 +99,7 @@ struct nvtx_range_name_stack {
    * Innermost NVTX range name and stack depth.
    * Mutex-free — ONLY safe to call from the thread that owns this stack.
    */
-  [[nodiscard]] auto current_name_and_depth() const noexcept
-    -> std::pair<std::string, std::size_t>
+  [[nodiscard]] auto current_name_and_depth() const noexcept -> std::pair<std::string, std::size_t>
   {
     if (stack_.empty()) { return {"", 0}; }
     return {stack_.back().second, stack_.size()};

cpp/include/raft/core/memory_logging_resources.hpp

@@ -91,8 +91,8 @@ class memory_logging_resources : public resources {
 
  private:
   memory_logging_resources(const resources* existing,
-                            std::unique_ptr<std::ofstream> owned_stream,
-                            std::ostream* out_override)
+                           std::unique_ptr<std::ofstream> owned_stream,
+                           std::ostream* out_override)
     : resources(existing ? *existing : resources{}),
       owned_stream_(std::move(owned_stream)),
       old_host_(raft::mr::get_default_host_resource()),
@@ -186,8 +186,7 @@ class memory_logging_resources : public resources {
     {
       int id = recorder_->register_source("large_workspace");
       raft::resource::set_large_workspace_resource(
-        *this,
-        raft::mr::recording_adaptor<rmm::device_async_resource_ref>{lws_ref, queue, id});
+        *this, raft::mr::recording_adaptor<rmm::device_async_resource_ref>{lws_ref, queue, id});
     }
 
     recorder_->start();

cpp/include/raft/mr/notifying_adaptor.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
  * SPDX-License-Identifier: Apache-2.0
  */
 #pragma once
@@ -67,7 +67,7 @@ class notifier {
  *        or deallocation.
  *
  * Forwards all calls to the upstream resource, then calls notifier::notify().
- * A separate consumer (e.g. sampling_monitor) can call notifier::wait() to
+ * A separate consumer (e.g. resource_monitor) can call notifier::wait() to
  * block until activity occurs.
  *
  * @tparam Upstream  Stored by value.  Use a concrete resource type for owning

cpp/include/raft/mr/recording_adaptor.hpp

@@ -6,8 +6,8 @@
 
 #include <raft/core/detail/macros.hpp>
 #include <raft/core/detail/nvtx_range_stack.hpp>  // thread_local_current_path, thread_local_current_name_and_depth
-#include <raft/mr/recording_monitor.hpp>          // allocation_event, allocation_event_queue
-#include <raft/mr/statistics_adaptor.hpp>         // resource_stats (atomic counters, reused)
+#include <raft/mr/recording_monitor.hpp>   // allocation_event, allocation_event_queue
+#include <raft/mr/statistics_adaptor.hpp>  // resource_stats (atomic counters, reused)
 
 #include <cuda/memory_resource>
 #include <cuda/stream_ref>
@@ -47,7 +47,8 @@ class recording_adaptor : public cuda::forward_property<recording_adaptor<Upstre
 
   // Record the alloc-time NVTX path for this pointer.
   // Called on the allocating thread — mutex-free NVTX read is safe.
-  // The alloc_map_ mutex still protects the shared map from concurrent alloc/dealloc across threads.
+  // The alloc_map_ mutex still protects the shared map from concurrent alloc/dealloc across
+  // threads.
   auto record_allocation(void* ptr) noexcept -> std::string
   {
     std::string path = "";

cpp/include/raft/mr/sampling_monitor.hpp cpp/include/raft/mr/resource_monitor.hppcpp/include/raft/mr/sampling_monitor.hpp renamed to cpp/include/raft/mr/resource_monitor.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
  * SPDX-License-Identifier: Apache-2.0
  */
 #pragma once
@@ -39,7 +39,7 @@ namespace mr {
  *
  * start() and stop() are idempotent.
  */
-class sampling_monitor {
+class resource_monitor {
   std::ostream& out_;
   std::chrono::steady_clock::duration sample_interval_;
   std::shared_ptr<notifier> notifier_;
@@ -55,18 +55,18 @@ class sampling_monitor {
    * @param out             Output stream for CSV rows.
    * @param sample_interval Minimum time between successive samples.
    */
-  explicit sampling_monitor(std::ostream& out, std::chrono::steady_clock::duration sample_interval)
+  explicit resource_monitor(std::ostream& out, std::chrono::steady_clock::duration sample_interval)
     : out_(out),
       sample_interval_(sample_interval),
       notifier_(std::make_shared<notifier>()),
       nvtx_range_(raft::common::nvtx::thread_local_current_range())
   {
   }
 
-  ~sampling_monitor() { stop(); }
+  ~resource_monitor() { stop(); }
 
-  sampling_monitor(sampling_monitor const&)            = delete;
-  sampling_monitor& operator=(sampling_monitor const&) = delete;
+  resource_monitor(resource_monitor const&)            = delete;
+  resource_monitor& operator=(resource_monitor const&) = delete;
 
   /**
    * @brief Shared notifier for notifying_adaptor instances.

cpp/tests/core/allocation_tracking.cpp

@@ -1,11 +1,11 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <raft/mr/host_memory_resource.hpp>
 #include <raft/mr/notifying_adaptor.hpp>
-#include <raft/mr/sampling_monitor.hpp>
+#include <raft/mr/resource_monitor.hpp>
 #include <raft/mr/statistics_adaptor.hpp>
 
 #include <gtest/gtest.h>
@@ -69,7 +69,7 @@ TEST(AllocationReport, WritesCSVOnDirty)
   using namespace std::chrono_literals;
 
   std::ostringstream oss;
-  raft::mr::sampling_monitor report(oss, 1ms);
+  raft::mr::resource_monitor report(oss, 1ms);
 
   auto host_stats   = std::make_shared<raft::mr::resource_stats>();
   auto pinned_stats = std::make_shared<raft::mr::resource_stats>();
@@ -98,7 +98,7 @@ TEST(AllocationReport, StartStopIdempotent)
   using namespace std::chrono_literals;
 
   std::ostringstream oss;
-  raft::mr::sampling_monitor report(oss, 1ms);
+  raft::mr::resource_monitor report(oss, 1ms);
 
   auto stats = std::make_shared<raft::mr::resource_stats>();
   report.register_source("test", stats);
@@ -124,7 +124,7 @@ TEST(AllocationReport, DestructorCallsStop)
   std::ostringstream oss;
   {
     auto stats = std::make_shared<raft::mr::resource_stats>();
-    raft::mr::sampling_monitor report(oss, 1ms);
+    raft::mr::resource_monitor report(oss, 1ms);
     report.register_source("test", stats);
 
     stats->record_allocate(256);