From 44e1a5d59c216e9f716965cf8e355ee82de8599c Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 13 Jul 2020 17:28:30 -0700 Subject: [PATCH] logd: update SerializedLogChunk for new prune calcuations A previous change included sizeof(SerializedLogChunk) to the size of a log chunk to more accurately track logd's log usage, but did not update the tests that check this value, so this change updates them appropriately. Bug: 161179582 Test: logd-unit-tests Change-Id: Ic37f07fff98c260dcf39b7cc79504c1c3fc2149d --- logd/SerializedLogChunkTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logd/SerializedLogChunkTest.cpp b/logd/SerializedLogChunkTest.cpp index 657250335..2b478a3fb 100644 --- a/logd/SerializedLogChunkTest.cpp +++ b/logd/SerializedLogChunkTest.cpp @@ -27,7 +27,7 @@ using android::base::StringPrintf; TEST(SerializedLogChunk, smoke) { size_t chunk_size = 10 * 4096; auto chunk = SerializedLogChunk{chunk_size}; - EXPECT_EQ(chunk_size, chunk.PruneSize()); + EXPECT_EQ(chunk_size + sizeof(SerializedLogChunk), chunk.PruneSize()); static const char log_message[] = "log message"; size_t expected_total_len = sizeof(SerializedLogEntry) + sizeof(log_message); @@ -58,7 +58,7 @@ TEST(SerializedLogChunk, fill_log_exactly) { size_t individual_message_size = sizeof(SerializedLogEntry) + sizeof(log_message); size_t chunk_size = individual_message_size * 3; auto chunk = SerializedLogChunk{chunk_size}; - EXPECT_EQ(chunk_size, chunk.PruneSize()); + EXPECT_EQ(chunk_size + sizeof(SerializedLogChunk), chunk.PruneSize()); ASSERT_TRUE(chunk.CanLog(individual_message_size)); EXPECT_NE(nullptr, chunk.Log(1, log_time(), 1000, 1, 1, log_message, sizeof(log_message)));