Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756718Ab2FNUkA (ORCPT ); Thu, 14 Jun 2012 16:40:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56122 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756596Ab2FNUjT (ORCPT ); Thu, 14 Jun 2012 16:39:19 -0400 From: Jiri Olsa To: acme@redhat.com, a.p.zijlstra@chello.nl, mingo@elte.hu, paulus@samba.org, cjashfor@linux.vnet.ibm.com, fweisbec@gmail.com, eranian@google.com Cc: linux-kernel@vger.kernel.org, Jiri Olsa Subject: [PATCH 3/6] perf, tool: Properly free format data Date: Thu, 14 Jun 2012 22:38:38 +0200 Message-Id: <1339706321-8802-4-git-send-email-jolsa@redhat.com> In-Reply-To: <1339706321-8802-1-git-send-email-jolsa@redhat.com> References: <1339706321-8802-1-git-send-email-jolsa@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2253 Lines: 89 Release format data in case there's failure during PMU load. Format data are allocated during PMU lookup. If the lookup fails in next steps, we dont release the format data. Signed-off-by: Jiri Olsa --- tools/perf/util/pmu.c | 50 +++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index bda0563..1d73131 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -15,6 +15,14 @@ extern FILE *perf_pmu_in; static LIST_HEAD(pmus); +static void pmu_format_release(struct list_head *head) +{ + struct perf_pmu__format *format, *h; + + list_for_each_entry_safe(format, h, head, list) + free(format); +} + /* * Parse & process all the sysfs attributes located under * the directory specified in 'dir' parameter. @@ -120,27 +128,33 @@ static struct perf_pmu *pmu_lookup(char *name) LIST_HEAD(format); __u32 type; - /* - * The pmu data we store & need consists of the pmu - * type value and format definitions. Load both right - * now. - */ - if (pmu_format(name, &format)) - return NULL; + do { + /* + * The pmu data we store & need consists of the pmu + * type value and format definitions. Load both right + * now. + */ + if (pmu_format(name, &format)) + break; - if (pmu_type(name, &type)) - return NULL; + if (pmu_type(name, &type)) + break; - pmu = zalloc(sizeof(*pmu)); - if (!pmu) - return NULL; + pmu = zalloc(sizeof(*pmu)); + if (!pmu) + break; - INIT_LIST_HEAD(&pmu->format); - list_splice(&format, &pmu->format); - pmu->name = strdup(name); - pmu->type = type; - list_add_tail(&pmu->list, &pmus); - return pmu; + INIT_LIST_HEAD(&pmu->format); + list_splice(&format, &pmu->format); + pmu->name = strdup(name); + pmu->type = type; + list_add_tail(&pmu->list, &pmus); + return pmu; + + } while (0); + + pmu_format_release(&format); + return NULL; } static struct perf_pmu *pmu_find(char *name) -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/