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 21/21] lib/igt_drm_clients: lazy stat process
Date: Tue, 23 Apr 2024 16:44:31 -0700 [thread overview]
Message-ID: <20240423234431.1959354-22-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240423234431.1959354-1-lucas.demarchi@intel.com>
Only try to get task data like pid and name when that is required.
Typically most of the processes in a system don't have a drm fd open.
So only open and use /proc/<pid>/stat when it's needed.
For the data below, system is running with just a single drm client:
Before:
Performance counter stats for './build/tools/gputop -d 0.1 -n 10':
507.19 msec task-clock # 0.334 CPUs utilized
29 context-switches # 57.178 /sec
4 cpu-migrations # 7.887 /sec
75 page-faults # 147.874 /sec
(...)
1.518253637 seconds time elapsed
0.007989000 seconds user
0.503351000 seconds sys
After:
Performance counter stats for './build/tools/gputop -d 0.1 -n 10':
384.01 msec task-clock # 0.275 CPUs utilized
17 context-switches # 44.270 /sec
1 cpu-migrations # 2.604 /sec
74 page-faults # 192.705 /sec
(...)
1.397640800 seconds time elapsed
0.008106000 seconds user
0.385048000 seconds sys
Looking only at the execution time of igt_drm_clients_scan() over 10
runs.
Before: 47138890 nsec
After: 33978388 nsec
So in both methods it shows a ~25% speedup. It is expected that in a
system with more clients this won't be as high.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_drm_clients.c | 50 +++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
index 8b1959ae1..49756beee 100644
--- a/lib/igt_drm_clients.c
+++ b/lib/igt_drm_clients.c
@@ -398,26 +398,33 @@ static size_t readat2buf(int at, const char *name, char *buf, const size_t sz)
}
}
-static bool get_task_name(const char *buffer, char *out, unsigned long sz)
+static void get_task_data(int pid_dir, unsigned int *pid, char *task, size_t tasksz)
{
- char *s = index(buffer, '(');
- char *e = rindex(buffer, ')');
- unsigned int len;
+ char buf[4096];
+ char *s, *e;
+ size_t len;
+ if (!readat2buf(pid_dir, "stat", buf, sizeof(buf)))
+ return;
+
+ s = strchr(buf, '(');
+ e = strchr(s, ')');
if (!s || !e)
- return false;
- assert(e >= s);
+ return;
len = e - ++s;
- if(!len || (len + 1) >= sz)
- return false;
+ if (!len)
+ return;
- strncpy(out, s, len);
- out[len] = 0;
+ if (len + 1 > tasksz)
+ len = tasksz - 1;
- return true;
+ strncpy(task, s, len);
+ task[len] = 0;
+ *pid = atoi(buf);
}
+
static bool is_drm_fd(int fd_dir, const char *name, unsigned int *minor)
{
struct stat stat;
@@ -511,13 +518,11 @@ igt_drm_clients_scan(struct igt_drm_clients *clients,
return clients;
while ((proc_dent = readdir(proc_dir)) != NULL) {
- unsigned int client_pid, minor = 0;
+ unsigned int client_pid = 0, minor = 0;
int pid_dir = -1, fd_dir = -1;
struct dirent *fdinfo_dent;
char client_name[64] = { };
DIR *fdinfo_dir = NULL;
- char buf[4096];
- size_t count;
if (proc_dent->d_type != DT_DIR)
continue;
@@ -529,17 +534,6 @@ igt_drm_clients_scan(struct igt_drm_clients *clients,
if (pid_dir < 0)
continue;
- count = readat2buf(pid_dir, "stat", buf, sizeof(buf));
- if (!count)
- goto next;
-
- client_pid = atoi(buf);
- if (!client_pid)
- goto next;
-
- if (!get_task_name(buf, client_name, sizeof(client_name)))
- goto next;
-
fd_dir = openat(pid_dir, "fd", O_DIRECTORY | O_RDONLY);
if (fd_dir < 0)
goto next;
@@ -572,6 +566,12 @@ igt_drm_clients_scan(struct igt_drm_clients *clients,
minor, info.id))
continue; /* Skip duplicate fds. */
+ if (!client_pid) {
+ get_task_data(pid_dir, &client_pid, client_name,
+ sizeof(client_name));
+ assert(client_pid > 0);
+ }
+
c = igt_drm_clients_find(clients, IGT_DRM_CLIENT_PROBE,
minor, info.id);
if (!c)
--
2.43.0
next prev 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 ` [PATCH i-g-t v2 05/21] gputop: Extract method to update console size Lucas De Marchi
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 ` Lucas De Marchi [this message]
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-22-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