perf tools: Have the page size value available for all tools

Its such a common need that we might as well have a global with that
value.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-mwfqji9f17k5j81l1404dk3q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 484f26cc0c00c6ee80d74e93bddc3fe24eae4c1f..e2d9872de3d78144b89bdadfb0a0bf9b06e38b43 100644 (file)
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -35,7 +35,6 @@ static int test__vmlinux_matches_kallsyms(void)
        struct map *kallsyms_map, *vmlinux_map;
        struct machine kallsyms, vmlinux;
        enum map_type type = MAP__FUNCTION;
-       long page_size = sysconf(_SC_PAGE_SIZE);
        struct ref_reloc_sym ref_reloc_sym = { .name = "_stext", };
 
        /*
@@ -1007,7 +1006,6 @@ static void segfault_handler(int sig __maybe_unused,
 
 static int __test__rdpmc(void)
 {
-       long page_size = sysconf(_SC_PAGE_SIZE);
        volatile int tmp = 0;
        u64 i, loops = 1000;
        int n;

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 6d50eb0b425196aea150f699cd97ae09b8840ab8..d480d8a412b88addb457f580b5d0fa0160604d77 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -440,6 +440,8 @@ int main(int argc, const char **argv)
 {
        const char *cmd;
 
+       page_size = sysconf(_SC_PAGE_SIZE);
+
        cmd = perf_extract_argv0_path(argv[0]);
        if (!cmd)
                cmd = "perf-help";

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 186b87730396712d6fbfcbc95837168b81287ca4..a41dc4a5c2deeeefbe4794ebd9774e517c3363db 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -325,8 +325,6 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id)
 
 union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
 {
-       /* XXX Move this to perf.c, making it generally available */
-       unsigned int page_size = sysconf(_SC_PAGE_SIZE);
        struct perf_mmap *md = &evlist->mmap[idx];
        unsigned int head = perf_mmap__read_head(md);
        unsigned int old = md->prev;
@@ -528,7 +526,6 @@ out_unmap:
 int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
                      bool overwrite)
 {
-       unsigned int page_size = sysconf(_SC_PAGE_SIZE);
        struct perf_evsel *evsel;
        const struct cpu_map *cpus = evlist->cpus;
        const struct thread_map *threads = evlist->threads;

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 8cdd23239c9023e8a8659a42b363239ded45cf4c..15abe40dc7021bd8229563a092ce63e67e4d2ccd 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1375,15 +1375,13 @@ int __perf_session__process_events(struct perf_session *session,
 {
        u64 head, page_offset, file_offset, file_pos, progress_next;
        int err, mmap_prot, mmap_flags, map_idx = 0;
-       size_t  page_size, mmap_size;
+       size_t  mmap_size;
        char *buf, *mmaps[8];
        union perf_event *event;
        uint32_t size;
 
        perf_tool__fill_defaults(tool);
 
-       page_size = sysconf(_SC_PAGESIZE);
-
        page_offset = page_size * (data_offset / page_size);
        file_offset = page_offset;
        head = data_offset - page_offset;

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 719ed74a85652541d19e1f7dc15d26e2348a31fc..3741572696af4446c08a2c3b60ac674496323de6 100644 (file)
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -47,8 +47,6 @@ int file_bigendian;
 int host_bigendian;
 static int long_size;
 
-static unsigned long   page_size;
-
 static ssize_t calc_data_size;
 static bool repipe;
 

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 99664598bc1acfa3d03e0aaa1b0a44834be5f2d8..637b5cc5436299d317c71d84af6b64e5e774f58e 100644 (file)
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -10,6 +10,8 @@
 /*
  * XXX We need to find a better place for these things...
  */
+unsigned int page_size;
+
 bool perf_host  = true;
 bool perf_guest = false;
 

diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 70fa70b535b2ebb2c389efa4ebbc78cfcdfaace2..a6b83f8ebef8726466d110644512a41eb87cf457 100644 (file)
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -263,4 +263,6 @@ char *rtrim(char *s);
 
 void dump_stack(void);
 
+extern unsigned int page_size;
+
 #endif