Snap for 7105071 from 2f342bab8ce1e76767b73d7481429f2b756ccf9b to sc-release (55511799) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.rc

+61 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,67 @@ on late-init
		chmod 0666 /sys/kernel/debug/tracing/per_cpu/cpu15/trace
		chmod 0666 /sys/kernel/tracing/per_cpu/cpu15/trace

		on post-fs-data
		# Create MM Events Tracing Instance for Kmem Activity Trigger
		mkdir /sys/kernel/debug/tracing/instances/mm_events 0755 system system
		mkdir /sys/kernel/tracing/instances/mm_events 0755 system system

		# Read and set per CPU buffer size
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/buffer_size_kb
		chmod 0666 /sys/kernel/tracing/instances/mm_events/buffer_size_kb

		# Read and enable tracing
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/tracing_on
		chmod 0666 /sys/kernel/tracing/instances/mm_events/tracing_on

		# Read and truncate kernel trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/trace

		# Enable trace events
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/vmscan/mm_vmscan_direct_reclaim_begin/enable
		chmod 0666 /sys/kernel/tracing/instances/mm_events/events/vmscan/mm_vmscan_direct_reclaim_begin/enable
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/vmscan/mm_vmscan_kswapd_wake/enable
		chmod 0666 /sys/kernel/tracing/instances/mm_events/events/vmscan/mm_vmscan_kswapd_wake/enable
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/compaction/mm_compaction_begin/enable
		chmod 0666 /sys/kernel/tracing/instances/mm_events/events/compaction/mm_compaction_begin/enable

		# Read and clear per-CPU raw kernel trace
		# Cannot use wildcards in .rc files. Update this if there is a phone with
		# more CPUs.
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu0/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu0/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu1/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu1/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu2/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu2/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu3/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu3/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu4/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu4/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu5/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu5/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu6/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu6/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu7/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu7/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu8/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu8/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu9/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu9/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu10/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu10/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu11/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu11/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu12/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu12/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu13/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu13/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu14/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu14/trace
		chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu15/trace
		chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu15/trace

		on property:persist.debug.atrace.boottrace=1
		start boottrace

services/surfaceflinger/Scheduler/RefreshRateConfigs.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,9 @@ public:
		bool operator==(const RefreshRate& other) const { return !(*this != other); }

		std::string toString() const;
		friend std::ostream& operator<<(std::ostream& os, const RefreshRate& refreshRate) {
		return os << refreshRate.toString();
		}

		private:
		friend RefreshRateConfigs;

services/surfaceflinger/TimeStats/TimeStats.cpp

