From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752952AbbIOHEg (ORCPT ); Tue, 15 Sep 2015 03:04:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50204 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752216AbbIOHEf (ORCPT ); Tue, 15 Sep 2015 03:04:35 -0400 Date: Tue, 15 Sep 2015 00:04:13 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com, fweisbec@gmail.com, bp@suse.de, dsahern@gmail.com, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, wangnan0@huawei.com, jolsa@kernel.org, kan.liang@intel.com Reply-To: adrian.hunter@intel.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, kan.liang@intel.com, wangnan0@huawei.com, tglx@linutronix.de, dsahern@gmail.com, eranian@google.com, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, fweisbec@gmail.com, bp@suse.de, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf cpu_map: Use sysfs__read_int in get_{core, socket}_id() Git-Commit-ID: 5d8cf721cb13be92e96f22846e5bcd31040d4d0b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5d8cf721cb13be92e96f22846e5bcd31040d4d0b Gitweb: http://git.kernel.org/tip/5d8cf721cb13be92e96f22846e5bcd31040d4d0b Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 11 Sep 2015 10:49:45 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 14 Sep 2015 12:50:27 -0300 perf cpu_map: Use sysfs__read_int in get_{core,socket}_id() We have the tools/lib/ sysfs__read_int() for that, avoid code duplication. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-fqg6vt5ku72pbf54ljg6tmoy@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cpumap.c | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index a05d76a..c51c29f 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -225,28 +225,20 @@ void cpu_map__put(struct cpu_map *map) cpu_map__delete(map); } -int cpu_map__get_socket_id(int cpu) +static int cpu__get_topology_int(int cpu, const char *name, int *value) { - FILE *fp; - const char *mnt; char path[PATH_MAX]; - int socket_id, ret; - - mnt = sysfs__mountpoint(); - if (!mnt) - return -1; snprintf(path, PATH_MAX, - "%s/devices/system/cpu/cpu%d/topology/physical_package_id", - mnt, cpu); + "devices/system/cpu/cpu%d/topology/%s", cpu, name); - fp = fopen(path, "r"); - if (!fp) - return -1; - ret = fscanf(fp, "%d", &socket_id); - fclose(fp); + return sysfs__read_int(path, value); +} - return ret == 1 ? socket_id : -1; +int cpu_map__get_socket_id(int cpu) +{ + int value, ret = cpu__get_topology_int(cpu, "physical_package_id", &value); + return ret ?: value; } int cpu_map__get_socket(struct cpu_map *map, int idx) @@ -299,26 +291,8 @@ static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res, int cpu_map__get_core_id(int cpu) { - FILE *fp; - const char *mnt; - char path[PATH_MAX]; - int core_id, ret; - - mnt = sysfs__mountpoint(); - if (!mnt) - return -1; - - snprintf(path, PATH_MAX, - "%s/devices/system/cpu/cpu%d/topology/core_id", - mnt, cpu); - - fp = fopen(path, "r"); - if (!fp) - return -1; - ret = fscanf(fp, "%d", &core_id); - fclose(fp); - - return ret == 1 ? core_id : -1; + int value, ret = cpu__get_topology_int(cpu, "core_id", &value); + return ret ?: value; } int cpu_map__get_core(struct cpu_map *map, int idx)