drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Watchdog can get deadlocked on activity manager" into gingerbread

Browse Source
This commit is contained in:
Brad Fitzpatrick
2011-01-18 18:52:04 -08:00
committed by Android (Google) Code Review
parent b735aa0b6f 0971a1367f
commit 597fa828fa
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/Watchdog.java
View File

@ -425,7 +425,7 @@ public class Watchdog extends Thread {
// First collect stack traces from all threads of the system process. // First collect stack traces from all threads of the system process.
// Then kill this process so that the system will restart. // Then kill this process so that the system will restart.
String name = (mCurrentMonitor != null) ? final String name = (mCurrentMonitor != null) ?
mCurrentMonitor.getClass().getName() : "null"; mCurrentMonitor.getClass().getName() : "null";
EventLog.writeEvent(EventLogTags.WATCHDOG, name); EventLog.writeEvent(EventLogTags.WATCHDOG, name);
@ -434,7 +434,8 @@ public class Watchdog extends Thread {
if (mPhonePid > 0) pids.add(mPhonePid); if (mPhonePid > 0) pids.add(mPhonePid);
// Pass !waitedHalf so that just in case we somehow wind up here without having // Pass !waitedHalf so that just in case we somehow wind up here without having
// dumped the halfway stacks, we properly re-initialize the trace file. // dumped the halfway stacks, we properly re-initialize the trace file.
File stack = ActivityManagerService.dumpStackTraces(!waitedHalf, pids, null, null); final File stack = ActivityManagerService.dumpStackTraces(
!waitedHalf, pids, null, null);
// Give some extra time to make sure the stack traces get written. // Give some extra time to make sure the stack traces get written.
// The system's been hanging for a minute, another second or two won't hurt much. // The system's been hanging for a minute, another second or two won't hurt much.
@ -445,7 +446,19 @@ public class Watchdog extends Thread {
dumpKernelStackTraces(); dumpKernelStackTraces();
} }
mActivity.addErrorToDropBox("watchdog", null, null, null, name, null, stack, null); // Try to add the error to the dropbox, but assuming that the ActivityManager
// itself may be deadlocked. (which has happened, causing this statement to
// deadlock and the watchdog as a whole to be ineffective)
Thread dropboxThread = new Thread("watchdogWriteToDropbox") {
public void run() {
mActivity.addErrorToDropBox(
"watchdog", null, null, null, name, null, stack, null);
}
};
dropboxThread.start();
try {
dropboxThread.join(2000); // wait up to 2 seconds for it to return.
} catch (InterruptedException ignored) {}
// Only kill the process if the debugger is not attached. // Only kill the process if the debugger is not attached.
if (!Debug.isDebuggerConnected()) { if (!Debug.isDebuggerConnected()) {