Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 502fc5c7 authored Mar 13, 2009 by Ingo Molnar

perf_counter tools: Uniform help printouts



Also add perf list to command-list.txt.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 386b05e3

Documentation/perf_counter/builtin-help.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -426,16 +426,16 @@ int cmd_help(int argc, const char *argv, const char prefix)
	builtin_help_usage, 0);		builtin_help_usage, 0);

	if (show_all) {		if (show_all) {
	printf("usage: %s\n\n", perf_usage_string);		printf("\n usage: %s\n\n", perf_usage_string);
	list_commands("perf commands", &main_cmds, &other_cmds);		list_commands("perf commands", &main_cmds, &other_cmds);
	printf("%s\n", perf_more_info_string);		printf(" %s\n\n", perf_more_info_string);
	return 0;		return 0;
	}		}

	if (!argv[0]) {		if (!argv[0]) {
	printf("usage: %s\n\n", perf_usage_string);		printf("\n usage: %s\n\n", perf_usage_string);
	list_common_cmds_help();		list_common_cmds_help();
	printf("\n%s\n", perf_more_info_string);		printf("\n %s\n\n", perf_more_info_string);
	return 0;		return 0;
	}		}

Documentation/perf_counter/command-list.txt

+8 −6

Original line number	Original line	Diff line number	Diff line
			#
	# List of known perf commands.		# List of known perf commands.
	# command name category [deprecated] [common]		# command name category [deprecated] [common]
			#
	perf-record mainporcelain common		perf-record mainporcelain common
	perf-report mainporcelain common		perf-report mainporcelain common
	perf-stat mainporcelain common		perf-stat mainporcelain common
	perf-top mainporcelain common		perf-top mainporcelain common
			perf-list mainporcelain common

Documentation/perf_counter/perf.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -384,9 +384,9 @@ int main(int argc, const char **argv)
	argv[0] += 2;		argv[0] += 2;
	} else {		} else {
	/* The user didn't specify a command; give them help */		/* The user didn't specify a command; give them help */
	printf("usage: %s\n\n", perf_usage_string);		printf("\n usage: %s\n\n", perf_usage_string);
	list_common_cmds_help();		list_common_cmds_help();
	printf("\n%s\n", perf_more_info_string);		printf("\n %s\n\n", perf_more_info_string);
	exit(1);		exit(1);
	}		}
	cmd = argv[0];		cmd = argv[0];

Documentation/perf_counter/util/parse-options.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -385,7 +385,7 @@ int usage_with_options_internal(const char * const *usagestr,
	if (!usagestr)		if (!usagestr)
	return PARSE_OPT_HELP;		return PARSE_OPT_HELP;

	fprintf(stderr, "usage: %s\n", *usagestr++);		fprintf(stderr, "\n usage: %s\n", *usagestr++);
	while (usagestr && *usagestr)		while (usagestr && *usagestr)
	fprintf(stderr, " or: %s\n", *usagestr++);		fprintf(stderr, " or: %s\n", *usagestr++);
	while (*usagestr) {		while (*usagestr) {

Documentation/perf_counter/util/usage.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ static void report(const char prefix, const char err, va_list params)

	static NORETURN void usage_builtin(const char *err)		static NORETURN void usage_builtin(const char *err)
	{		{
	fprintf(stderr, "usage: %s\n", err);		fprintf(stderr, "\n usage: %s\n", err);
	exit(129);		exit(129);
	}		}