Skip to content

Commit

Permalink
perf tools: Have the page size value available for all tools
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo committed Oct 6, 2012
1 parent 6e92349 commit 0c1fe6b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 10 deletions.
2 changes: 0 additions & 2 deletions tools/perf/builtin-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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", };

/*
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions tools/perf/perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 0 additions & 3 deletions tools/perf/util/evlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -528,7 +526,6 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, in
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;
Expand Down
4 changes: 1 addition & 3 deletions tools/perf/util/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions tools/perf/util/trace-event-read.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions tools/perf/util/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions tools/perf/util/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -263,4 +263,6 @@ char *rtrim(char *s);

void dump_stack(void);

extern unsigned int page_size;

#endif

0 comments on commit 0c1fe6b

Please sign in to comment.