From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbbJSIHw (ORCPT ); Mon, 19 Oct 2015 04:07:52 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35592 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558AbbJSIFF (ORCPT ); Mon, 19 Oct 2015 04:05:05 -0400 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , David Ahern , Jiri Olsa , Hitoshi Mitake , Linus Torvalds , Thomas Gleixner Subject: [PATCH 08/14] perf/bench/mem: Rename 'routine' to 'routine_str' Date: Mon, 19 Oct 2015 10:04:24 +0200 Message-Id: <1445241870-24854-9-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445241870-24854-1-git-send-email-mingo@kernel.org> References: <1445241870-24854-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org So bench/mem-functions.c has a 'routine' name for the routines parameter string, but a 'length_str' name for the length parameter string. We also have another entity named 'routine': 'struct routine'. This is inconsistent and confusing: rename 'routine' to 'routine_str'. Also fix typos in the --routine help text. Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Hitoshi Mitake Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- tools/perf/bench/mem-functions.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c index 150414de1497..fc2afd1bfb4e 100644 --- a/tools/perf/bench/mem-functions.c +++ b/tools/perf/bench/mem-functions.c @@ -24,7 +24,7 @@ #define K 1024 static const char *length_str = "1MB"; -static const char *routine = "all"; +static const char *routine_str = "all"; static int iterations = 1; static bool use_cycles; static int cycles_fd; @@ -33,8 +33,8 @@ static const struct option options[] = { OPT_STRING('l', "length", &length_str, "1MB", "Specify length of memory to copy. " "Available units: B, KB, MB, GB and TB (upper and lower)"), - OPT_STRING('r', "routine", &routine, "all", - "Specify routine to copy, \"all\" runs all available routines"), + OPT_STRING('r', "routine", &routine_str, "all", + "Specify the routine to run, \"all\" runs all available routines"), OPT_INTEGER('i', "iterations", &iterations, "repeat memcpy() invocation this number of times"), OPT_BOOLEAN('c', "cycles", &use_cycles, @@ -128,7 +128,7 @@ static void __bench_mem_routine(struct bench_mem_info *info, int r_idx, size_t l double result_bps = 0.0; u64 result_cycles = 0; - printf("Routine %s (%s)\n", r->name, r->desc); + printf("routine %s (%s)\n", r->name, r->desc); if (bench_format == BENCH_FORMAT_DEFAULT) printf("# Copying %s Bytes ...\n\n", length_str); @@ -181,18 +181,18 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info * return 1; } - if (!strncmp(routine, "all", 3)) { + if (!strncmp(routine_str, "all", 3)) { for (i = 0; info->routines[i].name; i++) __bench_mem_routine(info, i, len, totallen); return 0; } for (i = 0; info->routines[i].name; i++) { - if (!strcmp(info->routines[i].name, routine)) + if (!strcmp(info->routines[i].name, routine_str)) break; } if (!info->routines[i].name) { - printf("Unknown routine:%s\n", routine); + printf("Unknown routine: %s\n", routine_str); printf("Available routines...\n"); for (i = 0; info->routines[i].name; i++) { printf("\t%s ... %s\n", -- 2.1.4