Merge "Move potentially blocking operation out of the activity controller." into froyo
This commit is contained in:
@@ -118,6 +118,11 @@ public class Monkey {
|
|||||||
*/
|
*/
|
||||||
private boolean mRequestDumpsysMemInfo = false;
|
private boolean mRequestDumpsysMemInfo = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is set by the ActivityController thread to request a "procrank"
|
||||||
|
*/
|
||||||
|
private boolean mRequestProcRank = false;
|
||||||
|
|
||||||
/** Kill the process after a timeout or crash. */
|
/** Kill the process after a timeout or crash. */
|
||||||
private boolean mKillProcessAfterError;
|
private boolean mKillProcessAfterError;
|
||||||
|
|
||||||
@@ -261,10 +266,10 @@ public class Monkey {
|
|||||||
public int appNotResponding(String processName, int pid, String processStats) {
|
public int appNotResponding(String processName, int pid, String processStats) {
|
||||||
System.err.println("// NOT RESPONDING: " + processName + " (pid " + pid + ")");
|
System.err.println("// NOT RESPONDING: " + processName + " (pid " + pid + ")");
|
||||||
System.err.println(processStats);
|
System.err.println(processStats);
|
||||||
reportProcRank();
|
|
||||||
synchronized (Monkey.this) {
|
synchronized (Monkey.this) {
|
||||||
mRequestAnrTraces = true;
|
mRequestAnrTraces = true;
|
||||||
mRequestDumpsysMemInfo = true;
|
mRequestDumpsysMemInfo = true;
|
||||||
|
mRequestProcRank = true;
|
||||||
}
|
}
|
||||||
if (!mIgnoreTimeouts) {
|
if (!mIgnoreTimeouts) {
|
||||||
synchronized (Monkey.this) {
|
synchronized (Monkey.this) {
|
||||||
@@ -852,6 +857,10 @@ public class Monkey {
|
|||||||
|
|
||||||
while (!systemCrashed && cycleCounter < mCount) {
|
while (!systemCrashed && cycleCounter < mCount) {
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
|
if (mRequestProcRank) {
|
||||||
|
reportProcRank();
|
||||||
|
mRequestProcRank = false;
|
||||||
|
}
|
||||||
if (mRequestAnrTraces) {
|
if (mRequestAnrTraces) {
|
||||||
reportAnrTraces();
|
reportAnrTraces();
|
||||||
mRequestAnrTraces = false;
|
mRequestAnrTraces = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user