lkml.org 
[lkml]   [2018]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/5] perf session: Get rid of file_size variable
On Wed, Dec 26, 2018 at 04:43:42PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Wed, Dec 26, 2018 at 02:51:28PM +0100, Jiri Olsa escreveu:
> > 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.
>
> This is not applying to my perf/core branch, can you check?

hum, I've got clean rebase, pushed in perf/fixes

jirka

>
> - Arnaldo
>
> > Link: http://lkml.kernel.org/n/tip-ocz7zwwkkx11v0mkxrtcddih@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/perf/util/session.c | 12 +++++-------
> > 1 file changed, 5 insertions(+), 7 deletions(-)
> >
> > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> > index 3972f081a8f4..d6c1d3853f27 100644
> > --- a/tools/perf/util/session.c
> > +++ b/tools/perf/util/session.c
> > @@ -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:
> > --
> > 2.17.2
>
> --
>
> - Arnaldo

\
 
 \ /
  Last update: 2018-12-27 09:12    [W:0.038 / U:23.804 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site