aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-kvm.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2014-09-03 17:02:59 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-09-25 15:46:55 -0400
commit1b85337d0685d1dc5a6f9061434ba4316d69f3b8 (patch)
tree2aae4189996ae07c65c8aaa2fc205ceba58cc7fb /tools/perf/builtin-kvm.c
parentf66a889dbc96dd342c87232d74f0956076707746 (diff)
tools lib api: Adopt fdarray class from perf's evlist
The extensible file description array that grew in the perf_evlist class can be useful for other tools, as it is not something that only evlists need, so move it to tools/lib/api/fd to ease sharing it. v2: Don't use {} like in: libapi_dirs: $(QUIET_MKDIR)mkdir -p $(OUTPUT){fs,fd}/ in Makefiles, as it will not work in some systems, as in ubuntu13.10. v3: Add fd/*.[ch] to LIBAPIKFS_SOURCES (Fix from Jiri Olsa) v4: Leave the fcntl(fd, O_NONBLOCK) in the evlist layer, remains to be checked if it is really needed there, but has no place in the fdarray class (Fix from Jiri Olsa) v5: Remove evlist details from fdarray grow/filter tests. Improve it a bit doing more tests about expected internal state. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> 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-kleuni3hckbc3s0lu6yb9x40@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-kvm.c')
-rw-r--r--tools/perf/builtin-kvm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index a440219b0be0..1e639d6265cc 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -920,7 +920,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)
920 signal(SIGTERM, sig_handler); 920 signal(SIGTERM, sig_handler);
921 921
922 /* use pollfds -- need to add timerfd and stdin */ 922 /* use pollfds -- need to add timerfd and stdin */
923 nr_fds = kvm->evlist->nr_fds; 923 nr_fds = kvm->evlist->pollfd.nr;
924 924
925 /* add timer fd */ 925 /* add timer fd */
926 if (perf_kvm__timerfd_create(kvm) < 0) { 926 if (perf_kvm__timerfd_create(kvm) < 0) {
@@ -941,7 +941,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)
941 if (fd_set_nonblock(fileno(stdin)) != 0) 941 if (fd_set_nonblock(fileno(stdin)) != 0)
942 goto out; 942 goto out;
943 943
944 pollfds = kvm->evlist->pollfd; 944 pollfds = kvm->evlist->pollfd.entries;
945 945
946 /* everything is good - enable the events and process */ 946 /* everything is good - enable the events and process */
947 perf_evlist__enable(kvm->evlist); 947 perf_evlist__enable(kvm->evlist);