logd: replace std::vector<uint8_t> in SerializedLogChunk
Turns out std::vector::resize() and std::vector::clear() don't
actually deallocate any memory. std::vector::shrink_to_fit() can be
used for this but isn't a 'guarantee'. Instead of trying to get
std::vector to play nice, this change replaces std::vector<uint8_t>
with std::unique_ptr<uint8_t[]>, which is more accurate to how I'm
using this memory anyway.
Test: logging unit tests
Change-Id: I9638e90bbf50bcf316c5aa172c8278ea945d27e7
diff --git a/logd/SerializedLogChunk.h b/logd/SerializedLogChunk.h
index f0d2c49..65a1e86 100644
--- a/logd/SerializedLogChunk.h
+++ b/logd/SerializedLogChunk.h
@@ -18,14 +18,14 @@
#include <sys/types.h>
-#include <vector>
-
#include "LogWriter.h"
+#include "SerializedData.h"
#include "SerializedLogEntry.h"
class SerializedLogChunk {
public:
explicit SerializedLogChunk(size_t size) : contents_(size) {}
+ SerializedLogChunk(SerializedLogChunk&& other) noexcept = default;
~SerializedLogChunk();
void Compress();
@@ -66,10 +66,10 @@
private:
// The decompressed contents of this log buffer. Deallocated when the ref_count reaches 0 and
// writer_active_ is false.
- std::vector<uint8_t> contents_;
+ SerializedData contents_;
int write_offset_ = 0;
uint32_t reader_ref_count_ = 0;
bool writer_active_ = true;
uint64_t highest_sequence_number_ = 1;
- std::vector<uint8_t> compressed_log_;
+ SerializedData compressed_log_;
};