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 4/4] gputop: Allow to set delay interval
Date: Wed,  1 May 2024 12:33:03 -0500	[thread overview]
Message-ID: <20240501173303.115737-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240501173303.115737-1-lucas.demarchi@intel.com>

Like `top` and `htop`, allow to pass -d, --delay =SEC[.TENTHS] as
argument.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 lib/igt_core.h |  1 +
 tools/gputop.c | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/igt_core.h b/lib/igt_core.h
index 26bb0cb68..084d94da7 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -1489,6 +1489,7 @@ void igt_kmsg(const char *format, ...);
 
 #define MSEC_PER_SEC (1000)
 #define USEC_PER_SEC (1000*MSEC_PER_SEC)
+#define USEC_PER_DECISEC (100*MSEC_PER_SEC)
 #define NSEC_PER_SEC (1000*USEC_PER_SEC)
 
 #define for_if(expr__) if (!(expr__)) {} else
diff --git a/tools/gputop.c b/tools/gputop.c
index 1ac382a7e..5634fa58a 100644
--- a/tools/gputop.c
+++ b/tools/gputop.c
@@ -26,6 +26,7 @@
 #include <sys/sysmacros.h>
 #include <stdbool.h>
 
+#include "igt_core.h"
 #include "igt_drm_clients.h"
 #include "igt_drm_fdinfo.h"
 #include "drmtest.h"
@@ -294,6 +295,7 @@ static void clrscr(void)
 
 struct gputop_args {
 	long n_iter;
+	unsigned long delay_usec;
 };
 
 static void help(void)
@@ -302,15 +304,17 @@ static void help(void)
 	       "\t%s [options]\n\n"
 	       "Options:\n"
 	       "\t-h, --help                show this help\n"
+	       "\t-d, --delay =SEC[.TENTHS] iterative delay as SECS [.TENTHS]\n"
 	       "\t-n, --iterations =NUMBER  number of executions\n"
 	       , program_invocation_short_name);
 }
 
 static int parse_args(int argc, char * const argv[], struct gputop_args *args)
 {
-	static const char cmdopts_s[] = "hn:";
+	static const char cmdopts_s[] = "hn:d:";
 	static const struct option cmdopts[] = {
 	       {"help", no_argument, 0, 'h'},
+	       {"delay", required_argument, 0, 'd'},
 	       {"iterations", required_argument, 0, 'n'},
 	       { }
 	};
@@ -318,9 +322,11 @@ static int parse_args(int argc, char * const argv[], struct gputop_args *args)
 	/* defaults */
 	memset(args, 0, sizeof(*args));
 	args->n_iter = -1;
+	args->delay_usec = 2 * USEC_PER_SEC;
 
 	for (;;) {
 		int c, idx = 0;
+		char *end_ptr = NULL;
 
 		c = getopt_long(argc, argv, cmdopts_s, cmdopts, &idx);
 		if (c == -1)
@@ -330,6 +336,16 @@ static int parse_args(int argc, char * const argv[], struct gputop_args *args)
 		case 'n':
 			args->n_iter = strtol(optarg, NULL, 10);
 			break;
+		case 'd':
+			args->delay_usec = strtoul(optarg, &end_ptr, 10) * USEC_PER_SEC;
+			if (*end_ptr == '.')
+				args->delay_usec += strtoul(end_ptr + 1, &end_ptr, 10) * USEC_PER_DECISEC;
+
+			if (!args->delay_usec) {
+				fprintf(stderr, "Invalid delay value: %s\n", optarg);
+				return -1;
+			}
+			break;
 		case 'h':
 			help();
 			return 0;
@@ -345,7 +361,7 @@ static int parse_args(int argc, char * const argv[], struct gputop_args *args)
 int main(int argc, char **argv)
 {
 	struct gputop_args args;
-	unsigned int period_us = 2e6;
+	unsigned int period_us;
 	struct igt_drm_clients *clients = NULL;
 	int con_w = -1, con_h = -1;
 	int ret;
@@ -358,6 +374,7 @@ int main(int argc, char **argv)
 		return EXIT_SUCCESS;
 
 	n = args.n_iter;
+	period_us = args.delay_usec;
 
 	clients = igt_drm_clients_init(NULL);
 	if (!clients)
-- 
2.45.0


  parent reply	other threads:[~2024-05-01 17:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-01 17:32 [PATCH 0/4] Minor gputop improvements Lucas De Marchi
2024-05-01 17:33 ` [PATCH 1/4] gputop: print percentage number Lucas De Marchi
2024-05-07 18:22   ` Kamil Konieczny
2024-05-01 17:33 ` [PATCH 2/4] gputop: Add option parsing Lucas De Marchi
2024-05-07 18:24   ` Kamil Konieczny
2024-05-01 17:33 ` [PATCH 3/4] gputop: Allow to limit number of executions Lucas De Marchi
2024-05-07 18:26   ` Kamil Konieczny
2024-05-01 17:33 ` Lucas De Marchi [this message]
2024-05-07 18:29   ` [PATCH 4/4] gputop: Allow to set delay interval Kamil Konieczny
2024-05-01 18:17 ` ✓ CI.xeBAT: success for Minor gputop improvements Patchwork
2024-05-01 18:23 ` ✓ Fi.CI.BAT: " Patchwork
2024-05-01 19:15 ` ✗ CI.xeFULL: failure " Patchwork
2024-05-01 19:42 ` ✗ Fi.CI.IGT: " Patchwork
2024-05-08 15:57 ` [PATCH 0/4] " 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=20240501173303.115737-5-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