Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e5c1208e: Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev

Browse Source 
* commit 'e5c1208ef9ef7d10b5bae6c82b9eb5a92da1244e':
  am: Increase dropbox buffer size to 256KB (from 128KB)
This commit is contained in:
Igor Murashkin
2013-10-29 14:23:06 -07:00
committed by Android Git Automerger
parent de50a5e7e1 e5c1208ef9
commit 73a523d9bf
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,8 @@ public class Watchdog extends Thread {
static final int WAITED_HALF = 2;
static final int OVERDUE = 3;
static final String[] NATIVE_STACKS_OF_INTEREST = new String[] {
// Which native processes to dump into dropbox's stack traces
public static final String[] NATIVE_STACKS_OF_INTEREST = new String[] {
"/system/bin/mediaserver",
"/system/bin/sdcard",
"/system/bin/surfaceflinger"

32
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -21,6 +21,7 @@ import static com.android.internal.util.XmlUtils.readIntAttribute;
import static com.android.internal.util.XmlUtils.readLongAttribute;
import static com.android.internal.util.XmlUtils.writeIntAttribute;
import static com.android.internal.util.XmlUtils.writeLongAttribute;
import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
@@ -322,6 +323,9 @@ public final class ActivityManagerService extends ActivityManagerNative
static final String[] EMPTY_STRING_ARRAY = new String[0];
// How many bytes to write into the dropbox log before truncating
static final int DROPBOX_MAX_SIZE = 256 * 1024;
/** Run all ActivityStacks through this */
ActivityStackSupervisor mStackSupervisor;
@@ -3687,7 +3691,17 @@ public final class ActivityManagerService extends ActivityManagerNative
}
}
// Next measure CPU usage.
// Next collect the stacks of the native pids
if (nativeProcs != null) {
int[] pids = Process.getPidsForCommands(nativeProcs);
if (pids != null) {
for (int pid : pids) {
Debug.dumpNativeBacktraceToFile(pid, tracesPath);
}
}
}
// Lastly, measure CPU usage.
if (processCpuTracker != null) {
processCpuTracker.init();
System.gc();
@@ -3719,19 +3733,9 @@ public final class ActivityManagerService extends ActivityManagerNative
}
}
}
} finally {
observer.stopWatching();
}
if (nativeProcs != null) {
int[] pids = Process.getPidsForCommands(nativeProcs);
if (pids != null) {
for (int pid : pids) {
Debug.dumpNativeBacktraceToFile(pid, tracesPath);
}
}
}
}
final void logAppTooSlow(ProcessRecord app, long startTime, String msg) {
@@ -3895,7 +3899,8 @@ public final class ActivityManagerService extends ActivityManagerNative
final ProcessCpuTracker processCpuTracker = new ProcessCpuTracker(true);
File tracesFile = dumpStackTraces(true, firstPids, processCpuTracker, lastPids, null);
File tracesFile = dumpStackTraces(true, firstPids, processCpuTracker, lastPids,
NATIVE_STACKS_OF_INTEREST);
String cpuInfo = null;
if (MONITOR_CPU_USAGE) {
@@ -9826,7 +9831,8 @@ public final class ActivityManagerService extends ActivityManagerNative
}
if (logFile != null) {
try {
sb.append(FileUtils.readTextFile(logFile, 128 * 1024, "\n\n[[TRUNCATED]]"));
sb.append(FileUtils.readTextFile(logFile, DROPBOX_MAX_SIZE,
"\n\n[[TRUNCATED]]"));
} catch (IOException e) {
Slog.e(TAG, "Error reading " + logFile, e);
}