perf tools: Unify page_size usage
Making page_size global from the util object. Removing the not needed one. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> 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/r/1379003976-5839-4-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
5283ec23a0
commit
918512b435
3 changed files with 3 additions and 4 deletions
|
@ -70,7 +70,6 @@ struct perf_record {
|
||||||
struct perf_session *session;
|
struct perf_session *session;
|
||||||
const char *progname;
|
const char *progname;
|
||||||
int output;
|
int output;
|
||||||
unsigned int page_size;
|
|
||||||
int realtime_prio;
|
int realtime_prio;
|
||||||
bool no_buildid;
|
bool no_buildid;
|
||||||
bool no_buildid_cache;
|
bool no_buildid_cache;
|
||||||
|
@ -119,7 +118,7 @@ static int perf_record__mmap_read(struct perf_record *rec,
|
||||||
{
|
{
|
||||||
unsigned int head = perf_mmap__read_head(md);
|
unsigned int head = perf_mmap__read_head(md);
|
||||||
unsigned int old = md->prev;
|
unsigned int old = md->prev;
|
||||||
unsigned char *data = md->base + rec->page_size;
|
unsigned char *data = md->base + page_size;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
void *buf;
|
void *buf;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
@ -360,8 +359,6 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
|
||||||
|
|
||||||
rec->progname = argv[0];
|
rec->progname = argv[0];
|
||||||
|
|
||||||
rec->page_size = sysconf(_SC_PAGE_SIZE);
|
|
||||||
|
|
||||||
on_exit(perf_record__sig_exit, rec);
|
on_exit(perf_record__sig_exit, rec);
|
||||||
signal(SIGCHLD, sig_handler);
|
signal(SIGCHLD, sig_handler);
|
||||||
signal(SIGINT, sig_handler);
|
signal(SIGINT, sig_handler);
|
||||||
|
|
|
@ -456,6 +456,7 @@ int main(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
const char *cmd;
|
const char *cmd;
|
||||||
|
|
||||||
|
/* The page_size is placed in util object. */
|
||||||
page_size = sysconf(_SC_PAGE_SIZE);
|
page_size = sysconf(_SC_PAGE_SIZE);
|
||||||
|
|
||||||
cmd = perf_extract_argv0_path(argv[0]);
|
cmd = perf_extract_argv0_path(argv[0]);
|
||||||
|
|
|
@ -1036,6 +1036,7 @@ PyMODINIT_FUNC initperf(void)
|
||||||
pyrf_cpu_map__setup_types() < 0)
|
pyrf_cpu_map__setup_types() < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* The page_size is placed in util object. */
|
||||||
page_size = sysconf(_SC_PAGE_SIZE);
|
page_size = sysconf(_SC_PAGE_SIZE);
|
||||||
|
|
||||||
Py_INCREF(&pyrf_evlist__type);
|
Py_INCREF(&pyrf_evlist__type);
|
||||||
|
|
Loading…
Reference in a new issue