From 07724bda37414e6db7ab3d589c50d197a859266b Mon Sep 17 00:00:00 2001 From: Howard Ro Date: Fri, 9 Nov 2018 11:23:28 -0800 Subject: [PATCH] Remove unnecessary marking of last pos Atoms from Stats HAL which only has fields in depth 1 were incorrectly being noted with the mark of last position. This changes fixes the offsets of the last fields for those 7 atoms. Test: statsd_test passes Change-Id: I9be1c22cadb850093ed6483675d162837f976823 --- cmds/statsd/src/logd/LogEvent.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/cmds/statsd/src/logd/LogEvent.cpp b/cmds/statsd/src/logd/LogEvent.cpp index febb9229bc950..625294ce5e49a 100644 --- a/cmds/statsd/src/logd/LogEvent.cpp +++ b/cmds/statsd/src/logd/LogEvent.cpp @@ -156,9 +156,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, FieldValue(Field(mTagId, getSimpleField(1)), Value(speakerImpedance.speakerLocation))); mValues.push_back( FieldValue(Field(mTagId, getSimpleField(2)), Value(speakerImpedance.milliOhms))); - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, @@ -173,9 +170,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, FieldValue(Field(mTagId, getSimpleField(2)), Value(hardwareFailed.hardwareLocation))); mValues.push_back( FieldValue(Field(mTagId, getSimpleField(3)), Value(int32_t(hardwareFailed.errorCode)))); - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, @@ -190,9 +184,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, FieldValue(Field(mTagId, getSimpleField(2)), Value(physicalDropDetected.accelPeak))); mValues.push_back(FieldValue(Field(mTagId, getSimpleField(3)), Value(physicalDropDetected.freefallDuration))); - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, @@ -205,10 +196,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, mValues.push_back(FieldValue(Field(mTagId, getSimpleField(i + 1)), Value(chargeCycles.cycleBucket[i]))); } - - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, @@ -231,10 +218,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, Value(batteryHealthSnapshotArgs.resistanceMicroOhm))); mValues.push_back(FieldValue(Field(mTagId, getSimpleField(7)), Value(batteryHealthSnapshotArgs.levelPercent))); - - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, const SlowIo& slowIo) { @@ -247,10 +230,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, con FieldValue(Field(mTagId, getSimpleField(1)), Value(int32_t(slowIo.operation)))); pos[0]++; mValues.push_back(FieldValue(Field(mTagId, getSimpleField(2)), Value(slowIo.count))); - - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, @@ -261,10 +240,6 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, mValues.push_back(FieldValue(Field(mTagId, getSimpleField(1)), Value(batteryCausedShutdown.voltageMicroV))); - - if (!mValues.empty()) { - mValues.back().mField.decorateLastPos(1); - } } LogEvent::LogEvent(int32_t tagId, int64_t timestampNs) : LogEvent(tagId, timestampNs, 0) {}