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

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

perf report: Only load text symbols from kallsyms, fix 



- allow 'W' symbols too
 - Convert initializations to C99 style
 - whitespace cleanups

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20090526222155.GJ4424@ghostprotocols.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 03f6316d

Documentation/perf_counter/builtin-report.c

+18 −12
Original line number Diff line number Diff line
@@ -384,21 +384,26 @@ int hex2long(char *ptr, unsigned long *long_val) 


static int load_kallsyms(void)

{

	struct rb_node *nd, *prevnd;

	char *line = NULL;

	FILE *file;

	size_t n;



	kernel_dso = dso__new("[kernel]");

	if (kernel_dso == NULL)

		return -1;



	FILE *file = fopen("/proc/kallsyms", "r");



	file = fopen("/proc/kallsyms", "r");

	if (file == NULL)

		goto out_delete_dso;



	char *line = NULL;

	size_t n;



	while (!feof(file)) {

		unsigned long start;

		int line_len = getline(&line, &n, file);

		struct symbol *sym;

		int line_len, len;

		char symbol_type;



		line_len = getline(&line, &n, file);

		if (line_len < 0)

			break;
@@ -407,22 +412,22 @@ static int load_kallsyms(void) 


		line[--line_len] = '\0'; /* \n */



		int len = hex2long(line, &start);

		len = hex2long(line, &start);



		len++;

		if (len + 2 >= line_len)

			continue;



		char symbol_type = line[len];

		symbol_type = toupper(line[len]);

		/*

		 * We're interested only in code ('T'ext)

		 */

		if (toupper(symbol_type) != 'T')

		if (symbol_type != 'T' && symbol_type != 'W')

			continue;

		/*

		 * Well fix up the end later, when we have all sorted.

		 */

		struct symbol *sym = symbol__new(start, 0xdead, line + len + 2);

		sym = symbol__new(start, 0xdead, line + len + 2);



		if (sym == NULL)

			goto out_delete_dso;
@@ -434,7 +439,7 @@ static int load_kallsyms(void) 
	 * Now that we have all sorted out, just set the ->end of all

	 * symbols

	 */

	struct rb_node *nd, *prevnd = rb_first(&kernel_dso->syms);

	prevnd = rb_first(&kernel_dso->syms);



	if (prevnd == NULL)

		goto out_delete_line;
@@ -450,6 +455,7 @@ static int load_kallsyms(void) 
	dsos__add(kernel_dso);

	free(line);

	fclose(file);



	return 0;



out_delete_line: