Merge change I26a2d829 into eclair

* changes:
  Add -P flag to ps in dumpstate
This commit is contained in:
Android (Google) Code Review
2009-10-29 16:40:32 -04:00
2 changed files with 20 additions and 3 deletions

View File

@@ -86,9 +86,9 @@ static void dumpstate(int full) {
DUMP("/proc/wakelocks");
PRINT("");
PRINT("------ PROCESSES ------");
EXEC("ps");
EXEC1("ps", "-P");
PRINT("------ PROCESSES AND THREADS ------");
EXEC2("ps", "-t", "-p");
EXEC3("ps", "-t", "-p", "-P");
PRINT("------ LIBRANK ------");
EXEC_XBIN("librank");
PRINT("------ BINDER FAILED TRANSACTION LOG ------");
@@ -362,4 +362,3 @@ static void dump_kernel_log(const char *path, const char *title)
DUMP(path);
}
}

View File

@@ -61,6 +61,15 @@
run_command(&c, TIMEOUT); \
}
#define EXEC1(cmd, a1) \
{ \
static struct Command c = { \
"/system/bin/" cmd, \
{ cmd, a1, 0 } \
}; \
run_command(&c, TIMEOUT); \
}
#define EXEC2(cmd, a1, a2) \
{ \
static struct Command c = { \
@@ -70,6 +79,15 @@
run_command(&c, TIMEOUT); \
}
#define EXEC3(cmd, a1, a2, a3) \
{ \
static struct Command c = { \
"/system/bin/" cmd, \
{ cmd, a1, a2, a3, 0 } \
}; \
run_command(&c, TIMEOUT); \
}
#define EXEC4(cmd, a1, a2, a3, a4) \
{ \
static struct Command c = { \