Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5016598yba; Wed, 8 May 2019 06:41:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJm+NIpxQ4N0imLMM2UDlrG3e8xTxTzjV+cliM1iJyDL0wJzqI59bu3Ixz+pE608+/wsfD X-Received: by 2002:a17:902:29ab:: with SMTP id h40mr47354607plb.269.1557322895180; Wed, 08 May 2019 06:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557322895; cv=none; d=google.com; s=arc-20160816; b=ltXUI6iV8/dTO1IhCbepGE2N1746nIXxx6mpOc2X/oSZYgcqMgKz7pC98nkkLsqe9E OIGu2QjiX4A/uHeYZ/SlDGIYVJDMYttDxfagFqsMawF58E12iQrNGbDqhZKQjjrRwek6 nRulwFQNS3hD6WglinU/YtK9VbCn3Dl0W/V4UUr6Dy7sbJnYbyqtu7DoZVkaNEY4ImmH Tp+fG+ihxu2UzCf5YivWaEMu6dzBHieBNSX2kWgFR4UhCICKHVsYbGv9lmC457iTUWkr P6WPAJyUkV+d6lkeduX8sDPmKDJ9nalI6I1aE4jhfyzPWWHTjcP3KQOkT+ZDGpmxqgAX /bLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=gn8KeHKXaMqYgCttNXdzdKkWDSBXNO0mULTlze584Po=; b=sKhocmYlIj25F2kplTwOxCJvyB77PGuTLwV6cd5d0B7+Jp4gdxSEbS1wrtnMfiVzHV ba1EqZYsZhDhNokCQj5rrHf1Mv1MkF1dfPLtX1hedoxFdqqA9Fd/miJ+IlXbrxdbo23z WTfrq1pD2hhULkj7e4DjhTgtXTEOVHYv08PiIpjXJ9ar5H/YXto9+ut7MnRbkRa13dnu rOMpmwLr3c12G7VfUqCEbpihWIAH90sMIetYzp5XEv8RDXJ4NQFPYsXTKGodF/+fzRCt 84SX8tT21PnHH6z6Ktu0iSs0DcCDnyAZDOMrwpwxCXD0gdRcjJ4iOPc1AhMmI3q6f47u SL6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n3si22425284pgq.202.2019.05.08.06.41.18; Wed, 08 May 2019 06:41:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728952AbfEHNUw (ORCPT + 99 others); Wed, 8 May 2019 09:20:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52184 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbfEHNUu (ORCPT ); Wed, 8 May 2019 09:20:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02DB7307D985; Wed, 8 May 2019 13:20:50 +0000 (UTC) Received: from krava.redhat.com (ovpn-204-49.brq.redhat.com [10.40.204.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 620AB10027D5; Wed, 8 May 2019 13:20:47 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Stanislav Fomichev , Song Liu , Adrian Hunter , Andi Kleen Subject: [PATCH 11/12] perf script: Remove superfluous bpf event titles Date: Wed, 8 May 2019 15:20:09 +0200 Message-Id: <20190508132010.14512-12-jolsa@kernel.org> In-Reply-To: <20190508132010.14512-1-jolsa@kernel.org> References: <20190508132010.14512-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 08 May 2019 13:20:50 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's no need to display "ksymbol event with" text for PERF_RECORD_KSYMBOL event and "bpf event with" test for PERF_RECORD_BPF_EVENT event. Removing it so it also goes along with other side-band events display. Before: # perf script --show-bpf-events ... swapper 0 [000] 0.000000: PERF_RECORD_KSYMBOL ksymbol event with addr ffffffffc0ef971d len 229 type 1 flags 0x0 name bpf_prog_2a142ef67aaad174 swapper 0 [000] 0.000000: PERF_RECORD_BPF_EVENT bpf event with type 1, flags 0, id 36 After: # perf script --show-bpf-events ... swapper 0 [000] 0.000000: PERF_RECORD_KSYMBOL addr ffffffffc0ef971d len 229 type 1 flags 0x0 name bpf_prog_2a142ef67aaad174 swapper 0 [000] 0.000000: PERF_RECORD_BPF_EVENT type 1, flags 0, id 36 Link: http://lkml.kernel.org/n/tip-qe1ehvt6xr00vmqt8dxyooo3@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index ba7be74fad6e..198920b7c56a 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1485,7 +1485,7 @@ static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp) size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp) { - return fprintf(fp, " ksymbol event with addr %" PRIx64 " len %u type %u flags 0x%x name %s\n", + return fprintf(fp, " addr %" PRIx64 " len %u type %u flags 0x%x name %s\n", event->ksymbol_event.addr, event->ksymbol_event.len, event->ksymbol_event.ksym_type, event->ksymbol_event.flags, event->ksymbol_event.name); @@ -1493,7 +1493,7 @@ size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp) size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp) { - return fprintf(fp, " bpf event with type %u, flags %u, id %u\n", + return fprintf(fp, " type %u, flags %u, id %u\n", event->bpf_event.type, event->bpf_event.flags, event->bpf_event.id); } -- 2.20.1