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

Commit bc4b473f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

parents 3ca50496 1c6a800c

tools/perf/Documentation/perf-test.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
perf-test(1)

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



NAME

----

perf-test - Runs sanity tests.



SYNOPSIS

--------

[verse]

'perf test <options>'



DESCRIPTION

-----------

This command does assorted sanity tests, initially thru linked routines but

also will look for a directory with more tests in the form of scripts.



OPTIONS

-------

-v::

--verbose::

	Be more verbose.

tools/perf/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ ifeq ($(ARCH),x86_64) 
        ARCH := x86

endif



$(shell sh -c 'mkdir -p $(OUTPUT)arch/$(ARCH)/util/' 2> /dev/null)



# CFLAGS and LDFLAGS are for the users to override from the command line.



#
@@ -488,6 +490,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-probe.o 
BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o

BUILTIN_OBJS += $(OUTPUT)builtin-lock.o

BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o

BUILTIN_OBJS += $(OUTPUT)builtin-test.o



PERFLIBS = $(LIB_FILE)

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int __cmd_annotate(void) 
		perf_session__fprintf(session, stdout);



	if (verbose > 2)

		dsos__fprintf(&session->kerninfo_root, stdout);

		perf_session__fprintf_dsos(session, stdout);



	perf_session__collapse_resort(&session->hists);

	perf_session__output_resort(&session->hists, session->event_total[0]);

tools/perf/builtin-buildid-list.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int __cmd_buildid_list(void) 
	if (with_hits)

		perf_session__process_events(session, &build_id__mark_dso_hit_ops);



	dsos__fprintf_buildid(&session->kerninfo_root, stdout, with_hits);

	perf_session__fprintf_dsos_buildid(session, stdout, with_hits);



	perf_session__delete(session);

	return err;

tools/perf/builtin-kmem.c

+4 −6
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void __print_result(struct rb_root *root, struct perf_session *session, 
			   int n_lines, int is_caller)

{

	struct rb_node *next;

	struct kernel_info *kerninfo;

	struct machine *machine;



	printf("%.102s\n", graph_dotted_line);

	printf(" %-34s |",  is_caller ? "Callsite": "Alloc Ptr");
@@ -361,8 +361,8 @@ static void __print_result(struct rb_root *root, struct perf_session *session, 


	next = rb_first(root);



	kerninfo = kerninfo__findhost(&session->kerninfo_root);

	if (!kerninfo) {

	machine = perf_session__find_host_machine(session);

	if (!machine) {

		pr_err("__print_result: couldn't find kernel information\n");

		return;

	}
@@ -370,7 +370,6 @@ static void __print_result(struct rb_root *root, struct perf_session *session, 
		struct alloc_stat *data = rb_entry(next, struct alloc_stat,

						   node);

		struct symbol *sym = NULL;

		struct map_groups *kmaps = &kerninfo->kmaps;

		struct map *map;

		char buf[BUFSIZ];

		u64 addr;
@@ -378,8 +377,7 @@ static void __print_result(struct rb_root *root, struct perf_session *session, 
		if (is_caller) {

			addr = data->call_site;

			if (!raw_ip)

				sym = map_groups__find_function(kmaps, addr,

								&map, NULL);

				sym = machine__find_kernel_function(machine, addr, &map, NULL);

		} else

			addr = data->ptr;