Merge "audio services: monitor execution time for binder commands" into pi-dev am: 694a72d3ef (9d04d212) · Commits · e / os / android_frameworks_av

include/media/TimeCheck.h

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../media/libmedia/include/media/TimeCheck.h
		No newline at end of file

media/libaudioclient/IAudioFlinger.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@

		#include <binder/IPCThreadState.h>
		#include <binder/Parcel.h>
		#include <media/TimeCheck.h>
		#include <private/android_filesystem_config.h>

		#include "IAudioFlinger.h"
		@@ -933,6 +934,8 @@ status_t BnAudioFlinger::onTransact(
		break;
		}

		TimeCheck check("IAudioFlinger");

		switch (code) {
		case CREATE_TRACK: {
		CHECK_INTERFACE(IAudioFlinger, data, reply);

media/libaudioclient/IAudioPolicyService.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@

		#include <media/AudioEffect.h>
		#include <media/IAudioPolicyService.h>
		#include <media/TimeCheck.h>
		#include <private/android_filesystem_config.h>
		#include <system/audio.h>

		@@ -882,6 +883,8 @@ status_t BnAudioPolicyService::onTransact(
		break;
		}

		TimeCheck check("IAudioPolicyService");

		switch (code) {
		case SET_DEVICE_CONNECTION_STATE: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);

media/libmedia/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ cc_library {
		vndk: {
		enabled: true,
		},
		srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],
		srcs: ["AudioParameter.cpp", "TypeConverter.cpp", "TimeCheck.cpp"],
		cflags: [
		"-Werror",
		"-Wno-error=deprecated-declarations",

media/libmedia/TimeCheck.cpp

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/


		#include <media/TimeCheck.h>

		namespace android {

		/* static */
		sp<TimeCheck::TimeCheckThread> TimeCheck::getTimeCheckThread()
		{
		static sp<TimeCheck::TimeCheckThread> sTimeCheckThread = new TimeCheck::TimeCheckThread();
		return sTimeCheckThread;
		}

		TimeCheck::TimeCheck(const char *tag, uint32_t timeoutMs)
		: mEndTimeNs(getTimeCheckThread()->startMonitoring(tag, timeoutMs))
		{
		}

		TimeCheck::~TimeCheck() {
		getTimeCheckThread()->stopMonitoring(mEndTimeNs);
		}

		TimeCheck::TimeCheckThread::~TimeCheckThread()
		{
		AutoMutex _l(mMutex);
		requestExit();
		mMonitorRequests.clear();
		mCond.signal();
		}

		nsecs_t TimeCheck::TimeCheckThread::startMonitoring(const char *tag, uint32_t timeoutMs) {
		Mutex::Autolock _l(mMutex);
		nsecs_t endTimeNs = systemTime() + milliseconds(timeoutMs);
		for (; mMonitorRequests.indexOfKey(endTimeNs) >= 0; ++endTimeNs);
		mMonitorRequests.add(endTimeNs, tag);
		mCond.signal();
		return endTimeNs;
		}

		void TimeCheck::TimeCheckThread::stopMonitoring(nsecs_t endTimeNs) {
		Mutex::Autolock _l(mMutex);
		mMonitorRequests.removeItem(endTimeNs);
		mCond.signal();
		}

		bool TimeCheck::TimeCheckThread::threadLoop()
		{
		status_t status = TIMED_OUT;
		const char *tag;
		{
		AutoMutex _l(mMutex);

		if (exitPending()) {
		return false;
		}

		nsecs_t endTimeNs = INT64_MAX;
		// KeyedVector mMonitorRequests is ordered so take first entry as next timeout
		if (mMonitorRequests.size() != 0) {
		endTimeNs = mMonitorRequests.keyAt(0);
		tag = mMonitorRequests.valueAt(0);
		}

		const nsecs_t waitTimeNs = endTimeNs - systemTime();
		if (waitTimeNs > 0) {
		status = mCond.waitRelative(mMutex, waitTimeNs);
		}
		}
		LOG_ALWAYS_FATAL_IF(status != NO_ERROR, "TimeCheck timeout for %s", tag);
		return true;
		}

		}; // namespace android