From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753547AbbJTHq3 (ORCPT ); Tue, 20 Oct 2015 03:46:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48217 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752975AbbJTHqZ (ORCPT ); Tue, 20 Oct 2015 03:46:25 -0400 Date: Tue, 20 Oct 2015 00:45:52 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: dsahern@gmail.com, acme@redhat.com, jolsa@redhat.com, hpa@zytor.com, namhyung@kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, mitake@dcl.info.waseda.ac.jp Reply-To: mingo@kernel.org, torvalds@linux-foundation.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, mitake@dcl.info.waseda.ac.jp, dsahern@gmail.com, acme@redhat.com, jolsa@redhat.com, hpa@zytor.com In-Reply-To: <1445241870-24854-9-git-send-email-mingo@kernel.org> References: <1445241870-24854-9-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bench mem: Rename 'routine' to 'routine_str' Git-Commit-ID: e815e327604af880bdcf38cdd711dfa78627ab2a 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: e815e327604af880bdcf38cdd711dfa78627ab2a Gitweb: http://git.kernel.org/tip/e815e327604af880bdcf38cdd711dfa78627ab2a Author: Ingo Molnar AuthorDate: Mon, 19 Oct 2015 10:04:24 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 19 Oct 2015 16:05:27 -0300 perf bench mem: Rename 'routine' to 'routine_str' 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. Signed-off-by: Ingo Molnar Cc: David Ahern Cc: Hitoshi Mitake Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1445241870-24854-9-git-send-email-mingo@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/bench/mem-functions.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c index 6fe8667..a76e57f 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, @@ -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",