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

Commit 9327ca73 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - Allow callchain order (caller, callee) to the libdw and libunwind based DWARF
    unwinders (Jiri Olsa)

  - Add missing parent_val initialization in the callchain code, fixing a
    SEGFAULT when using callchains with 'perf top' (Jiri Olsa)

  - Add initial 'perf config' command, for now just with a --list command to the
    contents of the configuration file in use and a basic man page describing
    its format, commands for doing edits and detailed documentation are being
    reviewed and proof-read. (Taeung Song)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b7883a1c 646a6e84

tools/perf/Build

+1 −0
Original line number Diff line number Diff line 
perf-y += builtin-bench.o

perf-y += builtin-annotate.o

perf-y += builtin-config.o

perf-y += builtin-diff.o

perf-y += builtin-evlist.o

perf-y += builtin-help.o

tools/perf/Documentation/perf-config.txt

0 → 100644
+103 −0
Original line number Diff line number Diff line 
perf-config(1)

==============



NAME

----

perf-config - Get and set variables in a configuration file.



SYNOPSIS

--------

[verse]

'perf config' -l | --list



DESCRIPTION

-----------

You can manage variables in a configuration file with this command.



OPTIONS

-------



-l::

--list::

	Show current config variables, name and value, for all sections.



CONFIGURATION FILE

------------------



The perf configuration file contains many variables to change various

aspects of each of its tools, including output, disk usage, etc.

The '$HOME/.perfconfig' file is used to store a per-user configuration.

The file '$(sysconfdir)/perfconfig' can be used to

store a system-wide default configuration.



Syntax

~~~~~~



The file consist of sections. A section starts with its name

surrounded by square brackets and continues till the next section

begins. Each variable must be in a section, and have the form

'name = value', for example:



	[section]

		name1 = value1

		name2 = value2



Section names are case sensitive and can contain any characters except

newline (double quote `"` and backslash have to be escaped as `\"` and `\\`,

respectively). Section headers can't span multiple lines.



Example

~~~~~~~



Given a $HOME/.perfconfig like this:



#

# This is the config file, and

# a '#' and ';' character indicates a comment

#



	[colors]

		# Color variables

		top = red, default

		medium = green, default

		normal = lightgray, default

		selected = white, lightgray

		code = blue, default

		addr = magenta, default

		root = white, blue



	[tui]

		# Defaults if linked with libslang

		report = on

		annotate = on

		top = on



	[buildid]

		# Default, disable using /dev/null

		dir = ~/.debug



	[annotate]

		# Defaults

		hide_src_code = false

		use_offset = true

		jump_arrows = true

		show_nr_jumps = false



	[help]

		# Format can be man, info, web or html

		format = man

		autocorrect = 0



	[ui]

		show-headers = true



	[call-graph]

		# fp (framepointer), dwarf

		record-mode = fp

		print-type = graph

		order = caller

		sort-key = function



SEE ALSO

--------

linkperf:perf[1]

tools/perf/builtin-config.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * builtin-config.c

 *

 * Copyright (C) 2015, Taeung Song <treeze.taeung@gmail.com>

 *

 */

#include "builtin.h"



#include "perf.h"



#include "util/cache.h"

#include "util/parse-options.h"

#include "util/util.h"

#include "util/debug.h"



static const char * const config_usage[] = {

	"perf config [options]",

	NULL

};



enum actions {

	ACTION_LIST = 1

} actions;



static struct option config_options[] = {

	OPT_SET_UINT('l', "list", &actions,

		     "show current config variables", ACTION_LIST),

	OPT_END()

};



static int show_config(const char *key, const char *value,

		       void *cb __maybe_unused)

{

	if (value)

		printf("%s=%s\n", key, value);

	else

		printf("%s\n", key);



	return 0;

}



int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)

{

	int ret = 0;



	argc = parse_options(argc, argv, config_options, config_usage,

			     PARSE_OPT_STOP_AT_NON_OPTION);



	switch (actions) {

	case ACTION_LIST:

		if (argc) {

			pr_err("Error: takes no arguments\n");

			parse_options_usage(config_usage, config_options, "l", 1);

		} else {

			ret = perf_config(show_config, NULL);

			if (ret < 0)

				pr_err("Nothing configured, "

				       "please check your ~/.perfconfig file\n");

		}

		break;

	default:

		usage_with_options(config_usage, config_options);

	}



	return ret;

}

tools/perf/builtin.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ extern int cmd_annotate(int argc, const char **argv, const char *prefix); 
extern int cmd_bench(int argc, const char **argv, const char *prefix);

extern int cmd_buildid_cache(int argc, const char **argv, const char *prefix);

extern int cmd_buildid_list(int argc, const char **argv, const char *prefix);

extern int cmd_config(int argc, const char **argv, const char *prefix);

extern int cmd_diff(int argc, const char **argv, const char *prefix);

extern int cmd_evlist(int argc, const char **argv, const char *prefix);

extern int cmd_help(int argc, const char **argv, const char *prefix);

tools/perf/command-list.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ perf-buildid-cache mainporcelain common 
perf-buildid-list		mainporcelain common

perf-data			mainporcelain common

perf-diff			mainporcelain common

perf-config			mainporcelain common

perf-evlist			mainporcelain common

perf-inject			mainporcelain common

perf-kmem			mainporcelain common