From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Date: Tue, 10 Oct 2023 12:07:14 +0100 Message-Id: <20231010110714.749239-5-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20231010110714.749239-1-tvrtko.ursulin@linux.intel.com> References: <20231010110714.749239-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 4/4] tools/intel_gpu_top: Handle narrow terminals more gracefully List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tvrtko Ursulin Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Tvrtko Ursulin Instead of asserting just skip trying to print columns when terminal is too narrow. At the same time fix some type confusion to fix calculations going huge. Signed-off-by: Tvrtko Ursulin Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/143 --- tools/intel_gpu_top.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 472ce3f13ba9..6d1397cb8214 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -926,7 +926,7 @@ static void free_display_clients(struct igt_drm_clients *clients) free(clients); } -static unsigned int n_spaces(const unsigned int n) +static int n_spaces(const int n) { static const char *spaces[] = { " ", @@ -950,7 +950,7 @@ static unsigned int n_spaces(const unsigned int n) " ", #define MAX_SPACES 19 }; - unsigned int i, r = n; + int i, r = n; while (r) { if (r > MAX_SPACES) @@ -972,7 +972,8 @@ print_percentage_bar(double percent, double max, int max_len, bool numeric) int bar_len, i, len = max_len - 2; const int w = 8; - assert(max_len > 0); + if (len < 2) /* For edge lines '|' */ + return; bar_len = ceil(w * percent * len / max); if (bar_len > w * len) @@ -986,6 +987,8 @@ print_percentage_bar(double percent, double max, int max_len, bool numeric) printf("%s", bars[i]); len -= (bar_len + (w - 1)) / w; + if (len < 1) + return; n_spaces(len); putchar('|'); @@ -2001,8 +2004,7 @@ print_clients_header(struct igt_drm_clients *clients, int lines, 4 : clients->max_name_len; /* At least "NAME" */ if (output_mode == INTERACTIVE) { - unsigned int num_active = 0; - int len; + int len, num_active = 0; if (lines++ >= con_h) return lines; -- 2.39.2