Merge "Remove unused variables in statsd, and make more warnings show." (6189807c) · Commits · e / os / android_frameworks_base

cmds/statsd/Android.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -116,10 +116,8 @@ LOCAL_SRC_FILES := \

		LOCAL_CFLAGS += \
		-Wall \
		-Wextra \
		-Werror \
		-Wno-missing-field-initializers \
		-Wno-unused-variable \
		-Wno-unused-function \
		-Wno-unused-parameter

		ifeq (debug,)

+18 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,23 @@ namespace android {
		namespace os {
		namespace statsd {

		int32_t getEncodedField(int32_t pos[], int32_t depth, bool includeDepth) {
		int32_t field = 0;
		for (int32_t i = 0; i <= depth; i++) {
		int32_t shiftBits = 8 * (kMaxLogDepth - i);
		field \|= (pos[i] << shiftBits);
		}

		if (includeDepth) {
		field \|= (depth << 24);
		}
		return field;
		}

		int32_t encodeMatcherMask(int32_t mask[], int32_t depth) {
		return getEncodedField(mask, depth, false) \| 0xff000000;
		}

		bool Field::matches(const Matcher& matcher) const {
		if (mTag != matcher.mMatcher.getTag()) {
		return false;
		@@ -32,7 +49,7 @@ bool Field::matches(const Matcher& matcher) const {
		}

		return false;
		};
		}

		void translateFieldMatcher(int tag, const FieldMatcher& matcher, int depth, int* pos, int* mask,
		std::vector<Matcher>* output) {
		@@ -71,7 +88,6 @@ void translateFieldMatcher(int tag, const FieldMatcher& matcher, int depth, int*

		if (matcher.child_size() == 0) {
		output->push_back(Matcher(Field(tag, pos, depth), encodeMatcherMask(mask, depth)));
		Matcher matcher = Matcher(Field(tag, pos, depth), encodeMatcherMask(mask, depth));
		} else {
		for (const auto& child : matcher.child()) {
		translateFieldMatcher(tag, child, depth + 1, pos, mask, output);

+3 −18

Original line number	Diff line number	Diff line
		@@ -33,29 +33,14 @@ const int32_t kClearLastBitDeco = 0x7f;

		enum Type { INT, LONG, FLOAT, STRING };

		int32_t getEncodedField(int32_t pos[], int32_t depth, bool includeDepth);

		static int32_t getEncodedField(int32_t pos[], int32_t depth, bool includeDepth) {
		int32_t field = 0;
		for (int32_t i = 0; i <= depth; i++) {
		int32_t shiftBits = 8 * (kMaxLogDepth - i);
		field \|= (pos[i] << shiftBits);
		}

		if (includeDepth) {
		field \|= (depth << 24);
		}
		return field;
		}

		static int32_t encodeMatcherMask(int32_t mask[], int32_t depth) {
		return getEncodedField(mask, depth, false) \| 0xff000000;
		}
		int32_t encodeMatcherMask(int32_t mask[], int32_t depth);

		// Get the encoded field for a leaf with a [field] number at depth 0;
		static int32_t getSimpleField(size_t field) {
		inline int32_t getSimpleField(size_t field) {
		return ((int32_t)field << 8 * 2);
		}

		/**
		* Field is a wrapper class for 2 integers that represents the field of a log element in its Atom
		* proto.

+0 −2

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ bool filterValues(const vector<Matcher>& matcherFields, const vector<FieldValue>
		for (const auto& value : values) {
		// TODO: potential optimization here to break early because all fields are naturally
		// sorted.
		int32_t filteredField;
		if (value.mField.matches(matcher)) {
		matchedResults.push_back(FieldValue(
		Field(value.mField.getTag(), (value.mField.getField() & matcher.mMask)),
		@@ -148,7 +147,6 @@ void filterGaugeValues(const std::vector<Matcher>& matcherFields,
		const std::vector<FieldValue>& values, std::vector<FieldValue>* output) {
		for (const auto& field : matcherFields) {
		for (const auto& value : values) {
		int filteredField;
		if (value.mField.matches(field)) {
		output->push_back(value);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ const int FIELD_ID_REPORTS = 2;
		const int FIELD_ID_UID = 1;
		const int FIELD_ID_ID = 2;
		// for ConfigMetricsReport
		const int FIELD_ID_METRICS = 1;
		// const int FIELD_ID_METRICS = 1; // written in MetricsManager.cpp
		const int FIELD_ID_UID_MAP = 2;
		const int FIELD_ID_LAST_REPORT_ELAPSED_NANOS = 3;
		const int FIELD_ID_CURRENT_REPORT_ELAPSED_NANOS = 4;