summaryrefslogtreecommitdiffstats
path: root/logd
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-12-13 12:44:20 -0800
committerMark Salyzyn <salyzyn@google.com>2016-12-21 12:16:46 -0800
commit684bdb576dd43f1c262011e7bc4343a1ae4a32d0 (patch)
treedec4f0b59e3fd1752141233f7e2ca38e2534a45a /logd
parent8a1c4b85303cd636f4920f99093063f57ecc8e73 (diff)
downloadsystem_core-684bdb576dd43f1c262011e7bc4343a1ae4a32d0.tar.gz
system_core-684bdb576dd43f1c262011e7bc4343a1ae4a32d0.tar.bz2
system_core-684bdb576dd43f1c262011e7bc4343a1ae4a32d0.zip
logd: LogBufferElementKey use uint32_t for uid
Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-test Change-Id: Icae34b1fa0b3df0a45ad175ec81aaf232f322f38
Diffstat (limited to 'logd')
-rw-r--r--logd/LogBuffer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index a5d435fb0..cc65d4758 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -534,10 +534,9 @@ LogBufferElementCollection::iterator LogBuffer::erase(
class LogBufferElementKey {
const union {
struct {
- uint16_t uid;
+ uint32_t uid;
uint16_t pid;
uint16_t tid;
- uint16_t padding;
} __packed;
uint64_t value;
} __packed;
@@ -546,8 +545,8 @@ public:
LogBufferElementKey(uid_t uid, pid_t pid, pid_t tid):
uid(uid),
pid(pid),
- tid(tid),
- padding(0) {
+ tid(tid)
+ {
}
explicit LogBufferElementKey(uint64_t key):value(key) { }