From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753955Ab2AHPzd (ORCPT ); Sun, 8 Jan 2012 10:55:33 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:39552 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752727Ab2AHPzc (ORCPT ); Sun, 8 Jan 2012 10:55:32 -0500 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] perf top: Use active evsel for non-sample events on old kernel Date: Mon, 9 Jan 2012 00:55:23 +0900 Message-Id: <1326038125-2929-1-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.8.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If multiple events are specified on old kernel, perf_evlist__id2evsel() returns NULL for non-sampling events since the sample.id doesn't contain valid value, and it triggers assert below. If only one event is given, the function returns the evsel regardless of sample.id, this is why most case cause no problem on old kernel. Fix it by using active evsel. Signed-off-by: Namhyung Kim --- tools/perf/builtin-top.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index d89dec90103e..2c9fa1e48854 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -762,6 +762,14 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) } evsel = perf_evlist__id2evsel(session->evlist, sample.id); + if (evsel == NULL && !session->sample_id_all && + event->header.type != PERF_RECORD_SAMPLE) { + /* + * Old kernel, no sample_id_all field. + * Just use active evsel. + */ + evsel = top->sym_evsel; + } assert(evsel != NULL); origin = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; -- 1.7.8.2