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

util/{HugeAllocator,SparseBuffer}: use std::span

Browse Source
This commit is contained in:
Max Kellermann
2022-05-20 10:17:20 +02:00
parent 84e5da4bf0
commit b37c031fd1
6 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/BufferingInputStream.cxx
View File

@@ -84,8 +84,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(s, r.defined_buffer.size());
memcpy(ptr, r.defined_buffer.data(), nbytes);
return nbytes;
}
@@ -107,9 +107,9 @@ BufferingInputStream::FindFirstHole() const noexcept
/* a hole at the beginning */
return 0;
if (r.defined_buffer.size < size())
if (r.defined_buffer.size() < size())
/* a hole in the middle */
return r.defined_buffer.size;
return r.defined_buffer.size();
/* the file has been read completely */
return INVALID_OFFSET;
@@ -163,10 +163,10 @@ BufferingInputStream::RunThreadLocked(std::unique_lock<Mutex> &lock)
hard disk, instead of returning when "some"
data has been read */
constexpr size_t MAX_READ = 64 * 1024;
if (w.size > MAX_READ)
w.size = MAX_READ;
size_t nbytes = input->Read(lock, w.data, w.size);
size_t nbytes = input->Read(lock, w.data(),
std::min(w.size(),
MAX_READ));
buffer.Commit(read_offset, read_offset + nbytes);
client_cond.notify_all();