perf session: Add reader object
Jiri Olsa
reviewercover perf session: Add reader object
hi,
this patchset adds reader object to interface event processing for any data. It's defined as:
struct reader {
int fd;
u64 data_size;
u64 data_offset;
};Now we can simply define reader object for arbitrary file data portion and pass it to reader__process_events function to process its data.
It's preparation for multiple file storage under perf.data directory.
Available also in:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/fixes
thanks,
jirka
---
Jiri Olsa (5):
perf session: Get rid of file_size variable perf session: Add reader object
perf session: Add data_size to reader object perf session: Add data_offset to reader object perf session: Add reader__process_events function
tools/perf/util/session.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 26 deletions(-)
Jiri Olsa
reviewerPATCH 1/5 perf session: Get rid of file_size variable
It's not needed and removing it makes the code little more simple for upcoming changes.
It's safe to replace file_size with data_size, because perf_data__size value is never smaller than data_offset
+ data_size.
--- tools/perf/util/session.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
tools/perf/util/session.c +5 -7
@@ -1818,7 +1818,6 @@ 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;
@@ -1838,14 +1837,13 @@ static int __perf_session__process_events(struct perf_session *session)if (data_size ==0 ) goto out; -if (data_offset + data_size < file_size) - file_size = data_offset + data_size; +ui_progress__init_size (&prog, data_size,"Processing events..." ); -ui_progress__init_size (&prog, file_size,"Processing events..." ); + data_size += data_offset; mmap_size =MMAP_SIZE ; -if (mmap_size > file_size) { - mmap_size = file_size; +if (mmap_size > data_size) { + mmap_size = data_size; session->one_mmap = true; }
@@ -1910,7 +1908,7 @@ static int __perf_session__process_events(struct perf_session *session)if (session_done ()) goto out; -if (file_pos < file_size) +if (file_pos < data_size) goto more; out:
Signature · 1 line
2.17.2
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/5] perf session: Get rid of file_size variable
Em Wed, Dec 26, 2018 at 02:51:28PM +0100, Jiri Olsa escreveu:
Quoted 6 lines
It's not needed and removing it makes the code little more simple for upcoming changes.
It's safe to replace
file_sizewithdata_size, becauseperf_data__sizevalue is never smaller thandata_offset
+data_size.
This is not applying to my perf/core branch, can you check?
- Arnaldo
Quoted 48 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/session.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)tools/perf/util/session.c +5
-7@@ -1818,7 +1818,6 @@ 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;@@ -1838,14 +1837,13 @@ static int __perf_session__process_events(struct perf_session *session)if (data_size ==0 ) goto out; -if (data_offset + data_size < file_size) - file_size = data_offset + data_size; +ui_progress__init_size (&prog, data_size,"Processing events..." ); -ui_progress__init_size (&prog, file_size,"Processing events..." ); + data_size += data_offset; mmap_size =MMAP_SIZE ; -if (mmap_size > file_size) { - mmap_size = file_size; +if (mmap_size > data_size) { + mmap_size = data_size; session->one_mmap = true; }@@ -1910,7 +1908,7 @@ static int __perf_session__process_events(struct perf_session *session)if (session_done ()) goto out; -if (file_pos < file_size) +if (file_pos < data_size) goto more; out:Signature · 1 line
2.17.2
Signature · 1 line
- Arnaldo
Re: [PATCH 1/5] perf session: Get rid of file_size variable
Quoted 9 lines · Arnaldo Carvalho de Melo
Em Wed, Dec 26, 2018 at 02:51:28PM +0100, Jiri Olsa escreveu:
Quoted 6 lines
It's not needed and removing it makes the code little more simple for upcoming changes.
It's safe to replace
file_sizewithdata_size, becauseperf_data__sizevalue is never smaller thandata_offset
+data_size.This is not applying to my perf/core branch, can you check?
hum, I've got clean rebase, pushed in perf/fixes
jirka
Quoted 55 lines
- Arnaldo
Quoted 48 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/session.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)tools/perf/util/session.c +5
-7@@ -1818,7 +1818,6 @@ 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;@@ -1838,14 +1837,13 @@ static int __perf_session__process_events(struct perf_session *session)if (data_size ==0 ) goto out; -if (data_offset + data_size < file_size) - file_size = data_offset + data_size; +ui_progress__init_size (&prog, data_size,"Processing events..." ); -ui_progress__init_size (&prog, file_size,"Processing events..." ); + data_size += data_offset; mmap_size =MMAP_SIZE ; -if (mmap_size > file_size) { - mmap_size = file_size; +if (mmap_size > data_size) { + mmap_size = data_size; session->one_mmap = true; }@@ -1910,7 +1908,7 @@ static int __perf_session__process_events(struct perf_session *session)if (session_done ()) goto out; -if (file_pos < file_size) +if (file_pos < data_size) goto more; out:Signature · 1 line
2.17.2Signature · 1 line
- Arnaldo
Jiri Olsa
reviewerPATCH 2/5 perf session: Add reader object
In reply to Jiri OlsaAdding session private reader object to encapsulate reading of the event data block. Starting with fd field inside.
--- tools/perf/util/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
tools/perf/util/session.c +8 -2
@@ -1813,11 +1813,17 @@ fetch_mmaped_event(struct perf_session *session,#define NUM_MMAPS 128#endif +struct reader { +int fd; +}; +static int __perf_session__process_events (struct perf_session *session) { +struct reader rd = { + .fd =perf_data__fd (session->data), + };struct ordered_events *oe = &session->ordered_events;struct perf_tool *tool = session->tool; -int fd =perf_data__fd (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;
@@ -1857,7 +1863,7 @@ static int __perf_session__process_events(struct perf_session *session) mmap_flags =MAP_PRIVATE ; } remap: - buf =mmap (NULL , mmap_size, mmap_prot, mmap_flags, fd, + buf =mmap (NULL , mmap_size, mmap_prot, mmap_flags, rd.fd, file_offset);if (buf ==MAP_FAILED ) {pr_err ("failed to mmap file\n" );
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 3/5 perf session: Add data_size to reader object
In reply to Jiri OlsaAdding data_size to reader object. Keeping the data_size variable instead of replacing it with rd.data_size as it will be used in following patch.
--- tools/perf/util/session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/session.c +3 -1
@@ -1815,17 +1815,19 @@ fetch_mmaped_event(struct perf_session *session,struct reader {int fd; +u64 data_size; };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, };struct ordered_events *oe = &session->ordered_events;struct perf_tool *tool = session->tool;u64 data_offset = session->header.data_offset; -u64 data_size = session->header.data_size; +u64 data_size = rd.data_size;u64 head, page_offset, file_offset, file_pos, size;int err, mmap_prot, mmap_flags, map_idx =0 ;size_t mmap_size;
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 4/5 perf session: Add data_offset to reader object
In reply to Jiri OlsaAdding data_offset to reader object.
--- tools/perf/util/session.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/util/session.c +5 -4
@@ -1816,6 +1816,7 @@ fetch_mmaped_event(struct perf_session *session,struct reader {int fd;u64 data_size; +u64 data_offset; };static int __perf_session__process_events (struct perf_session *session)
@@ -1823,10 +1824,10 @@ 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; -u64 data_offset = session->header.data_offset;u64 data_size = rd.data_size;u64 head, page_offset, file_offset, file_pos, size;int err, mmap_prot, mmap_flags, map_idx =0 ;
@@ -1838,16 +1839,16 @@ static int __perf_session__process_events(struct perf_session *session)perf_tool__fill_defaults (tool); - page_offset = page_size * (data_offset / page_size); + page_offset = page_size * (rd.data_offset / page_size); file_offset = page_offset; - head = data_offset - page_offset; + head = rd.data_offset - page_offset;if (data_size ==0 ) goto out;ui_progress__init_size (&prog, data_size,"Processing events..." ); - data_size += data_offset; + data_size += rd.data_offset; mmap_size =MMAP_SIZE ;if (mmap_size > data_size) {
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 5/5 perf session: Add reader__process_events function
In reply to Jiri OlsaAdding reader__process_events function to readers data.
The reader object is defined by file's fd, data offset and data size.
Now we can simply define reader object for arbitrary file data portion and pass it to reader__process_events function to process its data.
--- tools/perf/util/session.c | 62 ++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 24 deletions(-)
tools/perf/util/session.c +38 -24
@@ -1819,36 +1819,25 @@ struct reader {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 = { - .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 data_size = rd->data_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;char *buf, *mmaps[NUM_MMAPS ];union perf_event *event; -struct ui_progress prog;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; - head = rd.data_offset - page_offset; + head = rd->data_offset - page_offset; -if (data_size ==0 ) - goto out; +ui_progress__init_size (prog, data_size,"Processing events..." ); -ui_progress__init_size (&prog, data_size,"Processing events..." ); - - data_size += rd.data_offset; + data_size += rd->data_offset; mmap_size =MMAP_SIZE ;if (mmap_size > data_size) {
@@ -1866,12 +1855,12 @@ static int __perf_session__process_events(struct perf_session *session) mmap_flags =MAP_PRIVATE ; } 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);if (buf ==MAP_FAILED ) {pr_err ("failed to mmap file\n" ); err = -errno; - goto out_err; + goto out; } mmaps[map_idx] = buf; map_idx = (map_idx +1 ) & (ARRAY_SIZE (mmaps) -1 );
@@ -1903,7 +1892,7 @@ static int __perf_session__process_events(struct perf_session *session) file_offset + head, event->header.size, event->header.type); err = -EINVAL ; - goto out_err; + goto out; }if (skip)
@@ -1912,7 +1901,7 @@ static int __perf_session__process_events(struct perf_session *session) head += size; file_pos += size; -ui_progress__update (&prog, size); +ui_progress__update (prog, size);if (session_done ()) goto out;
@@ -1921,6 +1910,31 @@ static int __perf_session__process_events(struct perf_session *session) goto more; 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 */ err =ordered_events__flush (oe,OE_FLUSH__FINAL );if (err)
Signature · 1 line
2.17.2