Hi,
On 2023-03-28 at 13:54:27 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
>
> So far the width of the PID column was hardcoded to six characters which
> is not enough on systems with high uptime, where PID numbers can grow
> large, and results in broken line formatting.
>
> Fix it by tracking the largest width for both the pid and name fields and
> use them dynamically.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Reviewed-by: Kamil Konieczny <kamil.koniec...@linux.intel.com>
> ---
> tools/intel_gpu_top.c | 66 +++++++++++++++++++++++++++++++++++++------
> 1 file changed, 58 insertions(+), 8 deletions(-)
>
> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
> index a4302aa389b4..39be916297e4 100644
> --- a/tools/intel_gpu_top.c
> +++ b/tools/intel_gpu_top.c
> @@ -1,5 +1,5 @@
> /*
> - * Copyright © 2007-2021 Intel Corporation
> + * Copyright © 2007-2023 Intel Corporation
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> * copy of this software and associated documentation files (the "Software"),
> @@ -693,6 +693,7 @@ struct client {
> enum client_status status;
> unsigned int id;
> unsigned int pid;
> + char pid_str[10];
> char name[24];
> char print_name[24];
> unsigned int samples;
> @@ -709,6 +710,9 @@ struct clients {
> unsigned int num_classes;
> struct engine_class *class;
>
> + int max_pid_len;
> + int max_name_len;
> +
> char pci_slot[64];
>
> struct client *client;
> @@ -758,9 +762,14 @@ update_client(struct client *c, unsigned int pid, char
> *name,
> const struct drm_client_fdinfo *info)
> {
> unsigned int i;
> + int len;
>
> - if (c->pid != pid)
> + if (c->pid != pid) {
> c->pid = pid;
> + len = snprintf(c->pid_str, sizeof(c->pid_str) - 1, "%u", pid);
> + if (len > c->clients->max_pid_len)
> + c->clients->max_pid_len = len;
> + }
>
> if (strcmp(c->name, name)) {
> char *p;
> @@ -774,6 +783,10 @@ update_client(struct client *c, unsigned int pid, char
> *name,
> *p = '*';
> p++;
> }
> +
> + len = strlen(c->print_name);
> + if (len > c->clients->max_name_len)
> + c->clients->max_name_len = len;
> }
>
> c->last_runtime = 0;
> @@ -990,6 +1003,7 @@ static struct clients *display_clients(struct clients
> *clients)
> ac->id = -c->pid;
> ac->pid = c->pid;
> strcpy(ac->name, c->name);
> + strcpy(ac->pid_str, c->pid_str);
> strcpy(ac->print_name, c->print_name);
> ac->val = calloc(clients->num_classes,
> sizeof(ac->val[0]));
> @@ -1013,6 +1027,9 @@ static struct clients *display_clients(struct clients
> *clients)
> aggregated->num_clients = num;
> aggregated->active_clients = num;
>
> + aggregated->max_pid_len = clients->max_pid_len;
> + aggregated->max_name_len = clients->max_name_len;
> +
> clients = aggregated;
>
> out:
> @@ -1104,9 +1121,34 @@ static size_t readat2buf(int at, const char *name,
> char *buf, const size_t sz)
> }
> }
>
> +static void clients_update_max_lengths(struct clients *clients)
> +{
> + struct client *c;
> + int tmp;
> +
> + clients->max_name_len = 0;
> + clients->max_pid_len = 0;
> +
> + for_each_client(clients, c, tmp) {
> + int len;
> +
> + if (c->status != ALIVE)
> + continue; /* Array not yet sorted by the caller. */
> +
> + len = strlen(c->print_name);
> + if (len > clients->max_name_len)
> + clients->max_name_len = len;
> +
> + len = strlen(c->pid_str);
> + if (len > clients->max_pid_len)
> + clients->max_pid_len = len;
> + }
> +}
> +
> static struct clients *scan_clients(struct clients *clients, bool display)
> {
> struct dirent *proc_dent;
> + bool freed = false;
> struct client *c;
> DIR *proc_dir;
> int tmp;
> @@ -1208,12 +1250,17 @@ next:
> closedir(proc_dir);
>
> for_each_client(clients, c, tmp) {
> - if (c->status == PROBE)
> + if (c->status == PROBE) {
> free_client(c);
> - else if (c->status == FREE)
> + freed = true;
> + } else if (c->status == FREE) {
> break;
> + }
> }
>
> + if (freed)
> + clients_update_max_lengths(clients);
> +
> return display ? display_clients(clients) : clients;
> }
>
> @@ -2172,15 +2219,16 @@ print_clients_header(struct clients *clients, int
> lines,
> int con_w, int con_h, int *class_w)
> {
> if (output_mode == INTERACTIVE) {
> - const char *pidname = " PID NAME ";
> unsigned int num_active = 0;
> - int len = strlen(pidname);
> + int len;
>
> if (lines++ >= con_h)
> return lines;
>
> printf("\033[7m");
> - printf("%s", pidname);
> + len = printf("%*s %*s ",
> + clients->max_pid_len, "PID",
> + clients->max_name_len, "NAME");
>
> if (lines++ >= con_h || len >= con_w)
> return lines;
> @@ -2241,7 +2289,9 @@ print_client(struct client *c, struct engines *engines,
> double t, int lines,
>
> lines++;
>
> - printf("%6u %17s ", c->pid, c->print_name);
> + printf("%*s %*s ",
> + clients->max_pid_len, c->pid_str,
> + clients->max_name_len, c->print_name);
>
> for (i = 0; c->samples > 1 && i < clients->num_classes; i++) {
> double pct;
> --
> 2.37.2
>
