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

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

Merge "logd: add tests for log deduplication" am: 0a6c83e7 am: a4f37b2e 

Change-Id: Id2e2a9fd7f65bff2b5b01246f7f5d3f38bd027ef
parents 965a67c5 a4f37b2e

logd/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -125,10 +125,7 @@ cc_defaults { 
        "-Wextra",

        "-Werror",

        "-fno-builtin",



        "-DAUDITD_LOG_TAG=1003",

        "-DCHATTY_LOG_TAG=1004",

    ],

    ] + event_flag,



    srcs: [

        "logd_test.cpp",

logd/ChattyLogBuffer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <time.h>

#include <unistd.h>



#include <limits>

#include <unordered_map>

#include <utility>
@@ -286,7 +287,7 @@ int ChattyLogBuffer::Log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pi 
                    lastLoggedElements[LOG_ID_EVENTS] = elem;

                    total += htole32(swab);

                    // check for overflow

                    if (total >= UINT32_MAX) {

                    if (total >= std::numeric_limits<int32_t>::max()) {

                        log(currentLast);

                        unlock();

                        return len;

logd/LogBufferTest.cpp

+334 −101

File changed.

Preview size limit exceeded, changes collapsed.