From 4fc1c5c4f53e45a11ff060bdef8646c3ea70e9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 22 Oct 2018 11:30:26 +0200
Subject: [PATCH] LogWriterFile: split long header messages that exceed the
buffer length
Some message formats are longer than the 300 bytes. We can split the writes
because we have to wait until they are written anyway.
---
src/modules/logger/log_writer_file.cpp | 30 +++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/modules/logger/log_writer_file.cpp b/src/modules/logger/log_writer_file.cpp
index 81cde76b95..dc6bc70d90 100644
--- a/src/modules/logger/log_writer_file.cpp
+++ b/src/modules/logger/log_writer_file.cpp
@@ -293,13 +293,33 @@ int LogWriterFile::write_message(LogType type, void *ptr, size_t size, uint64_t
if (_need_reliable_transfer) {
int ret;
- while ((ret = write(type, ptr, size, dropout_start)) == -1) {
- unlock();
- notify();
- usleep(3000);
- lock();
+ // if there's a dropout, write it first (because we might split the message)
+ if (dropout_start) {
+ while ((ret = write(type, ptr, 0, dropout_start)) == -1) {
+ unlock();
+ notify();
+ usleep(3000);
+ lock();
+ }
}
+ uint8_t *uptr = (uint8_t *)ptr;
+
+ do {
+ // Split into several blocks if the data is longer than the write buffer
+ size_t write_size = math::min(size, _buffers[(int)type].buffer_size());
+
+ while ((ret = write(type, uptr, write_size, 0)) == -1) {
+ unlock();
+ notify();
+ usleep(3000);
+ lock();
+ }
+
+ uptr += write_size;
+ size -= write_size;
+ } while (size > 0);
+
return ret;
}
--
GitLab