Snap for 4756844 from d64c07da377b4d4570ba68524de47062d3bfdb30 to pi-release (9dcbf699) · Commits · e / os / android_frameworks_base

cmds/statsd/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ statsd_common_src := \
		../../core/java/android/os/IStatsManager.aidl \
		src/statsd_config.proto \
		src/FieldValue.cpp \
		src/hash.cpp \
		src/stats_log_util.cpp \
		src/anomaly/AlarmMonitor.cpp \
		src/anomaly/AlarmTracker.cpp \

cmds/statsd/src/FieldValue.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,18 @@ bool HasPositionANY(const FieldMatcher& matcher) {
		return false;
		}

		bool HasPositionALL(const FieldMatcher& matcher) {
		if (matcher.has_position() && matcher.position() == Position::ALL) {
		return true;
		}
		for (const auto& child : matcher.child()) {
		if (HasPositionALL(child)) {
		return true;
		}
		}
		return false;
		}

		} // namespace statsd
		} // namespace os
		} // namespace android
		No newline at end of file

cmds/statsd/src/FieldValue.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ struct FieldValue {
		};

		bool HasPositionANY(const FieldMatcher& matcher);
		bool HasPositionALL(const FieldMatcher& matcher);

		bool isAttributionUidField(const FieldValue& value);

cmds/statsd/src/StatsLogProcessor.cpp

+17 −4

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ const int FIELD_ID_CURRENT_REPORT_ELAPSED_NANOS = 4;
		const int FIELD_ID_LAST_REPORT_WALL_CLOCK_NANOS = 5;
		const int FIELD_ID_CURRENT_REPORT_WALL_CLOCK_NANOS = 6;
		const int FIELD_ID_DUMP_REPORT_REASON = 8;
		const int FIELD_ID_STRINGS = 9;

		#define NS_PER_HOUR 3600 * NS_PER_SEC

		@@ -293,6 +294,7 @@ void StatsLogProcessor::dumpStates(FILE* out, bool verbose) {
		*/
		void StatsLogProcessor::onDumpReport(const ConfigKey& key, const int64_t dumpTimeStampNs,
		const bool include_current_partial_bucket,
		const bool include_string,
		const DumpReportReason dumpReportReason,
		vector<uint8_t>* outData) {
		std::lock_guard<std::mutex> lock(mMetricsMutex);
		@@ -320,7 +322,7 @@ void StatsLogProcessor::onDumpReport(const ConfigKey& key, const int64_t dumpTim
		uint64_t reportsToken =
		proto.start(FIELD_TYPE_MESSAGE \| FIELD_COUNT_REPEATED \| FIELD_ID_REPORTS);
		onConfigMetricsReportLocked(key, dumpTimeStampNs, include_current_partial_bucket,
		dumpReportReason, &proto);
		include_string, dumpReportReason, &proto);
		proto.end(reportsToken);
		// End of ConfigMetricsReport (reports).
		} else {
		@@ -349,6 +351,7 @@ void StatsLogProcessor::onDumpReport(const ConfigKey& key, const int64_t dumpTim
		void StatsLogProcessor::onConfigMetricsReportLocked(const ConfigKey& key,
		const int64_t dumpTimeStampNs,
		const bool include_current_partial_bucket,
		const bool include_string,
		const DumpReportReason dumpReportReason,
		ProtoOutputStream* proto) {
		// We already checked whether key exists in mMetricsManagers in
		@@ -360,13 +363,16 @@ void StatsLogProcessor::onConfigMetricsReportLocked(const ConfigKey& key,
		int64_t lastReportTimeNs = it->second->getLastReportTimeNs();
		int64_t lastReportWallClockNs = it->second->getLastReportWallClockNs();

		std::set<string> str_set;

		// First, fill in ConfigMetricsReport using current data on memory, which
		// starts from filling in StatsLogReport's.
		it->second->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, proto);
		it->second->onDumpReport(dumpTimeStampNs, include_current_partial_bucket,
		&str_set, proto);

		// Fill in UidMap.
		uint64_t uidMapToken = proto->start(FIELD_TYPE_MESSAGE \| FIELD_ID_UID_MAP);
		mUidMap->appendUidMap(dumpTimeStampNs, key, proto);
		mUidMap->appendUidMap(dumpTimeStampNs, key, &str_set, proto);
		proto->end(uidMapToken);

		// Fill in the timestamps.
		@@ -380,6 +386,12 @@ void StatsLogProcessor::onConfigMetricsReportLocked(const ConfigKey& key,
		(long long)getWallClockNs());
		// Dump report reason
		proto->write(FIELD_TYPE_INT32 \| FIELD_ID_DUMP_REPORT_REASON, dumpReportReason);

		if (include_string) {
		for (const auto& str : str_set) {
		proto->write(FIELD_TYPE_STRING \| FIELD_COUNT_REPEATED \| FIELD_ID_STRINGS, str);
		}
		}
		}

		void StatsLogProcessor::resetConfigsLocked(const int64_t timestampNs,
		@@ -465,7 +477,8 @@ void StatsLogProcessor::WriteDataToDiskLocked(const ConfigKey& key,
		const DumpReportReason dumpReportReason) {
		ProtoOutputStream proto;
		onConfigMetricsReportLocked(key, getElapsedRealtimeNs(),
		true /* include_current_partial_bucket*/, dumpReportReason, &proto);
		true /* include_current_partial_bucket*/,
		false /* include strings */, dumpReportReason, &proto);
		string file_name = StringPrintf("%s/%ld_%d_%lld", STATS_DATA_DIR,
		(long)getWallClockSec(), key.GetUid(), (long long)key.GetId());
		android::base::unique_fd fd(open(file_name.c_str(),

cmds/statsd/src/StatsLogProcessor.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public:
		size_t GetMetricsSize(const ConfigKey& key) const;

		void onDumpReport(const ConfigKey& key, const int64_t dumpTimeNs,
		const bool include_current_partial_bucket,
		const bool include_current_partial_bucket, const bool include_string,
		const DumpReportReason dumpReportReason, vector<uint8_t>* outData);

		/* Tells MetricsManager that the alarms in alarmSet have fired. Modifies anomaly alarmSet. */
		@@ -126,6 +126,7 @@ private:

		void onConfigMetricsReportLocked(const ConfigKey& key, const int64_t dumpTimeStampNs,
		const bool include_current_partial_bucket,
		const bool include_string,
		const DumpReportReason dumpReportReason,
		util::ProtoOutputStream* proto);