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

client/Response: add constant MAX_BINARY_SIZE

Browse Source 
Use the same chunk size for all binary commands.
This commit is contained in:
Max Kellermann 2019-08-12 20:10:37 +02:00
parent 989790e7f1
commit 4f61cd0b93
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Response.cxx
View File

@ -59,6 +59,8 @@ Response::Format(const char *fmt, ...) noexcept
bool bool
Response::WriteBinary(ConstBuffer<void> payload) noexcept Response::WriteBinary(ConstBuffer<void> payload) noexcept
{ {
assert(payload.size <= MAX_BINARY_SIZE);
return Format("binary: %zu\n", payload.size) && return Format("binary: %zu\n", payload.size) &&
Write(payload.data, payload.size) && Write(payload.data, payload.size) &&
Write("\n"); Write("\n");

2
src/client/Response.hxx
View File

@ -77,6 +77,8 @@ public:
bool FormatV(const char *fmt, va_list args) noexcept; bool FormatV(const char *fmt, va_list args) noexcept;
bool Format(const char *fmt, ...) noexcept; bool Format(const char *fmt, ...) noexcept;
static constexpr size_t MAX_BINARY_SIZE = 8192;
/** /**
* Write a binary chunk; this writes the "binary" line, the * Write a binary chunk; this writes the "binary" line, the
* given chunk and the trailing newline. * given chunk and the trailing newline.

5
src/command/FileCommands.cxx
View File

@ -286,14 +286,13 @@ read_stream_art(Response &r, const char *uri, size_t offset)
const offset_type art_file_size = is->GetSize(); const offset_type art_file_size = is->GetSize();
constexpr size_t CHUNK_SIZE = 8192; uint8_t buffer[Response::MAX_BINARY_SIZE];
uint8_t buffer[CHUNK_SIZE];
size_t read_size; size_t read_size;
{ {
std::unique_lock<Mutex> lock(mutex); std::unique_lock<Mutex> lock(mutex);
is->Seek(lock, offset); is->Seek(lock, offset);
read_size = is->Read(lock, &buffer, CHUNK_SIZE); read_size = is->Read(lock, &buffer, sizeof(buffer));
} }
r.Format("size: %" PRIoffset "\n", art_file_size); r.Format("size: %" PRIoffset "\n", art_file_size);