From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Mike Galbraith <efault@gmx.de>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Tom Zanussi <tzanussi@gmail.com>
Subject: [PATCH 01/12] perf top: Remove redundant perf_top->sym_counter
Date: Tue, 15 Mar 2011 17:04:50 -0300 [thread overview]
Message-ID: <1300219501-15085-2-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1300219501-15085-1-git-send-email-acme@infradead.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
We can get that counter index from perf_top->sym_evsel->idx instead.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-top.c | 11 ++++++-----
tools/perf/util/top.c | 2 +-
tools/perf/util/top.h | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 80c9e06..4bf6e02 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -515,24 +515,25 @@ static void handle_keypress(struct perf_session *session, int c)
break;
case 'E':
if (top.evlist->nr_entries > 1) {
+ int counter;
fprintf(stderr, "\nAvailable events:");
list_for_each_entry(top.sym_evsel, &top.evlist->entries, node)
fprintf(stderr, "\n\t%d %s", top.sym_evsel->idx, event_name(top.sym_evsel));
- prompt_integer(&top.sym_counter, "Enter details event counter");
+ prompt_integer(&counter, "Enter details event counter");
- if (top.sym_counter >= top.evlist->nr_entries) {
+ if (counter >= top.evlist->nr_entries) {
top.sym_evsel = list_entry(top.evlist->entries.next, struct perf_evsel, node);
- top.sym_counter = 0;
fprintf(stderr, "Sorry, no such event, using %s.\n", event_name(top.sym_evsel));
sleep(1);
break;
}
list_for_each_entry(top.sym_evsel, &top.evlist->entries, node)
- if (top.sym_evsel->idx == top.sym_counter)
+ if (top.sym_evsel->idx == counter)
break;
- } else top.sym_counter = 0;
+ } else
+ top.sym_evsel = list_entry(top.evlist->entries.next, struct perf_evsel, node);
break;
case 'f':
prompt_integer(&top.count_filter, "Enter display event count filter");
diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c
index 75cfe4d..fcfb777 100644
--- a/tools/perf/util/top.c
+++ b/tools/perf/util/top.c
@@ -171,7 +171,7 @@ float perf_top__decay_samples(struct perf_top *top, struct rb_root *root)
{
struct sym_entry *syme, *n;
float sum_ksamples = 0.0;
- int snap = !top->display_weighted ? top->sym_counter : 0, j;
+ int snap = !top->display_weighted ? top->sym_evsel->idx : 0, j;
/* Sort the active symbols */
pthread_mutex_lock(&top->active_symbols_lock);
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index 96d1cb7..96a7831 100644
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -41,7 +41,7 @@ struct perf_top {
u64 exact_samples;
u64 guest_us_samples, guest_kernel_samples;
int print_entries, count_filter, delay_secs;
- int display_weighted, freq, rb_entries, sym_counter;
+ int display_weighted, freq, rb_entries;
pid_t target_pid, target_tid;
bool hide_kernel_symbols, hide_user_symbols, zero;
const char *cpu_list;
--
1.6.2.5
next prev parent reply other threads:[~2011-03-15 20:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 20:04 [GIT PULL 00/12] perf/core improvements, fixes and cleanups Arnaldo Carvalho de Melo
2011-03-15 20:04 ` Arnaldo Carvalho de Melo [this message]
2011-03-15 20:04 ` [PATCH 02/12] perf top: Remove redundant syme->origin field Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 03/12] perf symbols: Rename dso->origin to dso->symtab_type Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 04/12] perf symbol: Move sym_entry->skip to symbol->ignore Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 05/12] perf stat: Provide support for filters Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 06/12] perf script: Change process_event prototype Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 07/12] perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 08/12] perf script: Move printing of 'common' data from print_event and rename Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 09/12] perf script: Support custom field selection for output Arnaldo Carvalho de Melo
2011-03-15 20:04 ` [PATCH 10/12] perf script: Add support for dumping symbols Arnaldo Carvalho de Melo
2011-03-15 20:05 ` [PATCH 11/12] perf script: Add support for H/W and S/W events Arnaldo Carvalho de Melo
2011-03-15 20:05 ` [PATCH 12/12] perf evlist: New command to list the names of events present in a perf.data file Arnaldo Carvalho de Melo
2011-03-16 12:53 ` [GIT PULL 00/12] perf/core improvements, fixes and cleanups Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300219501-15085-2-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®