+46 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <unordered_map>
		#undef LOG_TAG
		#define LOG_TAG "TimeStats"
		#define ATRACE_TAG ATRACE_TAG_GRAPHICS
		@@ -87,6 +88,18 @@ std::string histogramToProtoByteString(const std::unordered_map<int32_t, int32_t
		proto.serializeToString(&byteString);
		return byteString;
		}

		std::string frameRateVoteToProtoByteString(float refreshRate, int frameRateCompatibility,
		int seamlessness) {
		util::ProtoOutputStream proto;
		proto.write(android::util::FIELD_TYPE_FLOAT \| 1 /* field id */, refreshRate);
		proto.write(android::util::FIELD_TYPE_ENUM \| 2 /* field id */, frameRateCompatibility);
		proto.write(android::util::FIELD_TYPE_ENUM \| 3 /* field id */, seamlessness);

		std::string byteString;
		proto.serializeToString(&byteString);
		return byteString;
		}
		} // namespace

		AStatsManager_PullAtomCallbackReturn TimeStats::populateGlobalAtom(AStatsEventList* data) {
		@@ -121,6 +134,23 @@ AStatsManager_PullAtomCallbackReturn TimeStats::populateGlobalAtom(AStatsEventLi
		mStatsDelegate->statsEventWriteInt32(event, mTimeStats.jankPayload.totalSFLongGpu);
		mStatsDelegate->statsEventWriteInt32(event, mTimeStats.jankPayload.totalSFUnattributed);
		mStatsDelegate->statsEventWriteInt32(event, mTimeStats.jankPayload.totalAppUnattributed);

		// TODO: populate these with real values
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_janky_frames_sf_scheduling
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_jank_frames_sf_prediction_error
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_jank_frames_app_buffer_stuffing
		mStatsDelegate->statsEventWriteInt32(event, 0); // display_refresh_rate_bucket
		std::string sfDeadlineMissedBytes =
		histogramToProtoByteString(std::unordered_map<int32_t, int32_t>(),
		mMaxPulledHistogramBuckets);
		mStatsDelegate->statsEventWriteByteArray(event, (const uint8_t*)sfDeadlineMissedBytes.c_str(),
		sfDeadlineMissedBytes.size()); // sf_deadline_misses
		std::string sfPredictionErrorBytes =
		histogramToProtoByteString(std::unordered_map<int32_t, int32_t>(),
		mMaxPulledHistogramBuckets);
		mStatsDelegate->statsEventWriteByteArray(event, (const uint8_t*)sfPredictionErrorBytes.c_str(),
		sfPredictionErrorBytes.size()); // sf_prediction_errors
		mStatsDelegate->statsEventWriteInt32(event, 0); // render_rate_bucket
		mStatsDelegate->statsEventBuild(event);
		clearGlobalLocked();

		@@ -174,6 +204,22 @@ AStatsManager_PullAtomCallbackReturn TimeStats::populateLayerAtom(AStatsEventLis
		mStatsDelegate->statsEventWriteInt32(event, layer->jankPayload.totalSFUnattributed);
		mStatsDelegate->statsEventWriteInt32(event, layer->jankPayload.totalAppUnattributed);

		// TODO: populate these with real values
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_janky_frames_sf_scheduling
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_jank_frames_sf_prediction_error
		mStatsDelegate->statsEventWriteInt32(event, 0); // total_jank_frames_app_buffer_stuffing
		mStatsDelegate->statsEventWriteInt32(event, 0); // display_refresh_rate_bucket
		mStatsDelegate->statsEventWriteInt32(event, 0); // render_rate_bucket
		std::string frameRateVoteBytes = frameRateVoteToProtoByteString(0.0, 0, 0);
		mStatsDelegate->statsEventWriteByteArray(event, (const uint8_t*)frameRateVoteBytes.c_str(),
		frameRateVoteBytes.size()); // set_frame_rate_vote
		std::string appDeadlineMissedBytes =
		histogramToProtoByteString(std::unordered_map<int32_t, int32_t>(),
		mMaxPulledHistogramBuckets);
		mStatsDelegate
		->statsEventWriteByteArray(event, (const uint8_t*)appDeadlineMissedBytes.c_str(),
		appDeadlineMissedBytes.size()); // app_deadline_misses

		mStatsDelegate->statsEventBuild(event);
		}
		clearLayersLocked();

services/surfaceflinger/tests/unittests/TimeStatsTest.cpp

+47 −0

Original line number	Diff line number	Diff line
		@@ -932,6 +932,18 @@ std::string buildExpectedHistogramBytestring(const std::vector<int32_t>& times,
		return byteString;
		}

		std::string frameRateVoteToProtoByteString(float refreshRate, int frameRateCompatibility,
		int seamlessness) {
		util::ProtoOutputStream proto;
		proto.write(android::util::FIELD_TYPE_FLOAT \| 1 /* field id */, refreshRate);
		proto.write(android::util::FIELD_TYPE_ENUM \| 2 /* field id */, frameRateCompatibility);
		proto.write(android::util::FIELD_TYPE_ENUM \| 3 /* field id */, seamlessness);

		std::string byteString;
		proto.serializeToString(&byteString);
		return byteString;
		}

		std::string dumpByteStringHex(const std::string& str) {
		std::stringstream ss;
		ss << std::hex;
		@@ -1002,6 +1014,7 @@ TEST_F(TimeStatsTest, globalStatsCallback) {

		std::string expectedFrameDuration = buildExpectedHistogramBytestring({2}, {1});
		std::string expectedRenderEngineTiming = buildExpectedHistogramBytestring({1, 2}, {1, 1});
		std::string expectedEmptyHistogram = buildExpectedHistogramBytestring({}, {});

		{
		InSequence seq;
		@@ -1031,6 +1044,22 @@ TEST_F(TimeStatsTest, globalStatsCallback) {
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate,
		statsEventWriteByteArray(mDelegate->mEvent,
		BytesEq((const uint8_t*)expectedEmptyHistogram.c_str(),
		expectedEmptyHistogram.size()),
		expectedEmptyHistogram.size()));
		EXPECT_CALL(*mDelegate,
		statsEventWriteByteArray(mDelegate->mEvent,
		BytesEq((const uint8_t*)expectedEmptyHistogram.c_str(),
		expectedEmptyHistogram.size()),
		expectedEmptyHistogram.size()));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));

		EXPECT_CALL(*mDelegate, statsEventBuild(mDelegate->mEvent));
		}
		EXPECT_EQ(AStatsManager_PULL_SUCCESS,
		@@ -1083,6 +1112,8 @@ TEST_F(TimeStatsTest, layerStatsCallback_pullsAllAndClears) {
		std::string expectedLatchToPresent = buildExpectedHistogramBytestring({2}, {1});
		std::string expectedDesiredToPresent = buildExpectedHistogramBytestring({1}, {1});
		std::string expectedPostToAcquire = buildExpectedHistogramBytestring({1}, {1});
		std::string expectedFrameRateOverride = frameRateVoteToProtoByteString(0.0, 0, 0);
		std::string expectedEmptyHistogram = buildExpectedHistogramBytestring({}, {});
		{
		InSequence seq;
		EXPECT_CALL(*mDelegate,
		@@ -1136,6 +1167,22 @@ TEST_F(TimeStatsTest, layerStatsCallback_pullsAllAndClears) {
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 1));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate, statsEventWriteInt32(mDelegate->mEvent, 0));
		EXPECT_CALL(*mDelegate,
		statsEventWriteByteArray(mDelegate->mEvent,
		BytesEq((const uint8_t*)
		expectedFrameRateOverride.c_str(),
		expectedFrameRateOverride.size()),
		expectedFrameRateOverride.size()));
		EXPECT_CALL(*mDelegate,
		statsEventWriteByteArray(mDelegate->mEvent,
		BytesEq((const uint8_t*)expectedEmptyHistogram.c_str(),
		expectedEmptyHistogram.size()),
		expectedEmptyHistogram.size()));

		EXPECT_CALL(*mDelegate, statsEventBuild(mDelegate->mEvent));
		}