Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp1401594ybe; Fri, 13 Sep 2019 16:21:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRGmbx9DjQbm4EyvZW3PDzfvaAtg1qwFsx3vvt3ug++1PxDEqoBrMCHU0NeJ2CoZa07YiI X-Received: by 2002:a17:906:29c7:: with SMTP id y7mr42050950eje.287.1568416864263; Fri, 13 Sep 2019 16:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568416864; cv=none; d=google.com; s=arc-20160816; b=b0s52RPAzR1awyeqGukuoKwFe6gTHGH7yFGPNwD06QRi9kTg4b7kEkg49XwchoMAyC rTK/A5+DqhIj/gG9nUmDohHDn7fzH8KssaVtwNP+mOCyoFyLvBok/kc+ioRQInWtpHnJ pfK61TVF4XaYWnlgyRvpUJ46ltYTKDSLK2lwOR8LLl0jPnh1GiLBvy8RnBl78udVJMUH jyzscxMqdcIoLhATrwKP9w5VvXCw4OR815Xn/tLgcwDVvl+PCQ+kgsioA4mUhYoGEq4/ Ay4hcRAqAP10jrCQ5RMEpUHXU0RGkH+nFdo14Nu0ro5OXDSok2APaVMJUORX1EZeQKNt E5OA== 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=Ld/lhBDoJ17xv/NAi7qqOSo3f3+JXX0/nEDFKCfu3j0=; b=iYkCSD8ouerkEQhzaYybB3KLsGb52q0fozJA1XTS4Y0nSFF/4S1ORFYhbmcBUv/dxh N2ar7CcyC+VCWGCaB483F6tQw5UAcqPiMds6Xba6etnMS0+tN8u1WZp3gAiz7qNq5Exb dLfg1uEbncsX+jFORYh8vO8pqCpglDIo6x0SQ3btBmoIhpqRQK7B344tVJXzY2kgSUyL 1m655yaLpRqPhZEv3Rz7ajEgM7lrN6JMBc/ILPqgdaMH6u1FEYoRtF43azojr/Uk6x5z q/Gp69LVFZjdPTaqKqVDvJI8MfsbsBMeCpVCVWl9FbIXxNBTuFWTyKBOSxYvwQ+VWLnf s+uQ== 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 b8si15960784ejv.106.2019.09.13.16.20.41; Fri, 13 Sep 2019 16:21:04 -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 S2391146AbfIMNYY (ORCPT + 99 others); Fri, 13 Sep 2019 09:24:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390746AbfIMNYT (ORCPT ); Fri, 13 Sep 2019 09:24:19 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C88E78980E1; Fri, 13 Sep 2019 13:24:18 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A91B5C1D4; Fri, 13 Sep 2019 13:24:14 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Michael Petlan Subject: [PATCH 07/73] perf tools: Rename perf_evlist__exit() to evlist__exit() Date: Fri, 13 Sep 2019 15:22:49 +0200 Message-Id: <20190913132355.21634-8-jolsa@kernel.org> In-Reply-To: <20190913132355.21634-1-jolsa@kernel.org> References: <20190913132355.21634-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Fri, 13 Sep 2019 13:24:19 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename (perf_evlist__exit) to evlist__exit(), so we don't have a name clash when we add (perf_evlist__exit) in libperf. Link: http://lkml.kernel.org/n/tip-p06j15gw578nyggy56v83z6b@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evlist.h | 2 +- tools/perf/util/python.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index dc7117c33ab8..d71fafd472ea 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -137,7 +137,7 @@ static void perf_evlist__purge(struct evlist *evlist) evlist->core.nr_entries = 0; } -void perf_evlist__exit(struct evlist *evlist) +void evlist__exit(struct evlist *evlist) { zfree(&evlist->mmap); zfree(&evlist->overwrite_mmap); @@ -156,7 +156,7 @@ void evlist__delete(struct evlist *evlist) evlist->core.cpus = NULL; evlist->core.threads = NULL; perf_evlist__purge(evlist); - perf_evlist__exit(evlist); + evlist__exit(evlist); free(evlist); } diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index f07501602353..b33c5d67410a 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -65,7 +65,7 @@ struct evlist *perf_evlist__new_default(void); struct evlist *perf_evlist__new_dummy(void); void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, struct perf_thread_map *threads); -void perf_evlist__exit(struct evlist *evlist); +void evlist__exit(struct evlist *evlist); void evlist__delete(struct evlist *evlist); void evlist__add(struct evlist *evlist, struct evsel *entry); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 9b0eaf83212f..7e28f7e18d41 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -884,7 +884,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist, static void pyrf_evlist__delete(struct pyrf_evlist *pevlist) { - perf_evlist__exit(&pevlist->evlist); + evlist__exit(&pevlist->evlist); Py_TYPE(pevlist)->tp_free((PyObject*)pevlist); } -- 2.21.0