perf tools: Add 'struct perf_mmap' arg to record__write()
The struct perf_mmap map argument will hold the file pointer to write the data to. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20180913125450.21342-5-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
e035f4ca2a
commit
ded2b8fe2e
@@ -1285,7 +1285,7 @@ static int __auxtrace_mmap__read(struct perf_mmap *map,
|
||||
ev.auxtrace.tid = mm->tid;
|
||||
ev.auxtrace.cpu = mm->cpu;
|
||||
|
||||
if (fn(tool, &ev, data1, len1, data2, len2))
|
||||
if (fn(tool, map, &ev, data1, len1, data2, len2))
|
||||
return -1;
|
||||
|
||||
mm->prev = head;
|
||||
|
@@ -435,6 +435,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
|
||||
bool per_cpu);
|
||||
|
||||
typedef int (*process_auxtrace_t)(struct perf_tool *tool,
|
||||
struct perf_mmap *map,
|
||||
union perf_event *event, void *data1,
|
||||
size_t len1, void *data2, size_t len2);
|
||||
|
||||
|
@@ -281,7 +281,7 @@ int perf_mmap__read_init(struct perf_mmap *map)
|
||||
}
|
||||
|
||||
int perf_mmap__push(struct perf_mmap *md, void *to,
|
||||
int push(void *to, void *buf, size_t size))
|
||||
int push(struct perf_mmap *map, void *to, void *buf, size_t size))
|
||||
{
|
||||
u64 head = perf_mmap__read_head(md);
|
||||
unsigned char *data = md->base + page_size;
|
||||
@@ -300,7 +300,7 @@ int perf_mmap__push(struct perf_mmap *md, void *to,
|
||||
size = md->mask + 1 - (md->start & md->mask);
|
||||
md->start += size;
|
||||
|
||||
if (push(to, buf, size) < 0) {
|
||||
if (push(md, to, buf, size) < 0) {
|
||||
rc = -1;
|
||||
goto out;
|
||||
}
|
||||
@@ -310,7 +310,7 @@ int perf_mmap__push(struct perf_mmap *md, void *to,
|
||||
size = md->end - md->start;
|
||||
md->start += size;
|
||||
|
||||
if (push(to, buf, size) < 0) {
|
||||
if (push(md, to, buf, size) < 0) {
|
||||
rc = -1;
|
||||
goto out;
|
||||
}
|
||||
|
@@ -93,7 +93,7 @@ union perf_event *perf_mmap__read_forward(struct perf_mmap *map);
|
||||
union perf_event *perf_mmap__read_event(struct perf_mmap *map);
|
||||
|
||||
int perf_mmap__push(struct perf_mmap *md, void *to,
|
||||
int push(void *to, void *buf, size_t size));
|
||||
int push(struct perf_mmap *map, void *to, void *buf, size_t size));
|
||||
|
||||
size_t perf_mmap__mmap_len(struct perf_mmap *map);
|
||||
|
||||
|
Reference in New Issue
Block a user