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

Commit d7bd5759 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Improve top(1) compatibility and interactive usefulness. 

The toolbox -t option is really the standard -H option. Add -H so
I can switch dumpstate over.

We should also flush after each run so we don't arbitrarily truncate
at the stdio buffer size. (I'm pretty sure no one uses toolbox top
interactively, but it annoyed me while testing -H.)

Change-Id: Ib87cb541d1b21c48468614b2ef60b0cc62694c95
parent 61a560ae

toolbox/top.c

+3 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int top_main(int argc, char *argv[]) { 
            fprintf(stderr, "Invalid argument \"%s\" for option -s.\n", argv[i]);

            exit(EXIT_FAILURE);

        }

        if (!strcmp(argv[i], "-t")) { threads = 1; continue; }

        if (!strcmp(argv[i], "-H") || !strcmp(argv[i], "-t")) { threads = 1; continue; }

        if (!strcmp(argv[i], "-h")) {

            usage(argv[0]);

            exit(EXIT_SUCCESS);
@@ -187,6 +187,7 @@ int top_main(int argc, char *argv[]) { 
        read_procs();

        print_procs();

        free_old_procs();

        fflush(stdout);

    }



    return 0;
@@ -566,7 +567,7 @@ static void usage(char *cmd) { 
                    "    -n num  Updates to show before exiting.\n"

                    "    -d num  Seconds to wait between updates.\n"

                    "    -s col  Column to sort by (cpu,vss,rss,thr).\n"

                    "    -t      Show threads instead of processes.\n"

                    "    -H      Show threads instead of processes.\n"

                    "    -h      Display this help screen.\n",

        cmd);

}