Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Shang XiaoJing <shangxiaojing@huawei.com>
To:     <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
        <mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
        <jolsa@kernel.org>, <namhyung@kernel.org>,
        <linux-perf-users@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC:     <shangxiaojing@huawei.com>
Subject: [PATCH] perf: Add build_id_cahce__read_build_id helper
Date:   Fri, 2 Sep 2022 10:11:22 +0800
Message-ID: <20220902021122.18142-1-shangxiaojing@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Wrap repeated code in helper function build_id_cahce__read_build_id, which
gets build id if success, or return -1 for failed to read build id.

Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
---
 tools/perf/builtin-buildid-cache.c | 41 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index cd381693658b..a55d1c6496ea 100644
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -172,20 +172,31 @@ static int build_id_cache__add_kcore(const char *filename, bool force)
 	return 0;
 }
 
-static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
+static int build_id_cahce__read_build_id(const char *filename, struct nsinfo *nsi,
+					  struct build_id *bid)
 {
-	char sbuild_id[SBUILD_ID_SIZE];
-	struct build_id bid;
-	int err;
 	struct nscookie nsc;
+	int err;
 
 	nsinfo__mountns_enter(nsi, &nsc);
-	err = filename__read_build_id(filename, &bid);
+	err = filename__read_build_id(filename, bid);
 	nsinfo__mountns_exit(&nsc);
 	if (err < 0) {
 		pr_debug("Couldn't read a build-id in %s\n", filename);
 		return -1;
 	}
+	return err;
+}
+
+static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
+{
+	char sbuild_id[SBUILD_ID_SIZE];
+	struct build_id bid;
+	int err;
+
+	err = build_id_cahce__read_build_id(filename, nsi, &bid);
+	if (err < 0)
+		return -1;
 
 	build_id__sprintf(&bid, sbuild_id);
 	err = build_id_cache__add_s(sbuild_id, filename, nsi,
@@ -199,17 +210,11 @@ static int build_id_cache__remove_file(const char *filename, struct nsinfo *nsi)
 {
 	char sbuild_id[SBUILD_ID_SIZE];
 	struct build_id bid;
-	struct nscookie nsc;
-
 	int err;
 
-	nsinfo__mountns_enter(nsi, &nsc);
-	err = filename__read_build_id(filename, &bid);
-	nsinfo__mountns_exit(&nsc);
-	if (err < 0) {
-		pr_debug("Couldn't read a build-id in %s\n", filename);
+	err = build_id_cahce__read_build_id(filename, nsi, &bid);
+	if (err < 0)
 		return -1;
-	}
 
 	build_id__sprintf(&bid, sbuild_id);
 	err = build_id_cache__remove_s(sbuild_id);
@@ -302,17 +307,11 @@ static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi)
 {
 	char sbuild_id[SBUILD_ID_SIZE];
 	struct build_id bid;
-	struct nscookie nsc;
-
 	int err;
 
-	nsinfo__mountns_enter(nsi, &nsc);
-	err = filename__read_build_id(filename, &bid);
-	nsinfo__mountns_exit(&nsc);
-	if (err < 0) {
-		pr_debug("Couldn't read a build-id in %s\n", filename);
+	err = build_id_cahce__read_build_id(filename, nsi, &bid);
+	if (err < 0)
 		return -1;
-	}
 	err = 0;
 
 	build_id__sprintf(&bid, sbuild_id);
-- 
2.17.1