Merge "Add LogEvent::hasAttributionChain()" into rvc-dev am: 59602e5342 (7156febd) · Commits · e / os / android_frameworks_base

cmds/statsd/src/FieldValue.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ struct Matcher;
		struct Field;
		struct FieldValue;

		const int32_t kAttributionField = 1;
		const int32_t kMaxLogDepth = 2;
		const int32_t kLastBitMask = 0x80;
		const int32_t kClearLastBitDeco = 0x7f;

cmds/statsd/src/StatsLogProcessor.cpp

+7 −8

Original line number	Diff line number	Diff line
		@@ -138,14 +138,13 @@ void StatsLogProcessor::onPeriodicAlarmFired(
		}

		void StatsLogProcessor::mapIsolatedUidToHostUidIfNecessaryLocked(LogEvent* event) const {
		if (event->getAttributionChainIndex() != -1) {
		for (auto& value : *(event->getMutableValues())) {
		if (value.mField.getPosAtDepth(0) > kAttributionField) {
		break;
		}
		if (isAttributionUidField(value)) {
		const int hostUid = mUidMap->getHostUidOrSelf(value.mValue.int_value);
		value.mValue.setInt(hostUid);
		if (std::pair<int, int> indexRange; event->hasAttributionChain(&indexRange)) {
		vector<FieldValue>* const fieldValues = event->getMutableValues();
		for (int i = indexRange.first; i <= indexRange.second; i++) {
		FieldValue& fieldValue = fieldValues->at(i);
		if (isAttributionUidField(fieldValue)) {
		const int hostUid = mUidMap->getHostUidOrSelf(fieldValue.mValue.int_value);
		fieldValue.mValue.setInt(hostUid);
		}
		}
		} else {

cmds/statsd/src/external/puller_util.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -50,7 +50,8 @@ void mapAndMergeIsolatedUidsToHostUid(vector<shared_ptr<LogEvent>>& data, const
		int tagId, const vector<int>& additiveFieldsVec) {
		// Check the first LogEvent for attribution chain or a uid field as either all atoms with this
		// tagId have them or none of them do.
		const bool hasAttributionChain = data[0]->getAttributionChainIndex() != -1;
		std::pair<int, int> attrIndexRange;
		const bool hasAttributionChain = data[0]->hasAttributionChain(&attrIndexRange);
		bool hasUidField = (data[0]->getUidFieldIndex() != -1);

		if (!hasAttributionChain && !hasUidField) {
		@@ -64,14 +65,13 @@ void mapAndMergeIsolatedUidsToHostUid(vector<shared_ptr<LogEvent>>& data, const
		ALOGE("Wrong atom. Expecting %d, got %d", tagId, event->GetTagId());
		return;
		}
		if (event->getAttributionChainIndex() != -1) {
		for (auto& value : *(event->getMutableValues())) {
		if (value.mField.getPosAtDepth(0) > kAttributionField) {
		break;
		}
		if (isAttributionUidField(value)) {
		const int hostUid = uidMap->getHostUidOrSelf(value.mValue.int_value);
		value.mValue.setInt(hostUid);
		if (hasAttributionChain) {
		vector<FieldValue>* const fieldValues = event->getMutableValues();
		for (int i = attrIndexRange.first; i <= attrIndexRange.second; i++) {
		FieldValue& fieldValue = fieldValues->at(i);
		if (isAttributionUidField(fieldValue)) {
		const int hostUid = uidMap->getHostUidOrSelf(fieldValue.mValue.int_value);
		fieldValue.mValue.setInt(hostUid);
		}
		}
		} else {

cmds/statsd/src/logd/LogEvent.cpp

+20 −3

Original line number	Diff line number	Diff line
		@@ -211,8 +211,8 @@ void LogEvent::parseKeyValuePairs(int32_t* pos, int32_t depth, bool* last, uint8

		void LogEvent::parseAttributionChain(int32_t* pos, int32_t depth, bool* last,
		uint8_t numAnnotations) {
		int firstUidInChainIndex = mValues.size();
		int32_t numNodes = readNextValue<uint8_t>();
		const unsigned int firstUidInChainIndex = mValues.size();
		const int32_t numNodes = readNextValue<uint8_t>();
		for (pos[1] = 1; pos[1] <= numNodes; pos[1]++) {
		last[1] = (pos[1] == numNodes);

		@@ -225,6 +225,11 @@ void LogEvent::parseAttributionChain(int32_t* pos, int32_t depth, bool* last,
		last[2] = true;
		parseString(pos, /depth=/2, last, /numAnnotations=/0);
		}
		// Check if at least one node was successfully parsed.
		if (mValues.size() - 1 > firstUidInChainIndex) {
		mAttributionChainStartIndex = firstUidInChainIndex;
		mAttributionChainEndIndex = mValues.size() - 1;
		}

		parseAnnotations(numAnnotations, firstUidInChainIndex);

		@@ -401,7 +406,6 @@ bool LogEvent::parseBuffer(uint8_t* buf, size_t len) {
		break;
		case ATTRIBUTION_CHAIN_TYPE:
		parseAttributionChain(pos, /depth=/0, last, getNumAnnotations(typeInfo));
		if (mAttributionChainIndex == -1) mAttributionChainIndex = pos[0];
		break;
		case ERROR_TYPE:
		mErrorBitmask = readNextValue<int32_t>();
		@@ -567,6 +571,19 @@ void LogEvent::ToProto(ProtoOutputStream& protoOutput) const {
		writeFieldValueTreeToStream(mTagId, getValues(), &protoOutput);
		}

		bool LogEvent::hasAttributionChain(std::pair<int, int>* indexRange) const {
		if (mAttributionChainStartIndex == -1 \|\| mAttributionChainEndIndex == -1) {
		return false;
		}

		if (nullptr != indexRange) {
		indexRange->first = mAttributionChainStartIndex;
		indexRange->second = mAttributionChainEndIndex;
		}

		return true;
		}

		void writeExperimentIdsToProto(const std::vector<int64_t>& experimentIds,
		std::vector<uint8_t>* protoOut) {
		ProtoOutputStream proto;

cmds/statsd/src/logd/LogEvent.h

+6 −7

Original line number	Diff line number	Diff line
		@@ -163,12 +163,10 @@ public:
		return mUidFieldIndex;
		}

		// Returns the index of (the first) attribution chain within the atom
		// definition. Note that the value is 1-indexed. If there is no attribution
		// chain, returns -1.
		inline int getAttributionChainIndex() {
		return mAttributionChainIndex;
		}
		// Returns whether this LogEvent has an AttributionChain.
		// If it does and indexRange is not a nullptr, populate indexRange with the start and end index
		// of the AttributionChain within mValues.
		bool hasAttributionChain(std::pair<int, int>* indexRange = nullptr) const;

		// Returns the index of the exclusive state field within the FieldValues vector if
		// an exclusive state exists. If there is no exclusive state field, returns -1.
		@@ -324,7 +322,8 @@ private:
		// Annotations
		bool mTruncateTimestamp = false;
		int mUidFieldIndex = -1;
		int mAttributionChainIndex = -1;
		int mAttributionChainStartIndex = -1;
		int mAttributionChainEndIndex = -1;
		int mExclusiveStateFieldIndex = -1;
		int mResetState = -1;
		};