Merge "Fix the gauge metric data size estimation." into pi-dev am: 3b592910c5 (0353819e) · Commits · e / os / android_frameworks_base

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -186,7 +186,6 @@ void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
		flushIfNeededLocked(dumpTimeNs);
		}

		flushIfNeededLocked(dumpTimeNs);
		if (mPastBuckets.empty()) {
		return;
		}
		@@ -542,7 +541,14 @@ void GaugeMetricProducer::flushCurrentBucketLocked(const int64_t& eventTimeNs) {
		size_t GaugeMetricProducer::byteSizeLocked() const {
		size_t totalSize = 0;
		for (const auto& pair : mPastBuckets) {
		totalSize += pair.second.size() * kBucketSize;
		for (const auto& bucket : pair.second) {
		totalSize += bucket.mGaugeAtoms.size() * sizeof(GaugeAtom);
		for (const auto& atom : bucket.mGaugeAtoms) {
		if (atom.mFields != nullptr) {
		totalSize += atom.mFields->size() * sizeof(FieldValue);
		}
		}
		}
		}
		return totalSize;
		}