Commit a8cd4766 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf cpumap: Remove refcnt from 'struct cpu_aggr_map' 



It is assigned a value of 1 and never incremented. Remove and replace
puts with delete.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Li Dong <lidong@vivo.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Paran Lee <p4ranlee@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20240507183545.1236093-5-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 557b32c3

tools/perf/builtin-stat.c

+3 −13
Original line number Diff line number Diff line
@@ -1631,23 +1631,13 @@ static int perf_stat_init_aggr_mode(void) 


static void cpu_aggr_map__delete(struct cpu_aggr_map *map)

{

	if (map) {

		WARN_ONCE(refcount_read(&map->refcnt) != 0,

			  "cpu_aggr_map refcnt unbalanced\n");

	free(map);

}

}



static void cpu_aggr_map__put(struct cpu_aggr_map *map)

{

	if (map && refcount_dec_and_test(&map->refcnt))

		cpu_aggr_map__delete(map);

}



static void perf_stat__exit_aggr_mode(void)

{

	cpu_aggr_map__put(stat_config.aggr_map);

	cpu_aggr_map__put(stat_config.cpus_aggr_map);

	cpu_aggr_map__delete(stat_config.aggr_map);

	cpu_aggr_map__delete(stat_config.cpus_aggr_map);

	stat_config.aggr_map = NULL;

	stat_config.cpus_aggr_map = NULL;

}

tools/perf/util/cpumap.c

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr) 
		cpus->nr = nr;

		for (i = 0; i < nr; i++)

			cpus->map[i] = aggr_cpu_id__empty();



		refcount_set(&cpus->refcnt, 1);

	}



	return cpus;

tools/perf/util/cpumap.h

+0 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <stdbool.h>

#include <stdio.h>

#include <perf/cpumap.h>

#include <linux/refcount.h>



/** Identify where counts are aggregated, -1 implies not to aggregate. */

struct aggr_cpu_id {
@@ -37,7 +36,6 @@ struct aggr_cpu_id { 


/** A collection of aggr_cpu_id values, the "built" version is sorted and uniqued. */

struct cpu_aggr_map {

	refcount_t refcnt;

	/** Number of valid entries. */

	int nr;

	/** The entries. */