Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29583c17 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf data: Make perf_data__size() work over directory 



Make perf_data__size() return proper size for directory data, summing up
all the individual file sizes.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20190308134745.5057-5-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e8be1357

tools/perf/util/data.c

+17 −0
Original line number Diff line number Diff line
@@ -393,3 +393,20 @@ int perf_data__switch(struct perf_data *data, 
	free(new_filepath);

	return ret;

}



unsigned long perf_data__size(struct perf_data *data)

{

	u64 size = data->file.size;

	int i;



	if (!data->is_dir)

		return size;



	for (i = 0; i < data->dir.nr; i++) {

		struct perf_data_file *file = &data->dir.files[i];



		size += file->size;

	}



	return size;

}

tools/perf/util/data.h

+1 −5
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ static inline int perf_data__fd(struct perf_data *data) 
	return data->file.fd;

}



static inline unsigned long perf_data__size(struct perf_data *data)

{

	return data->file.size;

}



int perf_data__open(struct perf_data *data);

void perf_data__close(struct perf_data *data);

ssize_t perf_data__write(struct perf_data *data,
@@ -80,4 +75,5 @@ int perf_data__create_dir(struct perf_data *data, int nr); 
int perf_data__open_dir(struct perf_data *data);

void perf_data__close_dir(struct perf_data *data);

int perf_data__update_dir(struct perf_data *data);

unsigned long perf_data__size(struct perf_data *data);

#endif /* __PERF_DATA_H */