Give Watchdog a lock (1/n) (8cb3527b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/Watchdog.java

+15 −13

Original line number	Original line	Diff line number	Diff line
	@@ -131,6 +131,8 @@ public class Watchdog extends Thread {

	private static Watchdog sWatchdog;		private static Watchdog sWatchdog;

			private final Object mLock = new Object();

	/* This handler will be used to post message back onto the main thread */		/* This handler will be used to post message back onto the main thread */
	private final ArrayList<HandlerChecker> mHandlerCheckers = new ArrayList<>();		private final ArrayList<HandlerChecker> mHandlerCheckers = new ArrayList<>();
	private final HandlerChecker mMonitorChecker;		private final HandlerChecker mMonitorChecker;
	@@ -240,13 +242,13 @@ public class Watchdog extends Thread {
	// point we have completed execution of this method.		// point we have completed execution of this method.
	final int size = mMonitors.size();		final int size = mMonitors.size();
	for (int i = 0 ; i < size ; i++) {		for (int i = 0 ; i < size ; i++) {
	synchronized (Watchdog.this) {		synchronized (mLock) {
	mCurrentMonitor = mMonitors.get(i);		mCurrentMonitor = mMonitors.get(i);
	}		}
	mCurrentMonitor.monitor();		mCurrentMonitor.monitor();
	}		}

	synchronized (Watchdog.this) {		synchronized (mLock) {
	mCompleted = true;		mCompleted = true;
	mCurrentMonitor = null;		mCurrentMonitor = null;
	}		}
	@@ -377,7 +379,7 @@ public class Watchdog extends Thread {
	public void processStarted(String processName, int pid) {		public void processStarted(String processName, int pid) {
	if (isInterestingJavaProcess(processName)) {		if (isInterestingJavaProcess(processName)) {
	Slog.i(TAG, "Interesting Java process " + processName + " started. Pid " + pid);		Slog.i(TAG, "Interesting Java process " + processName + " started. Pid " + pid);
	synchronized (this) {		synchronized (mLock) {
	mInterestingJavaPids.add(pid);		mInterestingJavaPids.add(pid);
	}		}
	}		}
	@@ -389,26 +391,26 @@ public class Watchdog extends Thread {
	public void processDied(String processName, int pid) {		public void processDied(String processName, int pid) {
	if (isInterestingJavaProcess(processName)) {		if (isInterestingJavaProcess(processName)) {
	Slog.i(TAG, "Interesting Java process " + processName + " died. Pid " + pid);		Slog.i(TAG, "Interesting Java process " + processName + " died. Pid " + pid);
	synchronized (this) {		synchronized (mLock) {
	mInterestingJavaPids.remove(Integer.valueOf(pid));		mInterestingJavaPids.remove(Integer.valueOf(pid));
	}		}
	}		}
	}		}

	public void setActivityController(IActivityController controller) {		public void setActivityController(IActivityController controller) {
	synchronized (this) {		synchronized (mLock) {
	mController = controller;		mController = controller;
	}		}
	}		}

	public void setAllowRestart(boolean allowRestart) {		public void setAllowRestart(boolean allowRestart) {
	synchronized (this) {		synchronized (mLock) {
	mAllowRestart = allowRestart;		mAllowRestart = allowRestart;
	}		}
	}		}

	public void addMonitor(Monitor monitor) {		public void addMonitor(Monitor monitor) {
	synchronized (this) {		synchronized (mLock) {
	mMonitorChecker.addMonitorLocked(monitor);		mMonitorChecker.addMonitorLocked(monitor);
	}		}
	}		}
	@@ -418,7 +420,7 @@ public class Watchdog extends Thread {
	}		}

	public void addThread(Handler thread, long timeoutMillis) {		public void addThread(Handler thread, long timeoutMillis) {
	synchronized (this) {		synchronized (mLock) {
	final String name = thread.getLooper().getThread().getName();		final String name = thread.getLooper().getThread().getName();
	mHandlerCheckers.add(new HandlerChecker(thread, name, timeoutMillis));		mHandlerCheckers.add(new HandlerChecker(thread, name, timeoutMillis));
	}		}
	@@ -438,7 +440,7 @@ public class Watchdog extends Thread {
	* pauses have been resumed.		* pauses have been resumed.
	*/		*/
	public void pauseWatchingCurrentThread(String reason) {		public void pauseWatchingCurrentThread(String reason) {
	synchronized (this) {		synchronized (mLock) {
	for (HandlerChecker hc : mHandlerCheckers) {		for (HandlerChecker hc : mHandlerCheckers) {
	if (Thread.currentThread().equals(hc.getThread())) {		if (Thread.currentThread().equals(hc.getThread())) {
	hc.pauseLocked(reason);		hc.pauseLocked(reason);
	@@ -460,7 +462,7 @@ public class Watchdog extends Thread {
	* as many times as the calls to pause.		* as many times as the calls to pause.
	*/		*/
	public void resumeWatchingCurrentThread(String reason) {		public void resumeWatchingCurrentThread(String reason) {
	synchronized (this) {		synchronized (mLock) {
	for (HandlerChecker hc : mHandlerCheckers) {		for (HandlerChecker hc : mHandlerCheckers) {
	if (Thread.currentThread().equals(hc.getThread())) {		if (Thread.currentThread().equals(hc.getThread())) {
	hc.resumeLocked(reason);		hc.resumeLocked(reason);
	@@ -557,7 +559,7 @@ public class Watchdog extends Thread {
	final String subject;		final String subject;
	final boolean allowRestart;		final boolean allowRestart;
	int debuggerWasConnected = 0;		int debuggerWasConnected = 0;
	synchronized (this) {		synchronized (mLock) {
	long timeout = CHECK_INTERVAL;		long timeout = CHECK_INTERVAL;
	// Make sure we (re)spin the checkers that have become idle within		// Make sure we (re)spin the checkers that have become idle within
	// this wait-and-check interval		// this wait-and-check interval
	@@ -580,7 +582,7 @@ public class Watchdog extends Thread {
	debuggerWasConnected = 2;		debuggerWasConnected = 2;
	}		}
	try {		try {
	wait(timeout);		mLock.wait(timeout);
	// Note: mHandlerCheckers and mMonitorChecker may have changed after waiting		// Note: mHandlerCheckers and mMonitorChecker may have changed after waiting
	} catch (InterruptedException e) {		} catch (InterruptedException e) {
	Log.wtf(TAG, e);		Log.wtf(TAG, e);
	@@ -678,7 +680,7 @@ public class Watchdog extends Thread {
	} catch (InterruptedException ignored) {}		} catch (InterruptedException ignored) {}

	IActivityController controller;		IActivityController controller;
	synchronized (this) {		synchronized (mLock) {
	controller = mController;		controller = mController;
	}		}
	if (controller != null) {		if (controller != null) {