From 50416a87ae38b13c4251ad6912d1c22f09ef21de Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 5 Jun 2009 13:27:02 +0200 Subject: [PATCH] --- yaml --- r: 147666 b: refs/heads/master c: cf1f45744c6fa3501e0a6f0ddc418f0ef27e725b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/builtin-record.c | 10 +++++++++- trunk/Documentation/perf_counter/builtin-top.c | 13 +++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c929aa30cc8c..5c9cbd64cbbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f250c030a87273f8838a2302bee7c2b4d03e9151 +refs/heads/master: cf1f45744c6fa3501e0a6f0ddc418f0ef27e725b diff --git a/trunk/Documentation/perf_counter/builtin-record.c b/trunk/Documentation/perf_counter/builtin-record.c index 7f2d7ce94075..e2301f39e551 100644 --- a/trunk/Documentation/perf_counter/builtin-record.c +++ b/trunk/Documentation/perf_counter/builtin-record.c @@ -27,6 +27,7 @@ static int fd[MAX_NR_CPUS][MAX_COUNTERS]; static int nr_cpus = 0; static unsigned int page_size; static unsigned int mmap_pages = 128; +static int freq = 0; static int output; static const char *output_name = "perf.data"; static int group = 0; @@ -347,9 +348,10 @@ static void create_counter(int counter, int cpu, pid_t pid) attr.config = event_id[counter]; attr.sample_period = event_count[counter]; attr.sample_type = PERF_SAMPLE_IP | PERF_SAMPLE_TID; + attr.freq = freq; attr.mmap = track; attr.comm = track; - attr.inherit = (cpu < 0) && inherit; + attr.inherit = (cpu < 0) && inherit; track = 0; /* only the first counter needs these */ @@ -520,6 +522,8 @@ static const struct option options[] = { "output file name"), OPT_BOOLEAN('i', "inherit", &inherit, "child tasks inherit counters"), + OPT_INTEGER('F', "freq", &freq, + "profile at this frequency"), OPT_INTEGER('m', "mmap-pages", &mmap_pages, "number of mmap data pages"), OPT_END() @@ -540,6 +544,10 @@ int cmd_record(int argc, const char **argv, const char *prefix) event_id[0] = 0; } + if (freq) { + default_interval = freq; + freq = 1; + } for (counter = 0; counter < nr_counters; counter++) { if (event_count[counter]) continue; diff --git a/trunk/Documentation/perf_counter/builtin-top.c b/trunk/Documentation/perf_counter/builtin-top.c index 28cbde4b6e83..2fee5951b231 100644 --- a/trunk/Documentation/perf_counter/builtin-top.c +++ b/trunk/Documentation/perf_counter/builtin-top.c @@ -74,8 +74,8 @@ static int nr_cpus = 0; static unsigned int realtime_prio = 0; static int group = 0; static unsigned int page_size; -static unsigned int mmap_pages = 16; -static int freq = 0; +static unsigned int mmap_pages = 16; +static int freq = 0; static char *sym_filter; static unsigned long filter_start; @@ -212,8 +212,13 @@ static void print_sym_table(void) events_per_sec, 100.0 - (100.0*((events_per_sec-kevents_per_sec)/events_per_sec))); - if (nr_counters == 1) - printf("%d ", event_count[0]); + if (nr_counters == 1) { + printf("%d", event_count[0]); + if (freq) + printf("Hz "); + else + printf(" "); + } for (counter = 0; counter < nr_counters; counter++) { if (counter)