Skip to content

Commit

Permalink
perf tools: Add reference counting for cpu_map object
Browse files Browse the repository at this point in the history
Adding refference counting for cpu_map object, so it could be easily
shared among other objects.

Using cpu_map__put instead cpu_map__delete and making cpu_map__delete
static.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1435012588-9007-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
olsajiri authored and acmel committed Jun 25, 2015
1 parent 4cc9761 commit f30a79b
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 15 deletions.
2 changes: 1 addition & 1 deletion tools/perf/tests/code-reading.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ static int do_test_code_reading(bool try_kcore)
if (evlist) {
perf_evlist__delete(evlist);
} else {
cpu_map__delete(cpus);
cpu_map__put(cpus);
thread_map__delete(threads);
}
machines__destroy_kernel_maps(&machines);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/tests/keep-tracking.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ int test__keep_tracking(void)
perf_evlist__disable(evlist);
perf_evlist__delete(evlist);
} else {
cpu_map__delete(cpus);
cpu_map__put(cpus);
thread_map__delete(threads);
}

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/tests/mmap-basic.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ int test__basic_mmap(void)
cpus = NULL;
threads = NULL;
out_free_cpus:
cpu_map__delete(cpus);
cpu_map__put(cpus);
out_free_threads:
thread_map__delete(threads);
return err;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/tests/switch-tracking.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ int test__switch_tracking(void)
perf_evlist__disable(evlist);
perf_evlist__delete(evlist);
} else {
cpu_map__delete(cpus);
cpu_map__put(cpus);
thread_map__delete(threads);
}

Expand Down
26 changes: 24 additions & 2 deletions tools/perf/util/cpumap.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "asm/bug.h"

static struct cpu_map *cpu_map__default_new(void)
{
Expand All @@ -22,6 +23,7 @@ static struct cpu_map *cpu_map__default_new(void)
cpus->map[i] = i;

cpus->nr = nr_cpus;
atomic_set(&cpus->refcnt, 1);
}

return cpus;
Expand All @@ -35,6 +37,7 @@ static struct cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)
if (cpus != NULL) {
cpus->nr = nr_cpus;
memcpy(cpus->map, tmp_cpus, payload_size);
atomic_set(&cpus->refcnt, 1);
}

return cpus;
Expand Down Expand Up @@ -194,14 +197,32 @@ struct cpu_map *cpu_map__dummy_new(void)
if (cpus != NULL) {
cpus->nr = 1;
cpus->map[0] = -1;
atomic_set(&cpus->refcnt, 1);
}

return cpus;
}

void cpu_map__delete(struct cpu_map *map)
static void cpu_map__delete(struct cpu_map *map)
{
free(map);
if (map) {
WARN_ONCE(atomic_read(&map->refcnt) != 0,
"cpu_map refcnt unbalanced\n");
free(map);
}
}

struct cpu_map *cpu_map__get(struct cpu_map *map)
{
if (map)
atomic_inc(&map->refcnt);
return map;
}

void cpu_map__put(struct cpu_map *map)
{
if (map && atomic_dec_and_test(&map->refcnt))
cpu_map__delete(map);
}

int cpu_map__get_socket(struct cpu_map *map, int idx)
Expand Down Expand Up @@ -263,6 +284,7 @@ static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
/* ensure we process id in increasing order */
qsort(c->map, c->nr, sizeof(int), cmp_ids);

atomic_set(&cpus->refcnt, 1);
*res = c;
return 0;
}
Expand Down
6 changes: 5 additions & 1 deletion tools/perf/util/cpumap.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,29 @@

#include <stdio.h>
#include <stdbool.h>
#include <linux/atomic.h>

#include "perf.h"
#include "util/debug.h"

struct cpu_map {
atomic_t refcnt;
int nr;
int map[];
};

struct cpu_map *cpu_map__new(const char *cpu_list);
struct cpu_map *cpu_map__dummy_new(void);
void cpu_map__delete(struct cpu_map *map);
struct cpu_map *cpu_map__read(FILE *file);
size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp);
int cpu_map__get_socket(struct cpu_map *map, int idx);
int cpu_map__get_core(struct cpu_map *map, int idx);
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);
int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);

struct cpu_map *cpu_map__get(struct cpu_map *map);
void cpu_map__put(struct cpu_map *map);

static inline int cpu_map__socket(struct cpu_map *sock, int s)
{
if (!sock || s > sock->nr || s < 0)
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/evlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ void perf_evlist__delete(struct perf_evlist *evlist)
{
perf_evlist__munmap(evlist);
perf_evlist__close(evlist);
cpu_map__delete(evlist->cpus);
cpu_map__put(evlist->cpus);
thread_map__delete(evlist->threads);
evlist->cpus = NULL;
evlist->threads = NULL;
Expand Down Expand Up @@ -1353,7 +1353,7 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
out:
return err;
out_free_cpus:
cpu_map__delete(evlist->cpus);
cpu_map__put(evlist->cpus);
evlist->cpus = NULL;
goto out;
}
Expand Down
1 change: 1 addition & 0 deletions tools/perf/util/evsel.c
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)
perf_evsel__free_fd(evsel);
perf_evsel__free_id(evsel);
close_cgroup(evsel->cgrp);
cpu_map__put(evsel->cpus);
zfree(&evsel->group_name);
zfree(&evsel->name);
perf_evsel__object.fini(evsel);
Expand Down
5 changes: 4 additions & 1 deletion tools/perf/util/parse-events.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "parse-events-flex.h"
#include "pmu.h"
#include "thread_map.h"
#include "cpumap.h"
#include "asm/bug.h"

#define MAX_NAME_LEN 100
Expand Down Expand Up @@ -285,7 +286,9 @@ __add_event(struct list_head *list, int *idx,
if (!evsel)
return NULL;

evsel->cpus = cpus;
if (cpus)
evsel->cpus = cpu_map__get(cpus);

if (name)
evsel->name = strdup(name);
list_add_tail(&evsel->node, list);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/python.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus,

static void pyrf_cpu_map__delete(struct pyrf_cpu_map *pcpus)
{
cpu_map__delete(pcpus->cpus);
cpu_map__put(pcpus->cpus);
pcpus->ob_type->tp_free((PyObject*)pcpus);
}

Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/record.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static bool perf_probe_api(setup_probe_fn_t fn)
if (!cpus)
return false;
cpu = cpus->map[0];
cpu_map__delete(cpus);
cpu_map__put(cpus);

do {
ret = perf_do_probe_api(fn, cpu, try[i++]);
Expand Down Expand Up @@ -226,7 +226,7 @@ bool perf_evlist__can_select_event(struct perf_evlist *evlist, const char *str)
struct cpu_map *cpus = cpu_map__new(NULL);

cpu = cpus ? cpus->map[0] : 0;
cpu_map__delete(cpus);
cpu_map__put(cpus);
} else {
cpu = evlist->cpus->map[0];
}
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ int perf_session__cpu_bitmap(struct perf_session *session,
err = 0;

out_delete_map:
cpu_map__delete(map);
cpu_map__put(map);
return err;
}

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/svghelper.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ static int str_to_bitmap(char *s, cpumask_t *b)
set_bit(c, cpumask_bits(b));
}

cpu_map__delete(m);
cpu_map__put(m);

return ret;
}
Expand Down

0 comments on commit f30a79b

Please sign in to comment.