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

Commit d18929e9 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:

User visible changes:

  - Change default selection TUI background color to yellow (Ingo Molnar)

Infrastructure changes:

  - Start paving the way to reuse some cmdline functions with other tools/
    living utilities (Josh Poimboeuf)

  - Reference count fixes using the refcount debugger, unleaking some objects
    (Masami Hiramatsu)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a30c99a0 0a4bb5da

tools/perf/Build

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ perf-y += builtin-kvm.o 
perf-y += builtin-inject.o

perf-y += builtin-mem.o

perf-y += builtin-data.o

perf-y += builtin-version.o



perf-$(CONFIG_AUDIT) += builtin-trace.o

perf-$(CONFIG_LIBELF) += builtin-probe.o

tools/perf/builtin-stat.c

+9 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,14 @@ static int perf_stat_init_aggr_mode(void) 
	return cpus_aggr_map ? 0 : -ENOMEM;

}



static void perf_stat__exit_aggr_mode(void)

{

	cpu_map__put(aggr_map);

	cpu_map__put(cpus_aggr_map);

	aggr_map = NULL;

	cpus_aggr_map = NULL;

}



/*

 * Add default attributes, if there were no attributes specified or

 * if -d/--detailed, -d -d or -d -d -d is used:
@@ -1442,6 +1450,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (!forever && status != -1 && !interval)

		print_counters(NULL, argc, argv);



	perf_stat__exit_aggr_mode();

	perf_evlist__free_stats(evsel_list);

out:

	perf_evlist__delete(evsel_list);

tools/perf/builtin-version.c

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#include "util/util.h"

#include "builtin.h"

#include "perf.h"



int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,

		const char *prefix __maybe_unused)

{

	printf("perf version %s\n", perf_version_string);

	return 0;

}

tools/perf/perf.c

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 
		use_pager = 1;

	commit_pager_choice();



	perf_env__set_cmdline(&perf_env, argc, argv);

	status = p->fn(argc, argv, prefix);

	exit_browser(status);

	perf_env__exit(&perf_env);

tools/perf/ui/browser.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static struct ui_browser_colorset { 
		.colorset = HE_COLORSET_SELECTED,

		.name	  = "selected",

		.fg	  = "black",

		.bg	  = "lightgray",

		.bg	  = "yellow",

	},

	{

		.colorset = HE_COLORSET_CODE,