Snap for 4765094 from 7dbedde3d351d4a0e29689960923bea25d0b59ee to pi-release (70f32415) · Commits · e / os / android_frameworks_native-old

cmds/atrace/atrace.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,7 @@ static const TracingCategory k_categories[] = {
		{ OPT, "events/sched/sched_waking/enable" },
		{ OPT, "events/sched/sched_blocked_reason/enable" },
		{ OPT, "events/sched/sched_cpu_hotplug/enable" },
		{ OPT, "events/sched/sched_pi_setprio/enable" },
		{ OPT, "events/cgroup/enable" },
		} },
		{ "irq", "IRQ Events", 0, {

cmds/atrace/atrace.rc

+3 −1

Original line number	Diff line number	Diff line
		## Permissions to allow system-wide tracing to the kernel trace buffer.
		##
		on post-fs
		on late-init

		# Allow writing to the kernel trace log.
		chmod 0222 /sys/kernel/debug/tracing/trace_marker
		@@ -29,6 +29,8 @@ on post-fs
		chmod 0666 /sys/kernel/tracing/events/sched/sched_blocked_reason/enable
		chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug/enable
		chmod 0666 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable
		chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_pi_setprio/enable
		chmod 0666 /sys/kernel/tracing/events/sched/sched_pi_setprio/enable
		chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable
		chmod 0666 /sys/kernel/tracing/events/cgroup/enable
		chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable

services/surfaceflinger/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ cc_defaults {
		"libpdx_default_transport",
		"libprotobuf-cpp-lite",
		"libsync",
		"libtimestats_proto",
		"libui",
		"libutils",
		"libvulkan",
		@@ -124,6 +125,7 @@ filegroup {
		"SurfaceFlinger.cpp",
		"SurfaceInterceptor.cpp",
		"SurfaceTracing.cpp",
		"TimeStats/TimeStats.cpp",
		"Transform.cpp",
		],
		}
		@@ -172,6 +174,7 @@ cc_binary {
		"liblayers_proto",
		"liblog",
		"libsurfaceflinger",
		"libtimestats_proto",
		"libutils",
		],
		static_libs: [
		@@ -213,5 +216,6 @@ cc_library_shared {

		subdirs = [
		"layerproto",
		"TimeStats/timestatsproto",
		"tests",
		]

services/surfaceflinger/BufferLayer.cpp

+15 −2

Original line number	Diff line number	Diff line
		@@ -316,6 +316,9 @@ bool BufferLayer::onPostComposition(const std::shared_ptr<FenceTime>& glDoneFenc
		nsecs_t desiredPresentTime = mConsumer->getTimestamp();
		mFrameTracker.setDesiredPresentTime(desiredPresentTime);

		const std::string layerName(getName().c_str());
		mTimeStats.setDesiredTime(layerName, mCurrentFrameNumber, desiredPresentTime);

		std::shared_ptr<FenceTime> frameReadyFence = mConsumer->getCurrentFenceTime();
		if (frameReadyFence->isValid()) {
		mFrameTracker.setFrameReadyFence(std::move(frameReadyFence));
		@@ -326,12 +329,15 @@ bool BufferLayer::onPostComposition(const std::shared_ptr<FenceTime>& glDoneFenc
		}

		if (presentFence->isValid()) {
		mTimeStats.setPresentFence(layerName, mCurrentFrameNumber, presentFence);
		mFrameTracker.setActualPresentFence(std::shared_ptr<FenceTime>(presentFence));
		} else {
		// The HWC doesn't support present fences, so use the refresh
		// timestamp instead.
		mFrameTracker.setActualPresentTime(
		mFlinger->getHwComposer().getRefreshTimestamp(HWC_DISPLAY_PRIMARY));
		const nsecs_t actualPresentTime =
		mFlinger->getHwComposer().getRefreshTimestamp(HWC_DISPLAY_PRIMARY);
		mTimeStats.setPresentTime(layerName, mCurrentFrameNumber, actualPresentTime);
		mFrameTracker.setActualPresentTime(actualPresentTime);
		}

		mFrameTracker.advanceFrame();
		@@ -441,6 +447,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		// and return early
		if (queuedBuffer) {
		Mutex::Autolock lock(mQueueItemLock);
		mTimeStats.removeTimeRecord(getName().c_str(), mQueueItems[0].mFrameNumber);
		mQueueItems.removeAt(0);
		android_atomic_dec(&mQueuedFrames);
		}
		@@ -454,6 +461,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		Mutex::Autolock lock(mQueueItemLock);
		mQueueItems.clear();
		android_atomic_and(0, &mQueuedFrames);
		mTimeStats.clearLayerRecord(getName().c_str());
		}

		// Once we have hit this state, the shadow queue may no longer
		@@ -474,10 +482,15 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		// Remove any stale buffers that have been dropped during
		// updateTexImage
		while (mQueueItems[0].mFrameNumber != currentFrameNumber) {
		mTimeStats.removeTimeRecord(getName().c_str(), mQueueItems[0].mFrameNumber);
		mQueueItems.removeAt(0);
		android_atomic_dec(&mQueuedFrames);
		}

		const std::string layerName(getName().c_str());
		mTimeStats.setAcquireFence(layerName, currentFrameNumber, mQueueItems[0].mFenceTime);
		mTimeStats.setLatchTime(layerName, currentFrameNumber, latchTime);

		mQueueItems.removeAt(0);
		}

services/surfaceflinger/Layer.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -1532,10 +1532,16 @@ void Layer::dumpFrameEvents(String8& result) {
		void Layer::onDisconnect() {
		Mutex::Autolock lock(mFrameEventHistoryMutex);
		mFrameEventHistory.onDisconnect();
		mTimeStats.onDisconnect(getName().c_str());
		}

		void Layer::addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
		FrameEventHistoryDelta* outDelta) {
		if (newTimestamps) {
		mTimeStats.setPostTime(getName().c_str(), newTimestamps->frameNumber,
		newTimestamps->postedTime);
		}

		Mutex::Autolock lock(mFrameEventHistoryMutex);
		if (newTimestamps) {
		// If there are any unsignaled fences in the aquire timeline at this