Hi Tvrtko,
On 2023-10-12 at 09:15:44 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
>
> Same concept as with the engine map, allowing callers to pass in fixed
> map of names to indices, simplifying their implementation and avoiding
> auto-detection while parsing.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Reviewed-by: Kamil Konieczny <kamil.koniec...@linux.intel.com>
> ---
> lib/igt_drm_clients.c | 5 +++--
> lib/igt_drm_clients.h | 3 ++-
> tools/gputop.c | 4 ++--
> tools/intel_gpu_top.c | 8 +++++---
> 4 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
> index da51d7335b2b..025d60c51503 100644
> --- a/lib/igt_drm_clients.c
> +++ b/lib/igt_drm_clients.c
> @@ -445,7 +445,8 @@ struct igt_drm_clients *
> igt_drm_clients_scan(struct igt_drm_clients *clients,
> bool (*filter_client)(const struct igt_drm_clients *,
> const struct drm_client_fdinfo *),
> - const char **name_map, unsigned int map_entries)
> + const char **name_map, unsigned int map_entries,
> + const char **region_map, unsigned int region_entries)
> {
> struct dirent *proc_dent;
> struct igt_drm_client *c;
> @@ -524,7 +525,7 @@ igt_drm_clients_scan(struct igt_drm_clients *clients,
> if (!__igt_parse_drm_fdinfo(dirfd(fdinfo_dir),
> fdinfo_dent->d_name, &info,
> name_map, map_entries,
> - NULL, 0))
> + region_map, region_entries))
> continue;
>
> if (filter_client && !filter_client(clients, &info))
> diff --git a/lib/igt_drm_clients.h b/lib/igt_drm_clients.h
> index cd37f8508b20..52888aedc25a 100644
> --- a/lib/igt_drm_clients.h
> +++ b/lib/igt_drm_clients.h
> @@ -93,7 +93,8 @@ struct igt_drm_clients *
> igt_drm_clients_scan(struct igt_drm_clients *clients,
> bool (*filter_client)(const struct igt_drm_clients *,
> const struct drm_client_fdinfo *),
> - const char **name_map, unsigned int map_entries);
> + const char **name_map, unsigned int map_entries,
> + const char **region_map, unsigned int region_entries);
>
> struct igt_drm_clients *
> igt_drm_clients_sort(struct igt_drm_clients *clients,
> diff --git a/tools/gputop.c b/tools/gputop.c
> index ea95e0333dd2..71e28f43ee4c 100644
> --- a/tools/gputop.c
> +++ b/tools/gputop.c
> @@ -253,7 +253,7 @@ int main(int argc, char **argv)
> if (!clients)
> exit(1);
>
> - igt_drm_clients_scan(clients, NULL, NULL, 0);
> + igt_drm_clients_scan(clients, NULL, NULL, 0, NULL, 0);
>
> for (;;) {
> struct igt_drm_client *c, *prevc = NULL;
> @@ -270,7 +270,7 @@ int main(int argc, char **argv)
> }
> }
>
> - igt_drm_clients_scan(clients, NULL, NULL, 0);
> + igt_drm_clients_scan(clients, NULL, NULL, 0, NULL, 0);
> igt_drm_clients_sort(clients, client_cmp);
>
> printf("\033[H\033[J");
> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
> index 34fa99235e11..091fe28068dc 100644
> --- a/tools/intel_gpu_top.c
> +++ b/tools/intel_gpu_top.c
> @@ -2619,8 +2619,9 @@ int main(int argc, char **argv)
> }
>
> pmu_sample(engines);
> - igt_drm_clients_scan(clients, client_match, engine_map,
> - ARRAY_SIZE(engine_map));
> + igt_drm_clients_scan(clients, client_match,
> + engine_map, ARRAY_SIZE(engine_map),
> + NULL, 0);
> gettime(&ts);
>
> if (output_mode == JSON)
> @@ -2655,7 +2656,8 @@ int main(int argc, char **argv)
> display_clients(igt_drm_clients_scan(clients,
> client_match,
> engine_map,
> -
> ARRAY_SIZE(engine_map)));
> +
> ARRAY_SIZE(engine_map),
> + NULL, 0));
> scan_us = elapsed_us(&ts, period_us);
>
> if (stop_top)
> --
> 2.39.2
>
