Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3034624f authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I26a2d829 into eclair 

* changes:
  Add -P flag to ps in dumpstate
parents 4388b988 26a2d829

cmds/dumpstate/dumpstate.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

    }

}

cmds/dumpstate/dumpstate.h

+18 −0
Original line number Diff line number Diff line
@@ -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 = {     \