refactor(logging): use span instead of data+size params

Author: strager

src/quick-lint-js/debug/debug-server.cpp

@@ -22,6 +22,7 @@
 #include <quick-lint-js/json.h>
 #include <quick-lint-js/logging/trace-flusher.h>
 #include <quick-lint-js/logging/trace-writer.h>
+#include <quick-lint-js/port/span.h>
 #include <quick-lint-js/port/thread.h>
 #include <quick-lint-js/util/binary-writer.h>
 #include <quick-lint-js/util/instance-tracker.h>
@@ -43,12 +44,11 @@ class trace_flusher_websocket_backend final : public trace_flusher_backend {
   void trace_thread_end(trace_flusher_thread_index) override {}
 
   void trace_thread_write_data(trace_flusher_thread_index thread_index,
-                               const std::byte *data,
-                               std::size_t size) override {
+                               span<const std::byte> data) override {
     std::lock_guard<mutex> lock(this->mutex_);
 
     async_byte_queue &queue = this->thread_queues_[thread_index];
-    queue.append_copy(data, size);
+    queue.append_copy(data.data(), narrow_cast<std::size_t>(data.size()));
     queue.commit();
     server_->wake_up_server_thread();
   }

src/quick-lint-js/logging/trace-flusher-directory-backend.cpp

@@ -14,6 +14,7 @@
 #include <quick-lint-js/logging/log.h>
 #include <quick-lint-js/logging/trace-flusher.h>
 #include <quick-lint-js/logging/trace-metadata.h>
+#include <quick-lint-js/port/span.h>
 #include <string>
 #include <utility>
 
@@ -50,16 +51,16 @@ void trace_flusher_directory_backend::trace_thread_end(
 }
 
 void trace_flusher_directory_backend::trace_thread_write_data(
-    trace_flusher_thread_index thread_index, const std::byte *data,
-    std::size_t size) {
+    trace_flusher_thread_index thread_index, span<const std::byte> data) {
   auto it = this->thread_files_.find(thread_index);
   if (it == this->thread_files_.end()) {
     // Opening the file failed. Don't write anything.
     return;
   }
   platform_file_ref file = it->second.ref();
 
-  auto write_result = file.write_full(data, size);
+  auto write_result =
+      file.write_full(data.data(), narrow_cast<std::size_t>(data.size()));
   if (!write_result.ok()) {
     QLJS_DEBUG_LOG("warning: failed to append to trace stream file: %s\n",
                    write_result.error_to_string().c_str());

src/quick-lint-js/logging/trace-flusher.cpp

@@ -20,6 +20,7 @@
 #include <quick-lint-js/logging/trace-flusher.h>
 #include <quick-lint-js/logging/trace-writer.h>
 #include <quick-lint-js/port/process.h>
+#include <quick-lint-js/port/span.h>
 #include <quick-lint-js/port/thread.h>
 #include <quick-lint-js/port/vector-erase.h>
 #include <quick-lint-js/util/algorithm.h>
@@ -218,7 +219,9 @@ void trace_flusher::flush_one_thread_sync(std::unique_lock<mutex>&,
   t.stream_queue.take_committed(
       [&](const std::byte* data, std::size_t size) {
         for (trace_flusher_backend* backend : this->backends_) {
-          backend->trace_thread_write_data(t.thread_index, data, size);
+          backend->trace_thread_write_data(
+              t.thread_index,
+              span<const std::byte>(data, narrow_cast<span_size>(size)));
         }
       },
       [] {});
@@ -255,7 +258,9 @@ void trace_flusher::write_thread_header_to_backend(
   temp_queue.commit();
   temp_queue.take_committed(
       [&](const std::byte* data, std::size_t size) {
-        backend->trace_thread_write_data(t.thread_index, data, size);
+        backend->trace_thread_write_data(
+            t.thread_index,
+            span<const std::byte>(data, narrow_cast<span_size>(size)));
       },
       [] {});
 }

src/quick-lint-js/logging/trace-flusher.h

@@ -15,6 +15,7 @@
 #include <quick-lint-js/container/hash-map.h>
 #include <quick-lint-js/container/result.h>
 #include <quick-lint-js/io/file.h>
+#include <quick-lint-js/port/span.h>
 #include <quick-lint-js/port/thread.h>
 #include <string>
 #include <vector>
@@ -57,8 +58,7 @@ class trace_flusher_backend {
   //
   // Called from any thread.
   virtual void trace_thread_write_data(trace_flusher_thread_index thread_index,
-                                       const std::byte* data,
-                                       std::size_t size) = 0;
+                                       span<const std::byte> data) = 0;
 };
 
 class trace_flusher_directory_backend final : public trace_flusher_backend {
@@ -68,8 +68,7 @@ class trace_flusher_directory_backend final : public trace_flusher_backend {
   void trace_thread_begin(trace_flusher_thread_index thread_index) override;
   void trace_thread_end(trace_flusher_thread_index thread_index) override;
   void trace_thread_write_data(trace_flusher_thread_index thread_index,
-                               const std::byte* data,
-                               std::size_t size) override;
+                               span<const std::byte> data) override;
 
   // Creates a 'metadata' file in the given directory.
   //

test/test-trace-flusher.cpp

@@ -22,6 +22,7 @@
 #include <quick-lint-js/port/char8.h>
 #include <quick-lint-js/port/have.h>
 #include <quick-lint-js/port/process.h>
+#include <quick-lint-js/port/span.h>
 #include <quick-lint-js/port/thread.h>
 #include <quick-lint-js/port/warning.h>
 #include <quick-lint-js/trace-stream-reader-mock.h>
@@ -120,15 +121,15 @@ class spy_trace_flusher_backend final : public trace_flusher_backend {
   }
 
   void trace_thread_write_data(trace_flusher_thread_index thread_index,
-                               const std::byte* data,
-                               std::size_t size) override {
+                               span<const std::byte> data) override {
     std::lock_guard<mutex> lock(this->mutex_);
 
     thread_state& t = this->thread_states[thread_index];
     EXPECT_GE(t.begin_calls, 1);
     EXPECT_EQ(t.end_calls, 0);
 
-    t.written_data.append(reinterpret_cast<const char*>(data), size);
+    t.written_data.append(reinterpret_cast<const char*>(data.data()),
+                          narrow_cast<std::size_t>(data.size()));
     t.write_calls += 1;
   }