[PATCH i-g-t 8/8] lib/igt_drm_clients: lazy stat process
Tvrtko Ursulin
tursulin at ursulin.net
Wed Apr 3 16:24:52 UTC 2024
On 02/04/2024 23:17, Lucas De Marchi wrote:
> 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.
This sounds like a very good optimisation to me too and I also don't
understand how it could be making things less efficient (as you say in
the cover letter). Unfortunately I will not have time to cross check in
the next week or so.
Regards,
Tvrtko
> Signed-off-by: Lucas De Marchi <lucas.demarchi at 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 c174c96ab..1e9781c68 100644
> --- a/lib/igt_drm_clients.c
> +++ b/lib/igt_drm_clients.c
> @@ -367,26 +367,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;
> @@ -480,13 +487,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;
> @@ -498,17 +503,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;
> @@ -541,6 +535,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)
More information about the igt-dev
mailing list