perf data: Clean up use_stdio and structures
Ian Rogers
reviewerPATCH 1/1 perf data: Clean up use_stdio and structures
use_stdio was associated with struct perf_data and not perf_data_file meaning there was implicit use of fd rather than fptr that may not be safe. For example, in perf_data_file__write. Reorganize perf_data_file to better abstract use_stdio, add kernel-doc and more consistently use perf_data__ accessors so that use_stdio is better respected.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/builtin-inject.c | 7 ++-- tools/perf/builtin-record.c | 10 +++-- tools/perf/tests/topology.c | 3 +- tools/perf/util/data.c | 81 ++++++++++++++++++++++++------------- tools/perf/util/data.h | 52 ++++++++++++++++++++---- tools/perf/util/session.c | 2 +- 6 files changed, 109 insertions(+), 46 deletions(-)
tools/perf/builtin-inject.c +3 -4
@@ -270,9 +270,8 @@ static s64 perf_event__repipe_auxtrace(const struct perf_tool *tool, inject->have_auxtrace = true;if (!inject->output.is_pipe) { -off_t offset; +off_t offset =perf_data__seek (&inject->output,0 ,SEEK_CUR ); - offset =lseek (inject->output.file.fd,0 ,SEEK_CUR );if (offset ==-1 )return -errno; ret = auxtrace_index__auxtrace_event(&session->auxtrace_index,
@@ -2479,12 +2478,12 @@ int cmd_inject(int argc, const char **argv) .output = { .path = "-", .mode = PERF_DATA_MODE_WRITE, - .use_stdio = true, + .file.use_stdio = true, }, };struct perf_data data = { .mode =PERF_DATA_MODE_READ , - .use_stdio = true, + .file.use_stdio = true, };int ret;const char *known_build_ids =NULL ;
tools/perf/builtin-record.c +6 -4
@@ -453,7 +453,7 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t sizestatic int record__aio_push (struct record *rec,struct mmap *map,off_t *off) {int ret, idx; -int trace_fd = rec->session->data->file.fd; +int trace_fd =perf_data__fd (rec->session->data);struct record_aio aio = { .rec = rec, .size =0 };/*
@@ -1640,7 +1640,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,int rc =0 ;int nr_mmaps;struct mmap **maps; -int trace_fd = rec->data.file.fd; +int trace_fd =perf_data__fd (&rec->data);off_t off =0 ;if (!evlist)
@@ -1847,8 +1847,10 @@ record__finish_output(struct record *rec) rec->session->header.data_size += rec->bytes_written; data->file.size =lseek (perf_data__fd (data),0 ,SEEK_CUR );if (record__threads_enabled (rec)) { -for (i =0 ; i < data->dir.nr; i++) - data->dir.files[i].size =lseek (data->dir.files[i].fd,0 ,SEEK_CUR ); +for (i =0 ; i < data->dir.nr; i++) { + data->dir.files[i].size = +perf_data_file__seek (&data->dir.files[i],0 ,SEEK_CUR ); + } }/* Buildid scanning disabled or build ID in kernel and synthesized map events. */
tools/perf/tests/topology.c +2 -1
@@ -54,7 +54,8 @@ static int session_write_header(char *path) session->header.data_size +=DATA_SIZE ;TEST_ASSERT_VAL ("failed to write header" , - !perf_session__write_header (session, session->evlist, data.file.fd, true)); + !perf_session__write_header (session, session->evlist, +perf_data__fd (&data), true));evlist__delete (session->evlist);perf_session__delete (session);
tools/perf/util/data.c +53 -28
152 lines not on this page · raw message
tools/perf/util/data.h +44 -8
102 lines not on this page · raw message
tools/perf/util/session.c +1 -1
@@ -2569,7 +2569,7 @@ static int __perf_session__process_dir_events(struct perf_session *session)if (!data->dir.files[i].size)continue ; rd[readers] = (struct reader ) { - .fd = data->dir.files[i].fd, + .fd =perf_data_file__fd (&data->dir.files[i]), .path = data->dir.files[i].path, .data_size = data->dir.files[i].size, .data_offset =0 ,
Signature · 1 line
2.53.0.1213.gd9a14994de-goog