perf session: Add reader__process_events function (3c7b67b2) · Commits · 戴 / test

tools/perf/util/session.c

+38 −24

Original line number	Original line	Diff line number	Diff line
	@@ -1826,36 +1826,25 @@ struct reader {
	u64 data_offset;		u64 data_offset;
	};		};

	static int __perf_session__process_events(struct perf_session *session)		static int
			reader__process_events(struct reader rd, struct perf_session session,
			struct ui_progress *prog)
	{		{
	struct reader rd = {		u64 data_size = rd->data_size;
	.fd = perf_data__fd(session->data),
	.data_size = session->header.data_size,
	.data_offset = session->header.data_offset,
	};
	struct ordered_events *oe = &session->ordered_events;
	struct perf_tool *tool = session->tool;
	u64 data_size = rd.data_size;
	u64 head, page_offset, file_offset, file_pos, size;		u64 head, page_offset, file_offset, file_pos, size;
	int err, mmap_prot, mmap_flags, map_idx = 0;		int err = 0, mmap_prot, mmap_flags, map_idx = 0;
	size_t mmap_size;		size_t mmap_size;
	char buf, mmaps[NUM_MMAPS];		char buf, mmaps[NUM_MMAPS];
	union perf_event *event;		union perf_event *event;
	struct ui_progress prog;
	s64 skip;		s64 skip;

	perf_tool__fill_defaults(tool);		page_offset = page_size * (rd->data_offset / page_size);

	page_offset = page_size * (rd.data_offset / page_size);
	file_offset = page_offset;		file_offset = page_offset;
	head = rd.data_offset - page_offset;		head = rd->data_offset - page_offset;

	if (data_size == 0)		ui_progress__init_size(prog, data_size, "Processing events...");
	goto out;

	ui_progress__init_size(&prog, data_size, "Processing events...");		data_size += rd->data_offset;

	data_size += rd.data_offset;

	mmap_size = MMAP_SIZE;		mmap_size = MMAP_SIZE;
	if (mmap_size > data_size) {		if (mmap_size > data_size) {
	@@ -1873,12 +1862,12 @@ static int __perf_session__process_events(struct perf_session *session)
	mmap_flags = MAP_PRIVATE;		mmap_flags = MAP_PRIVATE;
	}		}
	remap:		remap:
	buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, rd.fd,		buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, rd->fd,
	file_offset);		file_offset);
	if (buf == MAP_FAILED) {		if (buf == MAP_FAILED) {
	pr_err("failed to mmap file\n");		pr_err("failed to mmap file\n");
	err = -errno;		err = -errno;
	goto out_err;		goto out;
	}		}
	mmaps[map_idx] = buf;		mmaps[map_idx] = buf;
	map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1);		map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1);
	@@ -1910,7 +1899,7 @@ more:
	file_offset + head, event->header.size,		file_offset + head, event->header.size,
	event->header.type);		event->header.type);
	err = -EINVAL;		err = -EINVAL;
	goto out_err;		goto out;
	}		}

	if (skip)		if (skip)
	@@ -1919,7 +1908,7 @@ more:
	head += size;		head += size;
	file_pos += size;		file_pos += size;

	ui_progress__update(&prog, size);		ui_progress__update(prog, size);

	if (session_done())		if (session_done())
	goto out;		goto out;
	@@ -1928,6 +1917,31 @@ more:
	goto more;		goto more;

	out:		out:
			return err;
			}

			static int __perf_session__process_events(struct perf_session *session)
			{
			struct reader rd = {
			.fd = perf_data__fd(session->data),
			.data_size = session->header.data_size,
			.data_offset = session->header.data_offset,
			};
			struct ordered_events *oe = &session->ordered_events;
			struct perf_tool *tool = session->tool;
			struct ui_progress prog;
			int err;

			perf_tool__fill_defaults(tool);

			if (rd.data_size == 0)
			return -1;

			ui_progress__init_size(&prog, rd.data_size, "Processing events...");

			err = reader__process_events(&rd, session, &prog);
			if (err)
			goto out_err;
	/* do the final flush for ordered samples */		/* do the final flush for ordered samples */
	err = ordered_events__flush(oe, OE_FLUSH__FINAL);		err = ordered_events__flush(oe, OE_FLUSH__FINAL);
	if (err)		if (err)

Admin message