perf pmu: Add perf_pmu__destroy() function

It seems there's no function to delete the perf pmu struct.  Add the
perf_pmu__destroy() to do the job.  While at it, add some more helper
functions to delete pmu aliases and caps.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230331202949.810326-2-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index e3aae731bd6fe287f689bff914482aa48b1770ab..b112606f36ec8adcc1890f39abecbf8a2243dc54 100644 (file)
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -300,6 +300,16 @@ void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
        free(newalias);
 }
 
+static void perf_pmu__del_aliases(struct perf_pmu *pmu)
+{
+       struct perf_pmu_alias *alias, *tmp;
+
+       list_for_each_entry_safe(alias, tmp, &pmu->aliases, list) {
+               list_del(&alias->list);
+               perf_pmu_free_alias(alias);
+       }
+}
+
 /* Merge an alias, search in alias list. If this name is already
  * present merge both of them to combine all information.
  */
@@ -921,6 +931,8 @@ static struct perf_pmu *pmu_lookup(const char *lookup_name)
 
        if (is_hybrid)
                list_add_tail(&pmu->hybrid_list, &perf_pmu__hybrid_pmus);
+       else
+               INIT_LIST_HEAD(&pmu->hybrid_list);
 
        pmu->default_config = perf_pmu__get_default_config(pmu);
 
@@ -1750,6 +1762,18 @@ free_caps:
        return -ENOMEM;
 }
 
+static void perf_pmu__del_caps(struct perf_pmu *pmu)
+{
+       struct perf_pmu_caps *caps, *tmp;
+
+       list_for_each_entry_safe(caps, tmp, &pmu->caps, list) {
+               list_del(&caps->list);
+               free(caps->name);
+               free(caps->value);
+               free(caps);
+       }
+}
+
 /*
  * Reading/parsing the given pmu capabilities, which should be located at:
  * /sys/bus/event_source/devices/<dev>/caps as sysfs group attributes.
@@ -1932,3 +1956,29 @@ int perf_pmu__pathname_scnprintf(char *buf, size_t size,
                return 0;
        return scnprintf(buf, size, "%s%s/%s", base_path, pmu_name, filename);
 }
+
+static void perf_pmu__delete(struct perf_pmu *pmu)
+{
+       perf_pmu__del_formats(&pmu->format);
+       perf_pmu__del_aliases(pmu);
+       perf_pmu__del_caps(pmu);
+
+       perf_cpu_map__put(pmu->cpus);
+
+       free(pmu->default_config);
+       free(pmu->name);
+       free(pmu->alias_name);
+       free(pmu);
+}
+
+void perf_pmu__destroy(void)
+{
+       struct perf_pmu *pmu, *tmp;
+
+       list_for_each_entry_safe(pmu, tmp, &pmus, list) {
+               list_del(&pmu->list);
+               list_del(&pmu->hybrid_list);
+
+               perf_pmu__delete(pmu);
+       }
+}

diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 24cf69ab32cd8e91b973a2b1662cf0e695b4bf2b..72fd5de334c0fd48492d0bfcc0669553214d948b 100644 (file)
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -259,4 +259,6 @@ int perf_pmu__pathname_scnprintf(char *buf, size_t size,
                                 const char *pmu_name, const char *filename);
 FILE *perf_pmu__open_file(struct perf_pmu *pmu, const char *name);
 
+void perf_pmu__destroy(void);
+
 #endif /* __PMU_H */