Message ID | 20210203114456.895974-1-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [i-g-t,1/2] intel_gpu_top: Show banner messages when cycling sort modes | expand |
Quoting Tvrtko Ursulin (2021-02-03 11:44:55) > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > It is useful to let the user know what is the currently active sort mode. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > tools/intel_gpu_top.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c > index 584aa21b198a..b409106f3718 100644 > --- a/tools/intel_gpu_top.c > +++ b/tools/intel_gpu_top.c > @@ -1479,6 +1479,8 @@ print_header_token(const char *cont, int lines, int con_w, int con_h, int *rem, > return lines; > } > > +static const char *header_msg; > + > static int > print_header(const struct igt_device_card *card, > const char *codename, > @@ -1593,8 +1595,14 @@ print_header(const struct igt_device_card *card, > if (lines++ < con_h) > printf("\n"); > > - if (lines++ < con_h) > - printf("\n"); > + if (lines++ < con_h) { > + if (header_msg) { > + printf(" >>> %s\n", header_msg); > + header_msg = NULL; I was just about to ask if we showed it once, then cleared it 1s later. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > + } else { > + printf("\n"); > + } > + } > } > > return lines; > @@ -2146,12 +2154,15 @@ static void select_client_sort(void) > switch (++client_sort % 3) { > case 0: > client_cmp = client_last_cmp; > + header_msg = "Sorting clients by current GPU usage."; > break; > case 1: > client_cmp = client_total_cmp; > + header_msg = "Sorting clients by accummulated GPU usage."; > break; > case 2: > client_cmp = client_id_cmp; > + header_msg = "Sorting clients by sysfs id."; Do we care about "sysfs"? Just "Sorting clients by id."? -Chris
On 03/02/2021 11:47, Chris Wilson wrote: > Quoting Tvrtko Ursulin (2021-02-03 11:44:55) >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> >> It is useful to let the user know what is the currently active sort mode. >> >> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> --- >> tools/intel_gpu_top.c | 15 +++++++++++++-- >> 1 file changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c >> index 584aa21b198a..b409106f3718 100644 >> --- a/tools/intel_gpu_top.c >> +++ b/tools/intel_gpu_top.c >> @@ -1479,6 +1479,8 @@ print_header_token(const char *cont, int lines, int con_w, int con_h, int *rem, >> return lines; >> } >> >> +static const char *header_msg; >> + >> static int >> print_header(const struct igt_device_card *card, >> const char *codename, >> @@ -1593,8 +1595,14 @@ print_header(const struct igt_device_card *card, >> if (lines++ < con_h) >> printf("\n"); >> >> - if (lines++ < con_h) >> - printf("\n"); >> + if (lines++ < con_h) { >> + if (header_msg) { >> + printf(" >>> %s\n", header_msg); >> + header_msg = NULL; > > I was just about to ask if we showed it once, then cleared it 1s later. > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > >> + } else { >> + printf("\n"); >> + } >> + } >> } >> >> return lines; >> @@ -2146,12 +2154,15 @@ static void select_client_sort(void) >> switch (++client_sort % 3) { >> case 0: >> client_cmp = client_last_cmp; >> + header_msg = "Sorting clients by current GPU usage."; >> break; >> case 1: >> client_cmp = client_total_cmp; >> + header_msg = "Sorting clients by accummulated GPU usage."; >> break; >> case 2: >> client_cmp = client_id_cmp; >> + header_msg = "Sorting clients by sysfs id."; > > Do we care about "sysfs"? Just "Sorting clients by id."? I was even doubting if having this sort is justified at all. Drop after next patch (pid sort)? Regards, Tvrtko
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 584aa21b198a..b409106f3718 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -1479,6 +1479,8 @@ print_header_token(const char *cont, int lines, int con_w, int con_h, int *rem, return lines; } +static const char *header_msg; + static int print_header(const struct igt_device_card *card, const char *codename, @@ -1593,8 +1595,14 @@ print_header(const struct igt_device_card *card, if (lines++ < con_h) printf("\n"); - if (lines++ < con_h) - printf("\n"); + if (lines++ < con_h) { + if (header_msg) { + printf(" >>> %s\n", header_msg); + header_msg = NULL; + } else { + printf("\n"); + } + } } return lines; @@ -2146,12 +2154,15 @@ static void select_client_sort(void) switch (++client_sort % 3) { case 0: client_cmp = client_last_cmp; + header_msg = "Sorting clients by current GPU usage."; break; case 1: client_cmp = client_total_cmp; + header_msg = "Sorting clients by accummulated GPU usage."; break; case 2: client_cmp = client_id_cmp; + header_msg = "Sorting clients by sysfs id."; } }