From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t 3/3] intel_gpu_top: Interactive help screen Date: Wed, 10 Feb 2021 09:37:56 +0000 [thread overview] Message-ID: <20210210093756.61424-3-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20210210093756.61424-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Show a list of supported interactive commands when pressing 'h'. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- man/intel_gpu_top.rst | 1 + tools/intel_gpu_top.c | 68 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/man/intel_gpu_top.rst b/man/intel_gpu_top.rst index 20658e291db0..f6d74852558b 100644 --- a/man/intel_gpu_top.rst +++ b/man/intel_gpu_top.rst @@ -54,6 +54,7 @@ RUNTIME CONTROL Supported keys: 'q' Exit from the tool. + 'h' Show interactive help. '1' Toggle between aggregated engine class and physical engine mode. 'n' Toggle display of numeric client busyness overlay. 's' Toggle between sort modes (runtime, total runtime, pid, client id). diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 018e28a66c10..c0e45ddb24e1 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -2255,19 +2255,31 @@ static void select_client_sort(void) header_msg = cmp[client_sort].msg; } -static void process_stdin(unsigned int timeout_us) +static bool in_help; + +static void process_help_stdin(void) { - struct pollfd p = { .fd = 0, .events = POLLIN }; - int ret; + for (;;) { + int ret; + char c; - ret = poll(&p, 1, timeout_us / 1000); - if (ret <= 0) { - if (ret < 0) - stop_top = true; - return; + ret = read(0, &c, 1); + if (ret <= 0) + break; + + switch (c) { + case 'q': + case 'h': + in_help = false; + break; + }; } +} +static void process_normal_stdin(void) +{ for (;;) { + int ret; char c; ret = read(0, &c, 1); @@ -2298,6 +2310,9 @@ static void process_stdin(unsigned int timeout_us) case 's': select_client_sort(); break; + case 'h': + in_help = true; + break; case 'H': aggregate_pids ^= true; if (aggregate_pids) @@ -2309,6 +2324,38 @@ static void process_stdin(unsigned int timeout_us) } } +static void process_stdin(unsigned int timeout_us) +{ + struct pollfd p = { .fd = 0, .events = POLLIN }; + int ret; + + ret = poll(&p, 1, timeout_us / 1000); + if (ret <= 0) { + if (ret < 0) + stop_top = true; + return; + } + + if (in_help) + process_help_stdin(); + else + process_normal_stdin(); +} + +static void show_help_screen(void) +{ + printf( +"Help for interactive commands:\n\n" +" '1' Toggle between aggregated engine class and physical engine mode.\n" +" 'n' Toggle display of numeric client busyness overlay.\n" +" 's' Toggle between sort modes (runtime, total runtime, pid, client id).\n" +" 'i' Toggle display of clients which used no GPU time.\n" +" 'H' Toggle between per PID aggregation and individual clients.\n" +"\n" +" 'h' or 'q' Exit interactive help.\n" +"\n"); +} + int main(int argc, char **argv) { unsigned int period_us = DEFAULT_PERIOD_MS * 1000; @@ -2491,6 +2538,11 @@ int main(int argc, char **argv) t, lines, con_w, con_h, &consumed); + if (in_help) { + show_help_screen(); + break; + } + lines = print_imc(engines, t, lines, con_w, con_h); lines = print_engines(engines, t, lines, con_w, con_h); -- 2.27.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: [igt-dev] [PATCH i-g-t 3/3] intel_gpu_top: Interactive help screen Date: Wed, 10 Feb 2021 09:37:56 +0000 [thread overview] Message-ID: <20210210093756.61424-3-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20210210093756.61424-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Show a list of supported interactive commands when pressing 'h'. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- man/intel_gpu_top.rst | 1 + tools/intel_gpu_top.c | 68 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/man/intel_gpu_top.rst b/man/intel_gpu_top.rst index 20658e291db0..f6d74852558b 100644 --- a/man/intel_gpu_top.rst +++ b/man/intel_gpu_top.rst @@ -54,6 +54,7 @@ RUNTIME CONTROL Supported keys: 'q' Exit from the tool. + 'h' Show interactive help. '1' Toggle between aggregated engine class and physical engine mode. 'n' Toggle display of numeric client busyness overlay. 's' Toggle between sort modes (runtime, total runtime, pid, client id). diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 018e28a66c10..c0e45ddb24e1 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -2255,19 +2255,31 @@ static void select_client_sort(void) header_msg = cmp[client_sort].msg; } -static void process_stdin(unsigned int timeout_us) +static bool in_help; + +static void process_help_stdin(void) { - struct pollfd p = { .fd = 0, .events = POLLIN }; - int ret; + for (;;) { + int ret; + char c; - ret = poll(&p, 1, timeout_us / 1000); - if (ret <= 0) { - if (ret < 0) - stop_top = true; - return; + ret = read(0, &c, 1); + if (ret <= 0) + break; + + switch (c) { + case 'q': + case 'h': + in_help = false; + break; + }; } +} +static void process_normal_stdin(void) +{ for (;;) { + int ret; char c; ret = read(0, &c, 1); @@ -2298,6 +2310,9 @@ static void process_stdin(unsigned int timeout_us) case 's': select_client_sort(); break; + case 'h': + in_help = true; + break; case 'H': aggregate_pids ^= true; if (aggregate_pids) @@ -2309,6 +2324,38 @@ static void process_stdin(unsigned int timeout_us) } } +static void process_stdin(unsigned int timeout_us) +{ + struct pollfd p = { .fd = 0, .events = POLLIN }; + int ret; + + ret = poll(&p, 1, timeout_us / 1000); + if (ret <= 0) { + if (ret < 0) + stop_top = true; + return; + } + + if (in_help) + process_help_stdin(); + else + process_normal_stdin(); +} + +static void show_help_screen(void) +{ + printf( +"Help for interactive commands:\n\n" +" '1' Toggle between aggregated engine class and physical engine mode.\n" +" 'n' Toggle display of numeric client busyness overlay.\n" +" 's' Toggle between sort modes (runtime, total runtime, pid, client id).\n" +" 'i' Toggle display of clients which used no GPU time.\n" +" 'H' Toggle between per PID aggregation and individual clients.\n" +"\n" +" 'h' or 'q' Exit interactive help.\n" +"\n"); +} + int main(int argc, char **argv) { unsigned int period_us = DEFAULT_PERIOD_MS * 1000; @@ -2491,6 +2538,11 @@ int main(int argc, char **argv) t, lines, con_w, con_h, &consumed); + if (in_help) { + show_help_screen(); + break; + } + lines = print_imc(engines, t, lines, con_w, con_h); lines = print_engines(engines, t, lines, con_w, con_h); -- 2.27.0 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-02-10 9:38 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-10 9:37 [Intel-gfx] [PATCH i-g-t 1/3] intel_gpu_top: Wrap interactive header Tvrtko Ursulin 2021-02-10 9:37 ` [igt-dev] " Tvrtko Ursulin 2021-02-10 9:37 ` [Intel-gfx] [PATCH i-g-t 2/3] intel_gpu_top: Aggregate clients by PID by default Tvrtko Ursulin 2021-02-10 9:44 ` Tvrtko Ursulin 2021-02-10 10:35 ` [Intel-gfx] [igt-dev] " Chris Wilson 2021-02-10 10:35 ` Chris Wilson 2021-02-10 10:55 ` [Intel-gfx] " Tvrtko Ursulin 2021-02-10 10:55 ` Tvrtko Ursulin 2021-02-10 11:03 ` [Intel-gfx] " Chris Wilson 2021-02-10 10:53 ` [Intel-gfx] " Tvrtko Ursulin 2021-02-10 11:06 ` Chris Wilson 2021-02-10 11:06 ` [igt-dev] " Chris Wilson 2021-02-10 11:12 ` Tvrtko Ursulin 2021-02-10 11:12 ` [igt-dev] " Tvrtko Ursulin 2021-02-10 9:37 ` Tvrtko Ursulin [this message] 2021-02-10 9:37 ` [igt-dev] [PATCH i-g-t 3/3] intel_gpu_top: Interactive help screen Tvrtko Ursulin 2021-02-10 10:36 ` [Intel-gfx] " Chris Wilson 2021-02-10 10:36 ` Chris Wilson 2021-02-10 10:37 ` [Intel-gfx] [PATCH i-g-t 1/3] intel_gpu_top: Wrap interactive header Chris Wilson 2021-02-10 11:35 ` [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/3] intel_gpu_top: Wrap interactive header (rev4) Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210210093756.61424-3-tvrtko.ursulin@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=Intel-gfx@lists.freedesktop.org \ --cc=igt-dev@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.