Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d68cb90f authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "logd: update SerializedLogChunk for new prune calcuations" am:... 

Merge "logd: update SerializedLogChunk for new prune calcuations" am: 63e7541f am: 8a5c635a am: b3243d1e am: 8a719fd0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1362308

Change-Id: I999b06593ed143b5793d3f5d8a8ddf74cb5815ce
parents 2371978e 8a719fd0

logd/SerializedLogChunkTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)));