update real_read

8sileus · May 13, 2024 · 73eaa60 · 73eaa60
1 parent da6f3dd
commit 73eaa60
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/zedio/io/impl/impl_buf_read.hpp b/zedio/io/impl/impl_buf_read.hpp
@@ -31,6 +31,7 @@ class ImplBufRead {
         if (!ret) [[unlikely]] {
             co_return std::unexpected{ret.error()};
         }
+        static_cast<B *>(this)->r_stream_.w_increase(ret.value());
         co_return Result<void>{};
     }
 
@@ -100,24 +101,18 @@ class ImplBufRead {
     template <bool eof_is_error, class Pred>
         requires std::is_invocable_v<Pred>
     auto real_read(std::span<char> buf, Pred pred) -> zedio::async::Task<Result<std::size_t>> {
-        if (static_cast<B *>(this)->r_stream_.capacity() < buf.size_bytes()) {
-            auto len = static_cast<B *>(this)->r_stream_.write_to(buf);
-            buf = buf.subspan(len, buf.size_bytes() - len);
-            co_return co_await static_cast<B *>(this)->io_.read(buf);
-        }
-
         if (pred()) {
             co_return static_cast<B *>(this)->r_stream_.write_to(buf);
         }
 
-        if (static_cast<B *>(this)->r_stream_.w_remaining() < buf.size_bytes()) {
-            static_cast<B *>(this)->r_stream_.reset_data();
-        }
-
-        assert(static_cast<B *>(this)->r_stream_.w_remaining() >= buf.size_bytes());
-
         Result<std::size_t> ret;
         while (true) {
+            if (static_cast<B *>(this)->r_stream_.r_remaining()
+                    + static_cast<B *>(this)->r_stream_.w_remaining()
+                < buf.size_bytes()) {
+                static_cast<B *>(this)->r_stream_.reset_data();
+            }
+
             ret = co_await static_cast<B *>(this)->io_.read(
                 static_cast<B *>(this)->r_stream_.w_slice());
             if (!ret) [[unlikely]] {