libperf: Adopt perf_mmap__read_done() from tools/perf
Move perf_mmap__read_init() from tools/perf to libperf and export it in the perf/mmap.h header. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20191007125344.14268-12-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
7c4d41824f
commit
32fdc2ca7e
@@ -54,7 +54,7 @@ static int count_samples(struct evlist *evlist, int *sample_count,
|
||||
return TEST_FAIL;
|
||||
}
|
||||
}
|
||||
perf_mmap__read_done(map);
|
||||
perf_mmap__read_done(&map->core);
|
||||
}
|
||||
return TEST_OK;
|
||||
}
|
||||
|
@@ -194,7 +194,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
|
||||
if (type == PERF_RECORD_SAMPLE)
|
||||
count ++;
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
|
||||
if (count != expect) {
|
||||
|
@@ -435,7 +435,7 @@ static int process_events(struct machine *machine, struct evlist *evlist,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@@ -49,7 +49,7 @@ static int find_comm(struct evlist *evlist, const char *comm)
|
||||
found += 1;
|
||||
perf_mmap__consume(&md->core);
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
@@ -142,7 +142,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
|
||||
nr_events[evsel->idx]++;
|
||||
perf_mmap__consume(&md->core);
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
|
||||
out_init:
|
||||
err = 0;
|
||||
|
@@ -124,7 +124,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
|
||||
|
||||
goto out_ok;
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
|
||||
if (nr_events == before)
|
||||
|
@@ -279,7 +279,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
|
||||
|
||||
perf_mmap__consume(&md->core);
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -120,7 +120,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
|
||||
next_event:
|
||||
perf_mmap__consume(&md->core);
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
|
||||
out_init:
|
||||
if ((u64) nr_samples == total_periods) {
|
||||
|
@@ -280,7 +280,7 @@ static int process_events(struct evlist *evlist,
|
||||
if (ret < 0)
|
||||
goto out_free_nodes;
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
}
|
||||
|
||||
events_array = calloc(cnt, sizeof(struct event_node));
|
||||
|
@@ -127,7 +127,7 @@ retry:
|
||||
|
||||
perf_mmap__consume(&md->core);
|
||||
}
|
||||
perf_mmap__read_done(md);
|
||||
perf_mmap__read_done(&md->core);
|
||||
|
||||
out_init:
|
||||
if (!exited || !nr_exit) {
|
||||
|
Reference in New Issue
Block a user