perf tools: Rename struct perf_data_file to perf_data
Rename struct perf_data_file to perf_data, because we will add the possibility to have multiple files under perf.data, so the 'perf_data' name fits better. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: Changbin Du <changbin.du@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-39wn4d77phel3dgkzo3lyan0@git.kernel.org [ Fixup recent changes in 'perf script --per-event-dump' ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
committed by
Arnaldo Carvalho de Melo
Arnaldo Carvalho de Melo
parent
642ee1c6df
commit
8ceb41d7e3
@@ -66,7 +66,7 @@ struct record {
|
||||
struct perf_tool tool;
|
||||
struct record_opts opts;
|
||||
u64 bytes_written;
|
||||
struct perf_data_file file;
|
||||
struct perf_data data;
|
||||
struct auxtrace_record *itr;
|
||||
struct perf_evlist *evlist;
|
||||
struct perf_session *session;
|
||||
@@ -107,7 +107,7 @@ static bool switch_output_time(struct record *rec)
|
||||
|
||||
static int record__write(struct record *rec, void *bf, size_t size)
|
||||
{
|
||||
if (perf_data_file__write(rec->session->file, bf, size) < 0) {
|
||||
if (perf_data__write(rec->session->data, bf, size) < 0) {
|
||||
pr_err("failed to write perf data, error: %m\n");
|
||||
return -1;
|
||||
}
|
||||
@@ -173,13 +173,13 @@ static int record__process_auxtrace(struct perf_tool *tool,
|
||||
size_t len1, void *data2, size_t len2)
|
||||
{
|
||||
struct record *rec = container_of(tool, struct record, tool);
|
||||
struct perf_data_file *file = &rec->file;
|
||||
struct perf_data *data = &rec->data;
|
||||
size_t padding;
|
||||
u8 pad[8] = {0};
|
||||
|
||||
if (!perf_data_file__is_pipe(file)) {
|
||||
if (!perf_data__is_pipe(data)) {
|
||||
off_t file_offset;
|
||||
int fd = perf_data_file__fd(file);
|
||||
int fd = perf_data__fd(data);
|
||||
int err;
|
||||
|
||||
file_offset = lseek(fd, 0, SEEK_CUR);
|
||||
@@ -398,10 +398,10 @@ static int process_sample_event(struct perf_tool *tool,
|
||||
|
||||
static int process_buildids(struct record *rec)
|
||||
{
|
||||
struct perf_data_file *file = &rec->file;
|
||||
struct perf_data *data = &rec->data;
|
||||
struct perf_session *session = rec->session;
|
||||
|
||||
if (file->size == 0)
|
||||
if (data->size == 0)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
@@ -544,14 +544,14 @@ static void record__init_features(struct record *rec)
|
||||
static void
|
||||
record__finish_output(struct record *rec)
|
||||
{
|
||||
struct perf_data_file *file = &rec->file;
|
||||
int fd = perf_data_file__fd(file);
|
||||
struct perf_data *data = &rec->data;
|
||||
int fd = perf_data__fd(data);
|
||||
|
||||
if (file->is_pipe)
|
||||
if (data->is_pipe)
|
||||
return;
|
||||
|
||||
rec->session->header.data_size += rec->bytes_written;
|
||||
file->size = lseek(perf_data_file__fd(file), 0, SEEK_CUR);
|
||||
data->size = lseek(perf_data__fd(data), 0, SEEK_CUR);
|
||||
|
||||
if (!rec->no_buildid) {
|
||||
process_buildids(rec);
|
||||
@@ -590,7 +590,7 @@ static int record__synthesize(struct record *rec, bool tail);
|
||||
static int
|
||||
record__switch_output(struct record *rec, bool at_exit)
|
||||
{
|
||||
struct perf_data_file *file = &rec->file;
|
||||
struct perf_data *data = &rec->data;
|
||||
int fd, err;
|
||||
|
||||
/* Same Size: "2015122520103046"*/
|
||||
@@ -608,7 +608,7 @@ record__switch_output(struct record *rec, bool at_exit)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
fd = perf_data_file__switch(file, timestamp,
|
||||
fd = perf_data__switch(data, timestamp,
|
||||
rec->session->header.data_offset,
|
||||
at_exit);
|
||||
if (fd >= 0 && !at_exit) {
|
||||
@@ -618,7 +618,7 @@ record__switch_output(struct record *rec, bool at_exit)
|
||||
|
||||
if (!quiet)
|
||||
fprintf(stderr, "[ perf record: Dump %s.%s ]\n",
|
||||
file->path, timestamp);
|
||||
data->path, timestamp);
|
||||
|
||||
/* Output tracking events */
|
||||
if (!at_exit) {
|
||||
@@ -693,16 +693,16 @@ static int record__synthesize(struct record *rec, bool tail)
|
||||
{
|
||||
struct perf_session *session = rec->session;
|
||||
struct machine *machine = &session->machines.host;
|
||||
struct perf_data_file *file = &rec->file;
|
||||
struct perf_data *data = &rec->data;
|
||||
struct record_opts *opts = &rec->opts;
|
||||
struct perf_tool *tool = &rec->tool;
|
||||
int fd = perf_data_file__fd(file);
|
||||
int fd = perf_data__fd(data);
|
||||
int err = 0;
|
||||
|
||||
if (rec->opts.tail_synthesize != tail)
|
||||
return 0;
|
||||
|
||||
if (file->is_pipe) {
|
||||
if (data->is_pipe) {
|
||||
err = perf_event__synthesize_features(
|
||||
tool, session, rec->evlist, process_synthesized_event);
|
||||
if (err < 0) {
|
||||
@@ -781,7 +781,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
|
||||
struct machine *machine;
|
||||
struct perf_tool *tool = &rec->tool;
|
||||
struct record_opts *opts = &rec->opts;
|
||||
struct perf_data_file *file = &rec->file;
|
||||
struct perf_data *data = &rec->data;
|
||||
struct perf_session *session;
|
||||
bool disabled = false, draining = false;
|
||||
int fd;
|
||||
@@ -807,20 +807,20 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
|
||||
signal(SIGUSR2, SIG_IGN);
|
||||
}
|
||||
|
||||
session = perf_session__new(file, false, tool);
|
||||
session = perf_session__new(data, false, tool);
|
||||
if (session == NULL) {
|
||||
pr_err("Perf session creation failed.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
fd = perf_data_file__fd(file);
|
||||
fd = perf_data__fd(data);
|
||||
rec->session = session;
|
||||
|
||||
record__init_features(rec);
|
||||
|
||||
if (forks) {
|
||||
err = perf_evlist__prepare_workload(rec->evlist, &opts->target,
|
||||
argv, file->is_pipe,
|
||||
argv, data->is_pipe,
|
||||
workload_exec_failed_signal);
|
||||
if (err < 0) {
|
||||
pr_err("Couldn't run the workload!\n");
|
||||
@@ -856,7 +856,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
|
||||
if (!rec->evlist->nr_groups)
|
||||
perf_header__clear_feat(&session->header, HEADER_GROUP_DESC);
|
||||
|
||||
if (file->is_pipe) {
|
||||
if (data->is_pipe) {
|
||||
err = perf_header__write_pipe(fd);
|
||||
if (err < 0)
|
||||
goto out_child;
|
||||
@@ -1117,8 +1117,8 @@ out_child:
|
||||
samples[0] = '\0';
|
||||
|
||||
fprintf(stderr, "[ perf record: Captured and wrote %.3f MB %s%s%s ]\n",
|
||||
perf_data_file__size(file) / 1024.0 / 1024.0,
|
||||
file->path, postfix, samples);
|
||||
perf_data__size(data) / 1024.0 / 1024.0,
|
||||
data->path, postfix, samples);
|
||||
}
|
||||
|
||||
out_delete_session:
|
||||
@@ -1482,7 +1482,7 @@ static struct option __record_options[] = {
|
||||
OPT_STRING('C', "cpu", &record.opts.target.cpu_list, "cpu",
|
||||
"list of cpus to monitor"),
|
||||
OPT_U64('c', "count", &record.opts.user_interval, "event period to sample"),
|
||||
OPT_STRING('o', "output", &record.file.path, "file",
|
||||
OPT_STRING('o', "output", &record.data.path, "file",
|
||||
"output file name"),
|
||||
OPT_BOOLEAN_SET('i', "no-inherit", &record.opts.no_inherit,
|
||||
&record.opts.no_inherit_set,
|
||||
|
||||
Reference in New Issue
Block a user