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

Commit c506c96b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools lib symbol: Start carving out symbol parsing routines from perf 

Eventually this should be useful to other tools/ living utilities.

For now don't try to build any .a, just trying the minimal approach of
separating existing code into multiple .c files that can then be
included wherever they are needed, using whatever build machinery
already in place.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-pfa8i5zpf4bf9rcccryi0lt3@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c7f2e3cd

tools/lib/symbol/kallsyms.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
#include "symbol/kallsyms.h"

#include <stdio.h>

#include <stdlib.h>



int kallsyms__parse(const char *filename, void *arg,

		    int (*process_symbol)(void *arg, const char *name,

					  char type, u64 start))

{

	char *line = NULL;

	size_t n;

	int err = -1;

	FILE *file = fopen(filename, "r");



	if (file == NULL)

		goto out_failure;



	err = 0;



	while (!feof(file)) {

		u64 start;

		int line_len, len;

		char symbol_type;

		char *symbol_name;



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

		if (line_len < 0 || !line)

			break;



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



		len = hex2u64(line, &start);



		len++;

		if (len + 2 >= line_len)

			continue;



		symbol_type = line[len];

		len += 2;

		symbol_name = line + len;

		len = line_len - len;



		if (len >= KSYM_NAME_LEN) {

			err = -1;

			break;

		}



		err = process_symbol(arg, symbol_name, symbol_type, start);

		if (err)

			break;

	}



	free(line);

	fclose(file);

	return err;



out_failure:

	return -1;

}

tools/lib/symbol/kallsyms.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#ifndef __TOOLS_KALLSYMS_H_

#define __TOOLS_KALLSYMS_H_ 1



#include <elf.h>

#include <linux/ctype.h>

#include <linux/types.h>



#ifndef KSYM_NAME_LEN

#define KSYM_NAME_LEN 256

#endif



static inline u8 kallsyms2elf_type(char type)

{

	if (type == 'W')

		return STB_WEAK;



	return isupper(type) ? STB_GLOBAL : STB_LOCAL;

}



int kallsyms__parse(const char *filename, void *arg,

		    int (*process_symbol)(void *arg, const char *name,

					  char type, u64 start));



#endif /* __TOOLS_KALLSYMS_H_ */

tools/perf/MANIFEST

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ tools/perf 
tools/scripts

tools/lib/traceevent

tools/lib/lk

tools/lib/symbol/kallsyms.c

tools/lib/symbol/kallsyms.h

include/linux/const.h

include/linux/perf_event.h

include/linux/rbtree.h

tools/perf/Makefile.perf

+5 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c 


LIB_FILE=$(OUTPUT)libperf.a



LIB_H += ../lib/symbol/kallsyms.h

LIB_H += ../../include/uapi/linux/perf_event.h

LIB_H += ../../include/linux/rbtree.h

LIB_H += ../../include/linux/list.h
@@ -312,6 +313,7 @@ LIB_OBJS += $(OUTPUT)util/evlist.o 
LIB_OBJS += $(OUTPUT)util/evsel.o

LIB_OBJS += $(OUTPUT)util/exec_cmd.o

LIB_OBJS += $(OUTPUT)util/help.o

LIB_OBJS += $(OUTPUT)util/kallsyms.o

LIB_OBJS += $(OUTPUT)util/levenshtein.o

LIB_OBJS += $(OUTPUT)util/parse-options.o

LIB_OBJS += $(OUTPUT)util/parse-events.o
@@ -672,6 +674,9 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)ui/browsers/scripts.o: ui/browsers/scripts.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $<



$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<

tools/perf/util/event.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "strlist.h"

#include "thread.h"

#include "thread_map.h"

#include "symbol/kallsyms.h"



static const char *perf_event__names[] = {

	[0]					= "TOTAL",