diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
| commit | 3001a035439d8134a7d70d796376d1dfbff3cdcd (patch) | |
| tree | 343ccdba15a594ff6e50c874a145232753315a30 /cmds/dumpstate | |
| parent | da996f390e17e16f2dfa60e972e7ebc4f868f37e (diff) | |
| download | frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.zip frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.tar.gz frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'cmds/dumpstate')
| -rw-r--r-- | cmds/dumpstate/dumpstate.c | 26 | ||||
| -rw-r--r-- | cmds/dumpstate/dumpstate.h | 18 |
2 files changed, 31 insertions, 13 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 4621f57..e08230f 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -40,6 +40,18 @@ static void dumpstate(int full) { PRINT("========================================================"); PRINT("== dumpstate"); PRINT("========================================================"); + PRINT("------ MEMORY INFO ------"); + DUMP("/proc/meminfo"); + PRINT("------ CPU INFO ------"); + EXEC7("top", "-n", "1", "-d", "1", "-m", "30", "-t"); + PRINT("------ PROCRANK ------"); + EXEC_XBIN("procrank"); + PRINT("------ VIRTUAL MEMORY STATS ------"); + DUMP("/proc/vmstat"); + PRINT("------ SLAB INFO ------"); + DUMP("/proc/slabinfo"); + PRINT("------ ZONEINFO ------"); + DUMP("/proc/zoneinfo"); PRINT("------ SYSTEM LOG ------"); EXEC4("logcat", "-v", "time", "-d", "*:v"); PRINT("------ VM TRACES ------"); @@ -67,20 +79,8 @@ static void dumpstate(int full) { EXEC("ps"); PRINT("------ PROCESSES AND THREADS ------"); EXEC2("ps", "-t", "-p"); - PRINT("------ MEMORY INFO ------"); - DUMP("/proc/meminfo"); - PRINT("------ PSS INFO ------"); - EXEC8("top", "-n", "1", "-d", "0", "-m", "15", "-s", "pss"); - PRINT("------ PROCRANK ------"); - EXEC("procrank"); PRINT("------ LIBRANK ------"); - EXEC("librank"); - PRINT("------ VIRTUAL MEMORY STATS ------"); - DUMP("/proc/vmstat"); - PRINT("------ SLAB INFO ------"); - DUMP("/proc/slabinfo"); - PRINT("------ ZONEINFO ------"); - DUMP("/proc/zoneinfo"); + EXEC_XBIN("librank"); PRINT("------ BINDER FAILED TRANSACTION LOG ------"); DUMP("/proc/binder/failed_transaction_log"); PRINT(""); diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h index b956f99..4e88e4b 100644 --- a/cmds/dumpstate/dumpstate.h +++ b/cmds/dumpstate/dumpstate.h @@ -43,6 +43,15 @@ run_command(&c, TIMEOUT); \ } +#define EXEC_XBIN(cmd) \ +{ \ + static struct Command c = { \ + "/system/xbin/" cmd, \ + { cmd, 0 } \ + }; \ + run_command(&c, TIMEOUT); \ +} + #define EXEC2(cmd, a1, a2) \ { \ static struct Command c = { \ @@ -70,6 +79,15 @@ run_command(&c, TIMEOUT); \ } +#define EXEC7(cmd, a1, a2, a3, a4, a5, a6, a7) \ +{ \ + static struct Command c = { \ + "/system/bin/" cmd, \ + { cmd, a1, a2, a3, a4, a5, a6, a7, 0 } \ + }; \ + run_command(&c, TIMEOUT); \ +} + #define EXEC8(cmd, a1, a2, a3, a4, a5, a6, a7, a8) \ { \ static struct Command c = { \ |