mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
	Namhyung Kim <namhyung@gmail.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH 02/25] perf top: Delete maps on exit
Date: Thu, 31 Jan 2013 14:25:05 -0300	[thread overview]
Message-ID: <1359653128-10433-3-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1359653128-10433-1-git-send-email-acme@infradead.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Removing one more memory leak found with valgrind.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-gnb1gms0k8wictmtm2umpr8u@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-top.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 903e4f4..f561757 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1164,7 +1164,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (!top.evlist->nr_entries &&
 	    perf_evlist__add_default(top.evlist) < 0) {
 		ui__error("Not enough memory for event selector list\n");
-		return -ENOMEM;
+		goto out_delete_maps;
 	}
 
 	symbol_conf.nr_events = top.evlist->nr_entries;
@@ -1187,7 +1187,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 	} else {
 		ui__error("frequency and count are zero, aborting\n");
 		status = -EINVAL;
-		goto out_delete_evlist;
+		goto out_delete_maps;
 	}
 
 	top.sym_evsel = perf_evlist__first(top.evlist);
@@ -1220,6 +1220,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 
 	status = __cmd_top(&top);
 
+out_delete_maps:
+	perf_evlist__delete_maps(top.evlist);
 out_delete_evlist:
 	perf_evlist__delete(top.evlist);
 
-- 
1.8.1.1.361.gec3ae6e


  parent reply	other threads:[~2013-01-31 17:32 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-31 17:25 [GIT PULL 00/25] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 01/25] perf top: Stop using exit() Arnaldo Carvalho de Melo
2013-01-31 17:25 ` Arnaldo Carvalho de Melo [this message]
2013-01-31 18:14   ` [PATCH 02/25] perf top: Delete maps on exit David Ahern
2013-01-31 19:05     ` Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 03/25] perf tools: Keep group information Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 04/25] perf tests: Add group test conditions Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 05/25] perf header: Add HEADER_GROUP_DESC feature Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 06/25] perf report: Make another loop for linking group hists Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 07/25] perf hists: Resort hist entries using group members for output Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 08/25] perf ui/hist: Consolidate hpp helpers Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 09/25] perf hists browser: Convert hpp helpers to a function Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 10/25] perf gtk/browser: " Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 11/25] perf ui/hist: Add support for event group view Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 12/25] perf hists browser: Move coloring logic to hpp functions Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 13/25] perf hists browser: Add suppport for event group view Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 14/25] perf gtk/browser: Add support " Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 15/25] perf gtk/browser: Trim column header string when event group enabled Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 16/25] perf report: Bypass non-leader events when event group is enabled Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 17/25] perf report: Show group description " Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 18/25] perf report: Add --group option Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 19/25] perf report: Add report.group config option Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 20/25] perf evlist: Add --group option Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 21/25] perf/Power7: Use macros to identify perf events Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 22/25] perf: Make EVENT_ATTR global Arnaldo Carvalho de Melo
2013-02-01 10:26   ` Ingo Molnar
2013-01-31 17:25 ` [PATCH 23/25] perf/POWER7: Make generic event translations available in sysfs Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 24/25] perf/POWER7: Make some POWER7 events " Arnaldo Carvalho de Melo
2013-01-31 17:25 ` [PATCH 25/25] perf: Document the ABI of perf sysfs entries Arnaldo Carvalho de Melo
2013-02-01 10:18 ` [GIT PULL 00/25] perf/core improvements and fixes 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=1359653128-10433-3-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@gmail.com \
    --cc=paulus@samba.org \
    --cc=peterz@infradead.org \
    /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®