Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755226Ab2HVInj (ORCPT ); Wed, 22 Aug 2012 04:43:39 -0400 Received: from mail9.hitachi.co.jp ([133.145.228.44]:36030 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880Ab2HVIn0 (ORCPT ); Wed, 22 Aug 2012 04:43:26 -0400 X-AuditID: b753bd60-991dcba000000c4c-83-50349bab67ef X-AuditID: b753bd60-991dcba000000c4c-83-50349bab67ef From: Yoshihiro YUNOMAE Subject: [PATCH 2/5] trace-cmd: Use tracing directory to count CPUs To: Steven Rostedt Cc: Amit Shah , Anthony Liguori , Arnd Bergmann , Borislav Petkov , "Franch Ch. Eigler" , Frederic Weisbecker , Greg Kroah-Hartman , Herbert Xu , Ingo Molnar , Masami Hiramatsu , Mathieu Desnoyers , Rusty Russell , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, qemu-devel@nongnu.org, yrl.pp-manager.tt@hitachi.com, Masami Hiramatsu , Yoshihiro YUNOMAE Date: Wed, 22 Aug 2012 17:43:12 +0900 Message-ID: <20120822084312.17293.47596.stgit@ltc189.sdl.hitachi.co.jp> In-Reply-To: <20120822084251.17293.69086.stgit@ltc189.sdl.hitachi.co.jp> References: <20120822084251.17293.69086.stgit@ltc189.sdl.hitachi.co.jp> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1864 Lines: 78 From: Masami Hiramatsu Count debugfs/tracing/per_cpu/cpu* to determine the number of CPUs. Signed-off-by: Masami Hiramatsu Signed-off-by: Yoshihiro YUNOMAE --- trace-record.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/trace-record.c b/trace-record.c index 9dc18a9..ed18951 100644 --- a/trace-record.c +++ b/trace-record.c @@ -1179,6 +1179,41 @@ static void expand_event_list(void) } } +static int count_tracingdir_cpus(void) +{ + char *tracing_dir = NULL; + char *percpu_dir = NULL; + struct dirent **namelist; + int count = 0, n; + + /* Count cpus in per_cpu directory */ + tracing_dir = tracecmd_find_tracing_dir(); + if (!tracing_dir) + return 0; + percpu_dir = malloc_or_die(strlen(tracing_dir) + 9); + if (!percpu_dir) + goto err; + + sprintf(percpu_dir, "%s/per_cpu", tracing_dir); + + n = scandir(percpu_dir, &namelist, NULL, alphasort); + if (n > 0) { + while (n--) { + if (strncmp("cpu", namelist[n]->d_name, 3) == 0) + count++; + free(namelist[n]); + } + free(namelist); + } + + if (percpu_dir) + free(percpu_dir); +err: + if (tracing_dir) + free(tracing_dir); + return count; +} + static int count_cpus(void) { FILE *fp; @@ -1189,6 +1224,12 @@ static int count_cpus(void) size_t n; int r; + cpus = count_tracingdir_cpus(); + if (cpus > 0) + return cpus; + + warning("failed to use tracing_dir to determine number of CPUS"); + cpus = sysconf(_SC_NPROCESSORS_CONF); if (cpus > 0) return cpus; -- 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/