From 5a394da2cd793721c1441e1bbde4dc267cd8f0bb Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Wed, 28 Aug 2024 07:38:51 +0200 Subject: [PATCH] Remove read_index in deserialization packet --- common/wivrn_serialization.h | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/common/wivrn_serialization.h b/common/wivrn_serialization.h index 8e2fd24b..47978284 100644 --- a/common/wivrn_serialization.h +++ b/common/wivrn_serialization.h @@ -166,46 +166,38 @@ class deserialization_packet { std::shared_ptr memory; std::span buffer; - size_t read_index; public: - deserialization_packet() : - read_index(0) {} - explicit deserialization_packet(std::shared_ptr memory, std::span buffer, size_t skip = 0) : + deserialization_packet() = default; + explicit deserialization_packet(std::shared_ptr memory, std::span buffer) : memory(memory), - buffer(buffer), - read_index(skip) + buffer(buffer) {} void read(void * data, size_t size) { check_remaining_size(size); - memcpy(data, &buffer[read_index], size); - read_index += size; + memcpy(data, buffer.data(), size); + buffer = buffer.subspan(size); } std::span read_span(size_t size) { check_remaining_size(size); - std::span res(&buffer[read_index], size); - read_index += size; + auto res = buffer.first(size); + buffer = buffer.subspan(size); return res; } - size_t remaining() const - { - return buffer.size() - read_index; - } - bool empty() const { - return buffer.size() <= read_index; + return buffer.empty(); } void check_remaining_size(size_t min_size) const { - if (min_size > remaining()) + if (min_size > buffer.size_bytes()) throw deserialization_error(); } @@ -221,9 +213,9 @@ public: v = deserialize(); } - std::pair> steal_buffer() + std::shared_ptr steal_buffer() { - return {read_index, std::move(memory)}; + return std::move(memory); } }; @@ -677,8 +669,7 @@ struct serialization_traits static data_holder deserialize(deserialization_packet & packet) { data_holder value; - size_t size; - std::tie(size, value.c) = packet.steal_buffer(); + value.c = packet.steal_buffer(); return value; } static bool consteval is_trivially_serializable()