From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Cc: Caleb Callaway <caleb.callaway@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 1/3] intel_gpu_top: Do not repeat header lines in non-interactive output Date: Fri, 3 Feb 2023 11:16:34 +0000 [thread overview] Message-ID: <20230203111636.4138202-2-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20230203111636.4138202-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> If output is redirected to a file, or a pipe, lets not repeat the headers because that can usually mean user is trying to parse the data later and so repeated headers are a hindrance. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Caleb Callaway <caleb.callaway@intel.com> --- tools/intel_gpu_top.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 0a1de41b3374..e2a7f4753099 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -1391,6 +1391,7 @@ static unsigned int stdout_level; #define STDOUT_HEADER_REPEAT 20 static unsigned int stdout_lines = STDOUT_HEADER_REPEAT; +static bool stdout_header_repeat; static void stdout_open_struct(const char *name) @@ -1580,16 +1581,22 @@ static const struct print_operations term_pops = { static bool print_groups(struct cnt_group **groups) { - unsigned int headers = stdout_lines % STDOUT_HEADER_REPEAT + 1; + static bool headers_printed = false; bool print_data = true; - if (output_mode == STDOUT && (headers == 1 || headers == 2)) { - for (struct cnt_group **grp = groups; *grp; grp++) - print_data = pops->print_group(*grp, headers); + if (output_mode == STDOUT && + (stdout_header_repeat || !headers_printed)) { + unsigned int headers = stdout_lines % STDOUT_HEADER_REPEAT + 1; + + if (headers == 1 || headers == 2) + for (struct cnt_group **grp = groups; *grp; grp++) + print_data = pops->print_group(*grp, headers); + + headers_printed = print_data; } for (struct cnt_group **grp = groups; print_data && *grp; grp++) - pops->print_group(*grp, false); + pops->print_group(*grp, 0); return print_data; } @@ -2512,6 +2519,8 @@ int main(int argc, char **argv) out = stdout; } + stdout_header_repeat = output_mode == STDOUT && isatty(fileno(out)); + if (signal(SIGINT, sigint_handler) == SIG_ERR) fprintf(stderr, "Failed to install signal handler!\n"); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Cc: Caleb Callaway <caleb.callaway@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: [igt-dev] [PATCH i-g-t 1/3] intel_gpu_top: Do not repeat header lines in non-interactive output Date: Fri, 3 Feb 2023 11:16:34 +0000 [thread overview] Message-ID: <20230203111636.4138202-2-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20230203111636.4138202-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> If output is redirected to a file, or a pipe, lets not repeat the headers because that can usually mean user is trying to parse the data later and so repeated headers are a hindrance. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Caleb Callaway <caleb.callaway@intel.com> --- tools/intel_gpu_top.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 0a1de41b3374..e2a7f4753099 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -1391,6 +1391,7 @@ static unsigned int stdout_level; #define STDOUT_HEADER_REPEAT 20 static unsigned int stdout_lines = STDOUT_HEADER_REPEAT; +static bool stdout_header_repeat; static void stdout_open_struct(const char *name) @@ -1580,16 +1581,22 @@ static const struct print_operations term_pops = { static bool print_groups(struct cnt_group **groups) { - unsigned int headers = stdout_lines % STDOUT_HEADER_REPEAT + 1; + static bool headers_printed = false; bool print_data = true; - if (output_mode == STDOUT && (headers == 1 || headers == 2)) { - for (struct cnt_group **grp = groups; *grp; grp++) - print_data = pops->print_group(*grp, headers); + if (output_mode == STDOUT && + (stdout_header_repeat || !headers_printed)) { + unsigned int headers = stdout_lines % STDOUT_HEADER_REPEAT + 1; + + if (headers == 1 || headers == 2) + for (struct cnt_group **grp = groups; *grp; grp++) + print_data = pops->print_group(*grp, headers); + + headers_printed = print_data; } for (struct cnt_group **grp = groups; print_data && *grp; grp++) - pops->print_group(*grp, false); + pops->print_group(*grp, 0); return print_data; } @@ -2512,6 +2519,8 @@ int main(int argc, char **argv) out = stdout; } + stdout_header_repeat = output_mode == STDOUT && isatty(fileno(out)); + if (signal(SIGINT, sigint_handler) == SIG_ERR) fprintf(stderr, "Failed to install signal handler!\n"); -- 2.34.1
next prev parent reply other threads:[~2023-02-03 11:16 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-03 11:16 [Intel-gfx] [PATCH i-g-t 0/3] More intel_gpu_top improvements Tvrtko Ursulin 2023-02-03 11:16 ` [igt-dev] " Tvrtko Ursulin 2023-02-03 11:16 ` Tvrtko Ursulin [this message] 2023-02-03 11:16 ` [igt-dev] [PATCH i-g-t 1/3] intel_gpu_top: Do not repeat header lines in non-interactive output Tvrtko Ursulin 2023-02-07 13:25 ` [Intel-gfx] " Kamil Konieczny 2023-02-07 13:25 ` [igt-dev] " Kamil Konieczny 2023-02-08 12:31 ` Kamil Konieczny 2023-02-08 12:31 ` [igt-dev] " Kamil Konieczny 2023-02-09 8:24 ` Tvrtko Ursulin 2023-02-09 8:24 ` [igt-dev] " Tvrtko Ursulin 2023-02-03 11:16 ` [Intel-gfx] [PATCH i-g-t 2/3] intel_gpu_top: Rename STDOUT to TEXT Tvrtko Ursulin 2023-02-03 11:16 ` [igt-dev] " Tvrtko Ursulin 2023-02-07 13:15 ` [Intel-gfx] " Kamil Konieczny 2023-02-07 13:15 ` Kamil Konieczny 2023-02-03 11:16 ` [Intel-gfx] [PATCH i-g-t 3/3] intel_gpu_top: Add CVS output format Tvrtko Ursulin 2023-02-03 11:16 ` [igt-dev] " Tvrtko Ursulin 2023-02-03 11:22 ` [Intel-gfx] " Ville Syrjälä 2023-02-03 11:22 ` Ville Syrjälä 2023-02-03 11:27 ` [Intel-gfx] " Tvrtko Ursulin 2023-02-03 11:27 ` Tvrtko Ursulin 2023-02-03 11:30 ` [Intel-gfx] [PATCH i-g-t 3/3] intel_gpu_top: Add CSV " Tvrtko Ursulin 2023-02-03 11:30 ` [igt-dev] " Tvrtko Ursulin 2023-02-03 11:31 ` [Intel-gfx] " Tvrtko Ursulin 2023-02-03 11:31 ` [igt-dev] " Tvrtko Ursulin 2023-02-07 13:29 ` [Intel-gfx] " Kamil Konieczny 2023-02-07 13:29 ` [igt-dev] " Kamil Konieczny 2023-02-03 14:49 ` [igt-dev] ✓ Fi.CI.BAT: success for More intel_gpu_top improvements (rev3) Patchwork 2023-02-04 17:27 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20230203111636.4138202-2-tvrtko.ursulin@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=Intel-gfx@lists.freedesktop.org \ --cc=caleb.callaway@intel.com \ --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.