perf kvm stat live: Use perf_evlist__add_pollfd() instead of local equivalent
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 0a04c9e0b2181aff8348b5e80d9d96ec8df1ffb3 Gitweb: http://git.kernel.org/tip/0a04c9e0b2181aff8348b5e80d9d96ec8df1ffb3 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 18 Aug 2014 17:12:30 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 25 Sep 2014 16:46:54 -0300
perf kvm stat live: Use perf_evlist__add_pollfd() instead of local equivalent
Since we can add file descriptors to the evlist pollfd and it will autogrow, no need to copy all events to a local pollfd array, just add the timer and stdin file descriptors.
Reviewed-by David Ahern <[email protected]>
Acked-by Jiri Olsa <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jean Pihet <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-kvm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
tools/perf/builtin-kvm.c +9 -13
@@ -919,15 +919,8 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)signal (SIGINT , sig_handler);signal (SIGTERM , sig_handler); -/* copy pollfds -- need to add timerfd and stdin */ +/* use pollfds -- need to add timerfd and stdin */ nr_fds = kvm->evlist->nr_fds; - pollfds =zalloc (sizeof (struct pollfd ) * (nr_fds +2 )); -if (!pollfds) { - err = -ENOMEM ; - goto out; - } -memcpy (pollfds, kvm->evlist->pollfd, -sizeof (struct pollfd ) * kvm->evlist->nr_fds);/* add timer fd */ if (perf_kvm__timerfd_create (kvm) <0 ) {
@@ -935,17 +928,21 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm) goto out; } - pollfds[nr_fds].fd = kvm->timerfd; - pollfds[nr_fds].events =POLLIN ; +if (perf_evlist__add_pollfd (kvm->evlist, kvm->timerfd)) + goto out; + nr_fds++; - pollfds[nr_fds].fd =fileno (stdin); - pollfds[nr_fds].events =POLLIN ; +if (perf_evlist__add_pollfd (kvm->evlist,fileno (stdin))) + goto out; + nr_stdin = nr_fds; nr_fds++;if (fd_set_nonblock (fileno (stdin)) !=0 ) goto out; + pollfds = kvm->evlist->pollfd; +/* everything is good - enable the events and process */ perf_evlist__enable (kvm->evlist);
@@ -979,7 +976,6 @@ out:close (kvm->timerfd);tcsetattr (0 ,TCSAFLUSH , &save); -free (pollfds);return err; }