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 <dsahern@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-2hvp9iromiheh6rl4oaa08x5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index f5d3ae483110815e1d3d64c6ed7c96e5762352ec..a440219b0be0fe2fbfc073ef916199944d9855d8 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -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;
 }