AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf session: Get rid of file_size variable

Browse Source 
It's not needed and removing it makes the code a little simpler for the
upcoming changes.

It's safe to replace file_size with data_size, because the
perf_data__size() value is never smaller than data_offset + data_size.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190110101301.6196-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-01-10 11:12:57 +01:00 committed by Arnaldo Carvalho de Melo
parent 7ba4da1002
commit 4f5a473d79
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/util/session.c
View File

@ -1825,7 +1825,6 @@ static int __perf_session__process_events(struct perf_session *session)
struct ordered_events *oe = &session->ordered_events; struct ordered_events *oe = &session->ordered_events;
struct perf_tool *tool = session->tool; struct perf_tool *tool = session->tool;
int fd = perf_data__fd(session->data); int fd = perf_data__fd(session->data);
u64 file_size = perf_data__size(session->data);
u64 data_offset = session->header.data_offset; u64 data_offset = session->header.data_offset;
u64 data_size = session->header.data_size; u64 data_size = session->header.data_size;
u64 head, page_offset, file_offset, file_pos, size; u64 head, page_offset, file_offset, file_pos, size;
@ -1845,14 +1844,13 @@ static int __perf_session__process_events(struct perf_session *session)
if (data_size == 0) if (data_size == 0)
goto out; goto out;
if (data_offset + data_size < file_size) ui_progress__init_size(&prog, data_size, "Processing events...");
file_size = data_offset + data_size;
ui_progress__init_size(&prog, file_size, "Processing events..."); data_size += data_offset;
mmap_size = MMAP_SIZE; mmap_size = MMAP_SIZE;
if (mmap_size > file_size) { if (mmap_size > data_size) {
mmap_size = file_size; mmap_size = data_size;
session->one_mmap = true; session->one_mmap = true;
} }
@ -1917,7 +1915,7 @@ static int __perf_session__process_events(struct perf_session *session)
if (session_done()) if (session_done())
goto out; goto out;
if (file_pos < file_size) if (file_pos < data_size)
goto more; goto more;
out: out: