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

am 3034624f: Merge change I26a2d829 into eclair

Browse Source 
Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2

* commit '3034624f68d373d7c79237425319b5b7fd84317e':
  Add -P flag to ps in dumpstate
This commit is contained in:
Evan Millar
2009-10-29 19:31:24 -07:00
committed by Android Git Automerger
parent 492dbe1752 3034624f68
commit 2d05af0c8a
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/dumpstate/dumpstate.c
View File

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

18
cmds/dumpstate/dumpstate.h
View File

@@ -61,6 +61,15 @@
run_command(&c, TIMEOUT); \ 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) \ #define EXEC2(cmd, a1, a2) \
{ \ { \
static struct Command c = { \ static struct Command c = { \
@@ -70,6 +79,15 @@
run_command(&c, TIMEOUT); \ 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) \ #define EXEC4(cmd, a1, a2, a3, a4) \
{ \ { \
static struct Command c = { \ static struct Command c = { \