Merge tag 'v0.22.4'

release v0.22.4

src/util/ForeignFifoBuffer.hxx

@@ -235,7 +235,7 @@ public:
 			w = Write();
 		}
 
-		size_t n = std::min(r.size, w.size);
+		const auto n = std::min(r.size, w.size);
 
 		std::move(r.data, r.data + n, w.data);
 		Append(n);

src/util/PeakBuffer.cxx

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-PeakBuffer::~PeakBuffer()
+PeakBuffer::~PeakBuffer() noexcept
 {
 	delete normal_buffer;
 	delete peak_buffer;
@@ -57,7 +57,7 @@ PeakBuffer::Read() const noexcept
 }
 
 void
-PeakBuffer::Consume(size_t length) noexcept
+PeakBuffer::Consume(std::size_t length) noexcept
 {
 	if (normal_buffer != nullptr && !normal_buffer->empty()) {
 		normal_buffer->Consume(length);
@@ -75,25 +75,25 @@ PeakBuffer::Consume(size_t length) noexcept
 	}
 }
 
-static size_t
-AppendTo(DynamicFifoBuffer<uint8_t> &buffer,
+static std::size_t
+AppendTo(DynamicFifoBuffer<std::byte> &buffer,
 	 const void *data, size_t length) noexcept
 {
 	assert(data != nullptr);
 	assert(length > 0);
 
-	size_t total = 0;
+	std::size_t total = 0;
 
 	do {
 		const auto p = buffer.Write();
 		if (p.empty())
 			break;
 
-		const size_t nbytes = std::min(length, p.size);
+		const std::size_t nbytes = std::min(length, p.size);
 		memcpy(p.data, data, nbytes);
 		buffer.Append(nbytes);
 
-		data = (const uint8_t *)data + nbytes;
+		data = (const std::byte *)data + nbytes;
 		length -= nbytes;
 		total += nbytes;
 	} while (length > 0);
@@ -102,22 +102,22 @@ AppendTo(DynamicFifoBuffer<uint8_t> &buffer,
 }
 
 bool
-PeakBuffer::Append(const void *data, size_t length)
+PeakBuffer::Append(const void *data, std::size_t length)
 {
 	if (length == 0)
 		return true;
 
 	if (peak_buffer != nullptr && !peak_buffer->empty()) {
-		size_t nbytes = AppendTo(*peak_buffer, data, length);
+		std::size_t nbytes = AppendTo(*peak_buffer, data, length);
 		return nbytes == length;
 	}
 
 	if (normal_buffer == nullptr)
-		normal_buffer = new DynamicFifoBuffer<uint8_t>(normal_size);
+		normal_buffer = new DynamicFifoBuffer<std::byte>(normal_size);
 
-	size_t nbytes = AppendTo(*normal_buffer, data, length);
+	std::size_t nbytes = AppendTo(*normal_buffer, data, length);
 	if (nbytes > 0) {
-		data = (const uint8_t *)data + nbytes;
+		data = (const std::byte *)data + nbytes;
 		length -= nbytes;
 		if (length == 0)
 			return true;
@@ -125,7 +125,7 @@ PeakBuffer::Append(const void *data, size_t length)
 
 	if (peak_buffer == nullptr) {
 		if (peak_size > 0)
-			peak_buffer = new DynamicFifoBuffer<uint8_t>(peak_size);
+			peak_buffer = new DynamicFifoBuffer<std::byte>(peak_size);
 		if (peak_buffer == nullptr)
 			return false;
 	}

src/util/PeakBuffer.hxx

@@ -23,7 +23,6 @@
 #include "Compiler.h"
 
 #include <cstddef>
-#include <cstdint>
 
 template<typename T> struct WritableBuffer;
 template<typename T> class DynamicFifoBuffer;
@@ -34,16 +33,16 @@ template<typename T> class DynamicFifoBuffer;
  * kernel when it has been consumed.
  */
 class PeakBuffer {
-	size_t normal_size, peak_size;
+	std::size_t normal_size, peak_size;
 
-	DynamicFifoBuffer<uint8_t> *normal_buffer, *peak_buffer;
+	DynamicFifoBuffer<std::byte> *normal_buffer, *peak_buffer;
 
 public:
-	PeakBuffer(size_t _normal_size, size_t _peak_size)
+	PeakBuffer(std::size_t _normal_size, std::size_t _peak_size) noexcept
 		:normal_size(_normal_size), peak_size(_peak_size),
 		 normal_buffer(nullptr), peak_buffer(nullptr) {}
 
-	PeakBuffer(PeakBuffer &&other)
+	PeakBuffer(PeakBuffer &&other) noexcept
 		:normal_size(other.normal_size), peak_size(other.peak_size),
 		 normal_buffer(other.normal_buffer),
 		 peak_buffer(other.peak_buffer) {
@@ -51,20 +50,24 @@ public:
 		other.peak_buffer = nullptr;
 	}
 
-	~PeakBuffer();
+	~PeakBuffer() noexcept;
 
 	PeakBuffer(const PeakBuffer &) = delete;
 	PeakBuffer &operator=(const PeakBuffer &) = delete;
 
+	std::size_t max_size() const noexcept {
+		return normal_size + peak_size;
+	}
+
 	gcc_pure
 	bool empty() const noexcept;
 
 	gcc_pure
 	WritableBuffer<void> Read() const noexcept;
 
-	void Consume(size_t length) noexcept;
+	void Consume(std::size_t length) noexcept;
 
-	bool Append(const void *data, size_t length);
+	bool Append(const void *data, std::size_t length);
 };
 
 #endif