linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <namhyung.kim@lge.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
	hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
	namhyung.kim@lge.com, namhyung@kernel.org, tglx@linutronix.de
Subject: [tip:perf/core] perf header: Set tracepoint event name only if not set
Date: Thu, 6 Sep 2012 23:07:21 -0700	[thread overview]
Message-ID: <tip-618a3f1d30ea0ee2ff3a88661b8d6a4035123211@git.kernel.org> (raw)
In-Reply-To: <1346821373-31621-3-git-send-email-namhyung@kernel.org>

Commit-ID:  618a3f1d30ea0ee2ff3a88661b8d6a4035123211
Gitweb:     http://git.kernel.org/tip/618a3f1d30ea0ee2ff3a88661b8d6a4035123211
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Wed, 5 Sep 2012 14:02:48 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 5 Sep 2012 17:46:34 -0300

perf header: Set tracepoint event name only if not set

The event name can be set already by processing a event_desc data.

So check it before setting to prevent possible leak.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1346821373-31621-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/header.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index a124b93..05c9310 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2314,7 +2314,7 @@ static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist,
 	struct perf_evsel *pos;
 
 	list_for_each_entry(pos, &evlist->entries, node) {
-		if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+		if (pos->attr.type == PERF_TYPE_TRACEPOINT && !pos->name &&
 		    perf_evsel__set_tracepoint_name(pos, pevent))
 			return -1;
 	}

  reply	other threads:[~2012-09-07  6:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-05  5:02 [PATCH 0/7] perf header: Save and reuse feature information in header (v2) Namhyung Kim
2012-09-05  5:02 ` [PATCH 1/7] perf header: Use evlist->nr_entries on write_event_desc() Namhyung Kim
2012-09-07  6:06   ` [tip:perf/core] perf header: Use evlist-> nr_entries " tip-bot for Namhyung Kim
2012-09-05  5:02 ` [PATCH 2/7] perf header: Set tracepoint event name only if not set Namhyung Kim
2012-09-07  6:07   ` tip-bot for Namhyung Kim [this message]
2012-09-05  5:02 ` [PATCH 3/7] perf header: Swap pmu mapping numbers if needed Namhyung Kim
2012-09-07  6:08   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-09-05  5:02 ` [PATCH 4/7] perf header: Add struct perf_header_info Namhyung Kim
2012-09-05  5:02 ` [PATCH 5/7] perf header: Add ->process callbacks to most of features Namhyung Kim
2012-09-05  5:02 ` [PATCH 6/7] perf header: Use pre-processed header info when printing Namhyung Kim
2012-09-05  5:02 ` [PATCH 7/7] perf header: Remove unused @feat arg from ->process callback Namhyung Kim

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=tip-618a3f1d30ea0ee2ff3a88661b8d6a4035123211@git.kernel.org \
    --to=namhyung.kim@lge.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).