aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-06 09:14:21 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-06 09:41:09 -0400
commit42e59d7d19dc4b49feab2a860fd9a8ca3248c833 (patch)
treea1c597604dcb239804684f452263bec295d77ae3 /tools/perf
parent064739bc4b3d7f424b2f25547e6611bcf0132415 (diff)
perf tools: Default to 1 KHz auto-sampling freq events
Use auto-freq events by default in perf record and perf top. This allows more consistent hardware event sampling, regardless of the intensity of the underlying event. It also keeps us from over-sampling on larger/busier systems. (also make surrounding initializations more consistent) Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/builtin-record.c52
-rw-r--r--tools/perf/builtin-top.c38
2 files changed, 45 insertions, 45 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 3eeef339c787..494f8c7d7521 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -29,43 +29,43 @@ static int fd[MAX_NR_CPUS][MAX_COUNTERS];
29 29
30static long default_interval = 100000; 30static long default_interval = 100000;
31 31
32static int nr_cpus = 0; 32static int nr_cpus = 0;
33static unsigned int page_size; 33static unsigned int page_size;
34static unsigned int mmap_pages = 128; 34static unsigned int mmap_pages = 128;
35static int freq = 0; 35static int freq = 1000;
36static int output; 36static int output;
37static const char *output_name = "perf.data"; 37static const char *output_name = "perf.data";
38static int group = 0; 38static int group = 0;
39static unsigned int realtime_prio = 0; 39static unsigned int realtime_prio = 0;
40static int raw_samples = 0; 40static int raw_samples = 0;
41static int system_wide = 0; 41static int system_wide = 0;
42static int profile_cpu = -1; 42static int profile_cpu = -1;
43static pid_t target_pid = -1; 43static pid_t target_pid = -1;
44static pid_t child_pid = -1; 44static pid_t child_pid = -1;
45static int inherit = 1; 45static int inherit = 1;
46static int force = 0; 46static int force = 0;
47static int append_file = 0; 47static int append_file = 0;
48static int call_graph = 0; 48static int call_graph = 0;
49static int inherit_stat = 0; 49static int inherit_stat = 0;
50static int no_samples = 0; 50static int no_samples = 0;
51static int sample_address = 0; 51static int sample_address = 0;
52static int multiplex = 0; 52static int multiplex = 0;
53static int multiplex_fd = -1; 53static int multiplex_fd = -1;
54 54
55static long samples; 55static long samples = 0;
56static struct timeval last_read; 56static struct timeval last_read;
57static struct timeval this_read; 57static struct timeval this_read;
58 58
59static u64 bytes_written; 59static u64 bytes_written = 0;
60 60
61static struct pollfd event_array[MAX_NR_CPUS * MAX_COUNTERS]; 61static struct pollfd event_array[MAX_NR_CPUS * MAX_COUNTERS];
62 62
63static int nr_poll; 63static int nr_poll = 0;
64static int nr_cpu; 64static int nr_cpu = 0;
65 65
66static int file_new = 1; 66static int file_new = 1;
67 67
68struct perf_header *header; 68struct perf_header *header = NULL;
69 69
70struct mmap_data { 70struct mmap_data {
71 int counter; 71 int counter;
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index c574c5b3d0e6..d978dc99236c 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -55,26 +55,26 @@
55 55
56static int fd[MAX_NR_CPUS][MAX_COUNTERS]; 56static int fd[MAX_NR_CPUS][MAX_COUNTERS];
57 57
58static int system_wide = 0; 58static int system_wide = 0;
59 59
60static int default_interval = 100000; 60static int default_interval = 100000;
61 61
62static int count_filter = 5; 62static int count_filter = 5;
63static int print_entries = 15; 63static int print_entries = 15;
64 64
65static int target_pid = -1; 65static int target_pid = -1;
66static int inherit = 0; 66static int inherit = 0;
67static int profile_cpu = -1; 67static int profile_cpu = -1;
68static int nr_cpus = 0; 68static int nr_cpus = 0;
69static unsigned int realtime_prio = 0; 69static unsigned int realtime_prio = 0;
70static int group = 0; 70static int group = 0;
71static unsigned int page_size; 71static unsigned int page_size;
72static unsigned int mmap_pages = 16; 72static unsigned int mmap_pages = 16;
73static int freq = 0; 73static int freq = 1000; /* 1 KHz */
74 74
75static int delay_secs = 2; 75static int delay_secs = 2;
76static int zero; 76static int zero = 0;
77static int dump_symtab; 77static int dump_symtab = 0;
78 78
79/* 79/*
80 * Source 80 * Source
@@ -87,11 +87,11 @@ struct source_line {
87 struct source_line *next; 87 struct source_line *next;
88}; 88};
89 89
90static char *sym_filter = NULL; 90static char *sym_filter = NULL;
91struct sym_entry *sym_filter_entry = NULL; 91struct sym_entry *sym_filter_entry = NULL;
92static int sym_pcnt_filter = 5; 92static int sym_pcnt_filter = 5;
93static int sym_counter = 0; 93static int sym_counter = 0;
94static int display_weighted = -1; 94static int display_weighted = -1;
95 95
96/* 96/*
97 * Symbols 97 * Symbols