From d7bd5759d2935f05dd3c99a075b67978ea97584b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 13 Nov 2015 08:30:12 -0800 Subject: [PATCH] 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 --- toolbox/top.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolbox/top.c b/toolbox/top.c index 1e99d4cc0..0ea5a5e75 100644 --- a/toolbox/top.c +++ b/toolbox/top.c @@ -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); }