perf evlist: Handle default value for 'pages' on mmap method
Commit-ID: 50a682ce875f91e04c81ae5680535aba5a770bad Gitweb: http://git.kernel.org/tip/50a682ce875f91e04c81ae5680535aba5a770bad Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 9 Nov 2011 09:10:47 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 28 Nov 2011 10:26:43 -0200
perf evlist: Handle default value for 'pages' on mmap method
Every tool that calls this and allows the user to override the value needs this logic.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 4 ---- tools/perf/util/evlist.c | 12 +++++++++--- tools/perf/util/evlist.h | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-)
tools/perf/builtin-record.c +0 -4
@@ -456,10 +456,6 @@ static int __cmd_record(int argc, const char **argv)perf_header__set_feat (&session->header,HEADER_NUMA_TOPOLOGY );perf_header__set_feat (&session->header,HEADER_CPUID ); -/* 512 kiB: default amount of unprivileged mlocked memory */ -if (mmap_pages ==UINT_MAX ) - mmap_pages = (512 *1024 ) / page_size; -if (forks) { err =perf_evlist__prepare_workload (evsel_list, &record_opts, argv);if (err <0 ) {
tools/perf/util/evlist.c +9 -3
@@ -507,14 +507,20 @@ out_unmap:* * Using perf_evlist__read_on_cpu does this automatically. */ -int perf_evlist__mmap (struct perf_evlist *evlist,int pages,bool overwrite) +int perf_evlist__mmap (struct perf_evlist *evlist,unsigned int pages, +bool overwrite) {unsigned int page_size =sysconf (_SC_PAGE_SIZE); -int mask = pages * page_size -1 ;struct perf_evsel *evsel;const struct cpu_map *cpus = evlist->cpus;const struct thread_map *threads = evlist->threads; -int prot =PROT_READ | (overwrite ?0 :PROT_WRITE ); +int prot =PROT_READ | (overwrite ?0 :PROT_WRITE ), mask; + +/* 512 kiB: default amount of unprivileged mlocked memory */ +if (pages ==UINT_MAX ) + pages = (512 *1024 ) / page_size; + + mask = pages * page_size -1 ;if (evlist->mmap ==NULL &&perf_evlist__alloc_mmap (evlist) <0 )return -ENOMEM ;
tools/perf/util/evlist.h +2 -1
@@ -79,7 +79,8 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,int perf_evlist__start_workload (struct perf_evlist *evlist);int perf_evlist__alloc_mmap (struct perf_evlist *evlist); -int perf_evlist__mmap (struct perf_evlist *evlist,int pages,bool overwrite); +int perf_evlist__mmap (struct perf_evlist *evlist,unsigned int pages, +bool overwrite);void perf_evlist__munmap (struct perf_evlist *evlist);void perf_evlist__disable (struct perf_evlist *evlist);