oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/InputStream: pass std::span<std::byte> to Read()

Browse Source
This commit is contained in:
Max Kellermann
2024-05-13 10:47:57 +02:00
parent f28d10d934
commit 34f7b38f39
66 changed files with 248 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/input/BufferingInputStream.cxx
View File

@@ -59,7 +59,7 @@ BufferingInputStream::IsAvailable(size_t offset) const noexcept
size_t
BufferingInputStream::Read(std::unique_lock<Mutex> &lock, size_t offset,
void *ptr, size_t s)
std::span<std::byte> dest)
{
if (offset >= size())
return 0;
@@ -68,8 +68,8 @@ BufferingInputStream::Read(std::unique_lock<Mutex> &lock, size_t offset,
auto r = buffer.Read(offset);
if (r.HasData()) {
/* yay, we have some data */
size_t nbytes = std::min(s, r.defined_buffer.size());
memcpy(ptr, r.defined_buffer.data(), nbytes);
size_t nbytes = std::min(dest.size(), r.defined_buffer.size());
memcpy(dest.data(), r.defined_buffer.data(), nbytes);
return nbytes;
}
@@ -148,9 +148,10 @@ BufferingInputStream::RunThreadLocked(std::unique_lock<Mutex> &lock)
data has been read */
constexpr size_t MAX_READ = 64 * 1024;
size_t nbytes = input->Read(lock, w.data(),
std::min(w.size(),
MAX_READ));
if (w.size() > MAX_READ)
w = w.first(MAX_READ);
size_t nbytes = input->Read(lock, w);
buffer.Commit(read_offset, read_offset + nbytes);
client_cond.notify_all();