commit b398a7c85e30382868b9be11f4d49c693b840ac9
author Tom Cherry <tomcherry@google.com> Wed May 20 12:09:22 2020 -0700
committer Tom Cherry <tomcherry@google.com> Wed May 20 14:39:26 2020 -0700
tree a223705c7369134f76507e84e8c0354a079c032e
parent 0e95c2108f6f9cac15a3dc4ef7c0f6e2963662d6

logd: add tests for log deduplication

Fix a subtle bug that liblog event messages have a payload of int32_t,
not uint32_t, so they should only be summed to int32_t max.

Make a bunch of test improvements as well to support these.

Test: these tests
Change-Id: I4069cc546240bfffec5b19f34ebec913799674e8

logd/ChattyLogBuffer.cpp

diff --git a/logd/ChattyLogBuffer.cpp b/logd/ChattyLogBuffer.cpp
index 9e08e9d..f1305a5 100644
--- a/logd/ChattyLogBuffer.cpp
+++ b/logd/ChattyLogBuffer.cpp
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <limits>
 #include <unordered_map>
 #include <utility>
 
@@ -286,7 +287,7 @@
                     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;