Merge "audioflinger: add watchdog on main mutex" into nyc-mr1-dev (6da0f8d1) · Commits · e / os / android_frameworks_av

services/audioflinger/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,8 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := \
		ServiceUtilities.cpp
		ServiceUtilities.cpp \
		LockWatch.cpp

		# FIXME Move this library to frameworks/native
		LOCAL_MODULE := libserviceutility

services/audioflinger/AudioFlinger.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,9 @@ void AudioFlinger::onFirstRef()
		}

		mPatchPanel = new PatchPanel(this);

		// FIXME: bug 30737845: trigger audioserver restart if main audioflinger lock
		// is held continuously for more than 3 seconds
		mLockWatch = new LockWatch(mLock, String8("AudioFlinger"));
		mMode = AUDIO_MODE_NORMAL;
		}

		@@ -279,6 +281,7 @@ AudioFlinger::~AudioFlinger()
		}
		}
		}
		mLockWatch->requestExitAndWait();
		}

		static const char * const audio_interfaces[] = {

services/audioflinger/AudioFlinger.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		#include "SpdifStreamOut.h"
		#include "AudioHwDevice.h"
		#include "LinearMap.h"
		#include "LockWatch.h"

		#include <powermanager/IPowerManager.h>

		@@ -630,6 +631,7 @@ private:
		};

		mutable Mutex mLock;
		sp<LockWatch> mLockWatch;
		// protects mClients and mNotificationClients.
		// must be locked after mLock and ThreadBase::mLock if both must be locked
		// avoids acquiring AudioFlinger::mLock from inside thread loop.

services/audioflinger/LockWatch.cpp

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.
		*/

		#define LOG_TAG "LockWatch"
		//#define LOG_NDEBUG 0

		#include <utils/Log.h>
		#include "LockWatch.h"

		namespace android {

		void LockWatch::onFirstRef()
		{
		run("lock watch", ANDROID_PRIORITY_URGENT_AUDIO);
		}

		bool LockWatch::threadLoop()
		{
		while (!exitPending()) {
		// we neglect previous lock time effect on period
		usleep(mPeriodMs * 1000);
		if (mLock.timedLock(milliseconds(mTimeOutMs)) != NO_ERROR) {
		LOG_ALWAYS_FATAL("LockWatch timeout for: %s", mTag.string());
		}
		mLock.unlock();
		}
		return false;
		}

		} // namespace android

services/audioflinger/LockWatch.h

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.
		*/


		#ifndef LOCK_WATCH_H
		#define LOCK_WATCH_H

		#include <utils/String8.h>
		#include <utils/Thread.h>

		namespace android {

		// periodically checks if a mutex can be acquired and kill process otherwise
		class LockWatch : public Thread {

		public:
		static const uint32_t DEFAULT_PERIOD_MS = 10000; // 10 seconds default check period
		static const uint32_t DEFAULT_TIMEOUT_MS = 3000; // 3 seconds default lock timeout

		LockWatch(Mutex& lock, const String8& tag = String8(""),
		uint32_t periodMs = DEFAULT_PERIOD_MS, uint32_t timeoutMs = DEFAULT_TIMEOUT_MS)
		: Thread(false /canCallJava/),
		mLock(lock), mTag(tag), mPeriodMs(periodMs), mTimeOutMs(timeoutMs) {}

		virtual ~LockWatch() { }

		// RefBase
		virtual void onFirstRef();

		private:
		// Thread
		virtual bool threadLoop();

		Mutex& mLock; // monitored mutex
		String8 mTag; // tag
		uint32_t mPeriodMs; // check period in milliseconds
		uint32_t mTimeOutMs; // mutex lock timeout in milliseconds
		};

		} // namespace android

		#endif // LOCK_WATCH_H