From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>,
Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Subject: [CI 5/6] tools/gputop: Extract method to update console size
Date: Tue, 30 Apr 2024 12:01:49 -0700 [thread overview]
Message-ID: <20240430190150.3654507-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240430190150.3654507-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
next prev parent reply other threads:[~2024-04-30 19:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 19:01 [CI 1/6] lib/igt_drm_fdinfo: Fix wrong name len assert Lucas De Marchi
2024-04-30 19:01 ` [CI 2/6] lib/igt_drm_fdinfo: Assert pdev is not truncated Lucas De Marchi
2024-04-30 19:01 ` [CI 3/6] lib/igt_drm_fdinfo: Detect invalid drm-client-id Lucas De Marchi
2024-04-30 19:01 ` [CI 4/6] lib/igt_drm_fdinfo: Stop ignoring space where not needed Lucas De Marchi
2024-04-30 19:01 ` Lucas De Marchi [this message]
2024-04-30 19:01 ` [CI 6/6] tools/gputop: Extract clrscr() Lucas De Marchi
2024-04-30 21:11 ` ✓ Fi.CI.BAT: success for series starting with [CI,1/6] lib/igt_drm_fdinfo: Fix wrong name len assert Patchwork
2024-04-30 21:19 ` ✓ CI.xeBAT: " Patchwork
2024-05-01 2:24 ` ✗ CI.xeFULL: failure " Patchwork
2024-05-01 6:42 ` ✗ Fi.CI.IGT: " Patchwork
2024-05-01 13:59 ` [CI 1/6] " Lucas De Marchi
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=20240430190150.3654507-5-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--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