perf session: Add reader object
Jiri Olsa
reviewerv2 cover 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/reader
Changes in v2:
- rebased on latest perf/core
- added dependency patch (1/6) that was omitted in the original post
thanks,
jirka
---
Jiri Olsa (6):
perf session: Rearrange perf_session__process_events function 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 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 35 deletions(-)
Jiri Olsa
reviewerPATCH v2 1/6 perf session: Rearrange perf_session__process_events function
To reduce function arguments and the code.
--- tools/perf/util/session.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
tools/perf/util/session.c +7 -13
@@ -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 @@ static int __perf_session__process_events(struct perf_session *session,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)
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH v2 4/6 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
@@ -1822,17 +1822,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 v2 6/6 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
@@ -1826,36 +1826,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) {
@@ -1873,12 +1862,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 );
@@ -1910,7 +1899,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)
@@ -1919,7 +1908,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;
@@ -1928,6 +1917,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
Jiri Olsa
reviewerPATCH v2 3/6 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
@@ -1820,11 +1820,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;
@@ -1864,7 +1870,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 v2 5/6 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
@@ -1823,6 +1823,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)
@@ -1830,10 +1831,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 ;
@@ -1845,16 +1846,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 v2 2/6 perf session: Get rid of file_size variable
In reply to Jiri OlsaIt'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
@@ -1825,7 +1825,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;
@@ -1845,14 +1844,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; }
@@ -1917,7 +1915,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
Hi Jirka,
Quoted 10 lines · Jiri Olsa
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; };
Quoted 6 lines
Now we can simply define reader object for arbitrary file data portion and pass it to
reader__process_eventsfunction to process its data.It's preparation for multiple file storage under perf.data directory.
I'm looking forward to seeing it soon! :)
Thanks,
Namhyung
Quoted 24 lines
Available also in:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/readerChanges in v2:
- rebased on latest perf/core
- added dependency patch (1/6) that was omitted in the original postthanks,
jirka---
Jiri Olsa (6):
perf session: Rearrangeperf_session__process_eventsfunction perf session: Get rid offile_sizevariable
perf session: Add reader object
perf session: Adddata_sizeto reader object
perf session: Adddata_offsetto reader object perf session: Addreader__process_eventsfunctiontools/perf/util/session.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 35 deletions(-)
Arnaldo Carvalho de Melo
maintainerEm Fri, Jan 11, 2019 at 10:31:16AM +0900, Namhyung Kim escreveu:
Quoted 17 lines
Hi Jirka,
Quoted 14 lines · Jiri Olsa
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_eventsfunction to process its data.
Quoted 6 lines
Quoted 2 lines
It's preparation for multiple file storage under perf.data directory.
I'm looking forward to seeing it soon! :)
Acked-by Namhyung Kim <[email protected]>
Thanks, baby steps, prepping the stage for using multiple readers, one per thread, etc, applied.
- Arnaldo
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf session: Rearrange perf_session__process_events function
In reply to Jiri Olsaperf session: Rearrange perf_session__process_events function
Commit-ID: 7ba4da100261482afcb693a1b39e483c9c03aba2 Gitweb: https://git.kernel.org/tip/7ba4da100261482afcb693a1b39e483c9c03aba2 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:12:56 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Rearrange perf_session__process_events function
To reduce function arguments and the code.
--- tools/perf/util/session.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
tools/perf/util/session.c +7 -13
@@ -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)
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf session: Get rid of file_size variable
In reply to Jiri Olsaperf session: Get rid of file_size variable
Commit-ID: 4f5a473d79c755d2e325c9a8dab01804d5416923 Gitweb: https://git.kernel.org/tip/4f5a473d79c755d2e325c9a8dab01804d5416923 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:12:57 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Get rid of file_size variable
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.
--- tools/perf/util/session.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
tools/perf/util/session.c +5 -7
@@ -1825,7 +1825,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;
@@ -1845,14 +1844,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; }
@@ -1917,7 +1915,7 @@ more:if (session_done ()) goto out; -if (file_pos < file_size) +if (file_pos < data_size) goto more; out:
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf session: Add 'data_size' member to reader object
In reply to Jiri Olsaperf session: Add 'data_size' member to reader object
Commit-ID: f66f0950527cd070d2949a0133275c30e717ba9b Gitweb: https://git.kernel.org/tip/f66f0950527cd070d2949a0133275c30e717ba9b Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:12:59 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Add 'data_size' member to reader object
Add a 'data_size' member to the reader object. Keep the 'data_size' variable instead of replacing it with rd.data_size as it will be used in the following patch.
--- tools/perf/util/session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/session.c +3 -1
@@ -1822,17 +1822,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;
tip-bot for Jiri Olsa
merge botperf session: Add reader object
Commit-ID: 82715eb184c55b5097c8f1022f54303c2ddbc329 Gitweb: https://git.kernel.org/tip/82715eb184c55b5097c8f1022f54303c2ddbc329 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:12:58 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Add reader object
Add a session private reader object to encapsulate the reading of the event data block. Starting with a 'fd' field.
--- tools/perf/util/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
tools/perf/util/session.c +8 -2
@@ -1820,11 +1820,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;
@@ -1864,7 +1870,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" );
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf session: Add reader__process_events function
In reply to Jiri Olsaperf session: Add reader__process_events function
Commit-ID: 3c7b67b23eb317787d113b1e9a6d82250202a1e3 Gitweb: https://git.kernel.org/tip/3c7b67b23eb317787d113b1e9a6d82250202a1e3 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:13:01 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Add reader__process_events function
The reader object is defined by file's fd, data offset and data size.
Now we can simply define a reader object for an arbitrary file data portion and pass it to reader__process_events().
--- tools/perf/util/session.c | 62 +++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 24 deletions(-)
tools/perf/util/session.c +38 -24
@@ -1826,36 +1826,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) {
@@ -1873,12 +1862,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 );
@@ -1910,7 +1899,7 @@ more: file_offset + head, event->header.size, event->header.type); err = -EINVAL ; - goto out_err; + goto out; }if (skip)
@@ -1919,7 +1908,7 @@ more: head += size; file_pos += size; -ui_progress__update (&prog, size); +ui_progress__update (prog, size);if (session_done ()) goto out;
@@ -1928,6 +1917,31 @@ more: 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)
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf session: Add 'data_offset' member to reader object
In reply to Jiri Olsaperf session: Add 'data_offset' member to reader object
Commit-ID: 71002bd214822a15bee0f7bc033a0dbf95cf780b Gitweb: https://git.kernel.org/tip/71002bd214822a15bee0f7bc033a0dbf95cf780b Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 10 Jan 2019 11:13:00 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Add 'data_offset' member to reader object
Add 'data_offset' member to reader object.
--- tools/perf/util/session.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/util/session.c +5 -4
@@ -1823,6 +1823,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)
@@ -1830,10 +1831,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 ;
@@ -1845,16 +1846,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) {