Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>,
	Tvrtko Ursulin <tursulin@ursulin.net>,
	Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t v2 05/21] gputop: Extract method to update console size
Date: Tue, 23 Apr 2024 16:44:15 -0700	[thread overview]
Message-ID: <20240423234431.1959354-6-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240423234431.1959354-1-lucas.demarchi@intel.com>

Cleanup the mainloop moving the console size handling to a helper
functions.

Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 tools/gputop.c | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/tools/gputop.c b/tools/gputop.c
index 8f81e6fca..455f77d0c 100644
--- a/tools/gputop.c
+++ b/tools/gputop.c
@@ -268,6 +268,23 @@ static int client_cmp(const void *_a, const void *_b, void *unused)
 
 }
 
+static void update_console_size(int *w, int *h)
+{
+	struct winsize ws = {};
+
+	if (ioctl(0, TIOCGWINSZ, &ws) == -1)
+		return;
+
+	*w = ws.ws_col;
+	*h = ws.ws_row;
+
+	if (*w == 0 && *h == 0) {
+		/* Serial console. */
+		*w = 80;
+		*h = 24;
+	}
+}
+
 int main(int argc, char **argv)
 {
 	unsigned int period_us = 2e6;
@@ -283,17 +300,8 @@ int main(int argc, char **argv)
 	for (;;) {
 		struct igt_drm_client *c, *prevc = NULL;
 		int i, engine_w = 0, lines = 0;
-		struct winsize ws;
-
-		if (ioctl(0, TIOCGWINSZ, &ws) != -1) {
-			con_w = ws.ws_col;
-			con_h = ws.ws_row;
-			if (con_w == 0 && con_h == 0) {
-				/* Serial console. */
-				con_w = 80;
-				con_h = 24;
-			}
-		}
+
+		update_console_size(&con_w, &con_h);
 
 		igt_drm_clients_scan(clients, NULL, NULL, 0, NULL, 0);
 		igt_drm_clients_sort(clients, client_cmp);
-- 
2.43.0


  parent reply	other threads:[~2024-04-23 23:43 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23 23:44 [PATCH i-g-t v2 00/21] gputop: Add support for xe Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 01/21] lib/igt_drm_fdinfo: Fix wrong name len assert Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 02/21] lib/igt_drm_fdinfo: Assert pdev is not truncated Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 03/21] lib/igt_drm_fdinfo: Detect invalid drm-client-id Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 04/21] lib/igt_drm_fdinfo: Stop ignoring space where not needed Lucas De Marchi
2024-04-23 23:44 ` Lucas De Marchi [this message]
2024-04-23 23:44 ` [PATCH i-g-t v2 06/21] gputop: Extract clrscr() Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 07/21] lib/igt_drm_fdinfo: Extract ignore_space() Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 08/21] lib/igt_drm_fdinfo: Allow any number of spaces before unit Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 09/21] lib/igt_drm_fdinfo: Stop passing key twice Lucas De Marchi
2024-04-25 21:27   ` Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 10/21] lib/igt_drm_fdinfo: Remove prefix arg from parse functions Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 11/21] lib/igt_drm_fdinfo: Parse drm-cycles Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 12/21] lib/igt_drm_fdinfo: Parse drm-total-cycles Lucas De Marchi
2024-04-26 11:03   ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 13/21] lib/igt_drm_clients: Rename engine busyness variables Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 14/21] lib/igt_drm_clients: Move engine fields to substruct Lucas De Marchi
2024-04-26 11:05   ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 15/21] lib/igt_drm_clients: Record total cycles Lucas De Marchi
2024-04-26 11:11   ` Tvrtko Ursulin
2024-04-26 13:28     ` Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 16/21] gputop: Add support to drm-cycles/drm-total-cycles Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 17/21] gputop: print percentage number Lucas De Marchi
2024-04-26 11:16   ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 18/21] gputop: Add option parsing Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 19/21] gputop: Allow to limit number of executions Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 20/21] gputop: Allow to set delay interval Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 21/21] lib/igt_drm_clients: lazy stat process Lucas De Marchi
2024-04-24  0:32 ` ✗ GitLab.Pipeline: warning for gputop: Add support for xe (rev2) Patchwork
2024-04-24  0:53 ` ✓ Fi.CI.BAT: success " Patchwork
2024-04-24  1:29 ` ✓ CI.xeBAT: " Patchwork
2024-04-24 11:47 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-04-24 15:23 ` ✗ CI.xeFULL: " Patchwork
2024-04-25 22:17 ` ✓ CI.xeBAT: success for gputop: Add support for xe (rev3) Patchwork
2024-04-25 22:20 ` ✓ Fi.CI.BAT: " Patchwork
2024-04-26  1:38 ` ✗ Fi.CI.IGT: failure " 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=20240423234431.1959354-6-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=tursulin@ursulin.net \
    --cc=umesh.nerlige.ramappa@intel.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox