From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 980F7C7EE45 for ; Thu, 8 Jun 2023 23:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8GLjZMVUlL7c3Zp7nISPBrLO6OzQQjxj5T8TNuGNiuk=; b=O/ZPun5JlNjINZ /oTg9NGe2iJz7Zm8+LYrPn9Bd76aoFAaUHPEKRcq5zAl26HjHLYfRVWJ5uO3j7S5OjvsvCpInN1oX KyZ2dbcaGxjLxSCHA7x8zDhMA3CVjynFlErg9cUjYHJoP6ncb2UKOir/cnKPWI+sA3RMTm7V6Vj+m az+KrgGcd7ZGqcu+F5n6xQpTIyIufMtnyOQ/hOgpcBpqdBaOK2qpmZmIVDn/8xugZJii6hppCKHBl IPNyuoxyP+bT9Oqoq1wTkkJXD36NIYr2BxLDwFXV6mcNAk5JEg94SbOdcXaNf2/fwSUMgsiwbBktq nnHi6z/Jy+FLsem9bmOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7P5x-00Aw5L-0d; Thu, 08 Jun 2023 23:31:09 +0000 Received: from desiato.infradead.org ([90.155.92.199]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7P5t-00Aw1u-37 for linux-arm-kernel@bombadil.infradead.org; Thu, 08 Jun 2023 23:31:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Pl84Wb/J0XwyUQzqil2jyo7Ij9NgOb19MY5gzo850pI=; b=l2E/l0er75K1rWGcDSSKislhUC YLikda6GefceWB7/IteXZLc682c7tEth4o+VPnmlVYQrhJgR1PdCC9Vm1Di1H2cx1emkSjkPwFr+6 lwWMtDgC8NQDSWiQpugNOKmkU9RJB7QGv5tQDmJH9kyrILVW9hjUEEv+VXGZrdQaVkcpcSkYNiL1X VkbFxIG2YJ/dCovwWOAAjry/uttDCKQVz3jAuRLjRXsj0P8p/QyvGO5dnZZ9ZAXpRIxFOrEfcZYec +ITWoNvXLon8MSnbWH0DYR+iR5rBeE3VJr+xf3Rw+dYIBivoBV3TCpgRdqAfKueW8J1itzmXqWCJC Wn/c18bw==; Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7P4y-006MpV-2Y for linux-arm-kernel@lists.infradead.org; Thu, 08 Jun 2023 23:30:29 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5655d99da53so25396277b3.0 for ; Thu, 08 Jun 2023 16:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686267006; x=1688859006; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Pl84Wb/J0XwyUQzqil2jyo7Ij9NgOb19MY5gzo850pI=; b=xnSakeo5Yb7wwdtDMtyb7HVmj8YIuug35kGbTZONK5jWOa3frI8ut/fr93Fc8/JTwX kvPVpJEjW0sAh9sgPXMO7hyOJi/3vdDxkAi+slwHAwCqrDu0YARCS7yvVlRIkeo5nA06 C15nsVuVNrmKDz9sWZFnqATC9K8cVorJcxIOokWO13z2/1LDCTGY/s1RQBTMMhreyVgg 83aqZxGUcA1c/VNd055oUlTQF1Lva5eiYUU+EMHdqdWbR/KXkbdHAGtQFr9pIqdCSeqs LmvvrblYw88CmiAOK+DgWcGAsQbyYkW6/SP95piwYMv/4lRiHtmDhC7d3H3k9+1MYT+n Mfsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686267006; x=1688859006; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Pl84Wb/J0XwyUQzqil2jyo7Ij9NgOb19MY5gzo850pI=; b=GMkZNlmYgkPJEXjjLHsHdxU7GYZSttkz+oIm01e6Ot+N3ax/2OQWLJMWXd1wBjFrBx 7QQ4/zpQt1SKOG/jNfAvNYwKk+JpH3jZp/JPLj+ARezuUsuYPgzvM60edptIDng8v8Fd uaevkWw+zsWP4mnVWFPJvOvhpmTqlAFU+vn65StAnDS0R2SQcafvZ+2bDcgRIAN0Hu1B m0n1z4dxb3sjLHaOwM9WSCOlFkfu0yUKo2XymZVaO4yqM93G9iS9on+0XoFlHeRnyp17 7sBGXMLFcmJH9v1BuNMwsK6qJLbHngyF57PUN9QywRV8mhBnkIc1cEhOJjTRkkYQ0v5o yJXA== X-Gm-Message-State: AC+VfDzIb/8AYyISARuCihqUi1lahZ1FWmpfM/YgNmUb6+yc/b60hQnH jLrZ066xQECG9F+n3PEPn7Q1gCWY6EZu X-Google-Smtp-Source: ACHHUZ6XZQubQMzg154P6DYDd+lHosdgRP3GkxT70tkfupa8BerI7CJLgpzGAucDVJ4zIZScOONMhWdG/Fqr X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c3e5:ebc6:61e5:c73f]) (user=irogers job=sendgmr) by 2002:a05:690c:2e0f:b0:569:ea0e:b450 with SMTP id et15-20020a05690c2e0f00b00569ea0eb450mr590468ywb.5.1686267005998; Thu, 08 Jun 2023 16:30:05 -0700 (PDT) Date: Thu, 8 Jun 2023 16:28:19 -0700 In-Reply-To: <20230608232823.4027869-1-irogers@google.com> Message-Id: <20230608232823.4027869-23-irogers@google.com> Mime-Version: 1.0 References: <20230608232823.4027869-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v2 22/26] perf top: Add exit routine for main thread From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Suzuki K Poulose , "Naveen N. Rao" , Kan Liang , German Gomez , Ali Saidi , Jing Zhang , Athira Rajeev , Miguel Ojeda , ye xingchen , Liam Howlett , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , K Prateek Nayak , Changbin Du , Ravi Bangoria , Sean Christopherson , Andi Kleen , "Steinar H. Gunderson" , Yuan Can , Brian Robbins , liuwenyu , Ivan Babrou , Fangrui Song , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, coresight@lists.linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230609_003027_578145_3C03818E X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add exit_process_thread that reverses init_process_thread. This avoids leak sanitizer reporting memory leaks. Signed-off-by: Ian Rogers --- tools/perf/builtin-top.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 99010dfa5760..c363c04e16df 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -392,7 +392,7 @@ static void prompt_percent(int *target, const char *msg) static void perf_top__prompt_symbol(struct perf_top *top, const char *msg) { - char *buf = malloc(0), *p; + char *buf = NULL, *p; struct hist_entry *syme = top->sym_filter_entry, *n, *found = NULL; struct hists *hists = evsel__hists(top->sym_evsel); struct rb_node *next; @@ -1227,6 +1227,14 @@ static void init_process_thread(struct perf_top *top) cond_init(&top->qe.cond); } +static void exit_process_thread(struct perf_top *top) +{ + ordered_events__free(&top->qe.data[0]); + ordered_events__free(&top->qe.data[1]); + mutex_destroy(&top->qe.mutex); + cond_destroy(&top->qe.cond); +} + static int __cmd_top(struct perf_top *top) { struct record_opts *opts = &top->record_opts; @@ -1357,6 +1365,7 @@ static int __cmd_top(struct perf_top *top) cond_signal(&top->qe.cond); pthread_join(thread_process, NULL); perf_set_singlethreaded(); + exit_process_thread(top); return ret; } -- 2.41.0.162.gfafddb0af9-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel