Commit 7ba4da10 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf session: Rearrange perf_session__process_events function



To reduce function arguments and the code.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung 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-2-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 49b8e2be
Loading
Loading
Loading
Loading
+7 −13
Original line number Diff line number Diff line
@@ -1820,13 +1820,14 @@ fetch_mmaped_event(struct perf_session *session,
#define NUM_MMAPS 128
#endif

static int __perf_session__process_events(struct perf_session *session,
					  u64 data_offset, u64 data_size,
					  u64 file_size)
static int __perf_session__process_events(struct perf_session *session)
{
	struct ordered_events *oe = &session->ordered_events;
	struct perf_tool *tool = session->tool;
	int fd = perf_data__fd(session->data);
	u64 file_size = perf_data__size(session->data);
	u64 data_offset = session->header.data_offset;
	u64 data_size = session->header.data_size;
	u64 head, page_offset, file_offset, file_pos, size;
	int err, mmap_prot, mmap_flags, map_idx = 0;
	size_t	mmap_size;
@@ -1944,20 +1945,13 @@ out_err:

int perf_session__process_events(struct perf_session *session)
{
	u64 size = perf_data__size(session->data);
	int err;

	if (perf_session__register_idle_thread(session) < 0)
		return -ENOMEM;

	if (!perf_data__is_pipe(session->data))
		err = __perf_session__process_events(session,
						     session->header.data_offset,
						     session->header.data_size, size);
	else
		err = __perf_session__process_pipe_events(session);
	if (perf_data__is_pipe(session->data))
		return __perf_session__process_pipe_events(session);

	return err;
	return __perf_session__process_events(session);
}

bool perf_session__has_traces(struct perf_session *session, const char *msg)