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

Commit 4a58e611 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Move the map class definition to a separate header 



And this resulted in the need for adding some missing includes
in some places that were getting the definitions needed out of
sheer luck.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1261957026-15580-4-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 06aae590

tools/perf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ LIB_H += util/event.h 
LIB_H += util/exec_cmd.h

LIB_H += util/types.h

LIB_H += util/levenshtein.h

LIB_H += util/map.h

LIB_H += util/parse-options.h

LIB_H += util/parse-events.h

LIB_H += util/quote.h

tools/perf/util/debug.c

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

#include "event.h"

#include "debug.h"

#include "util.h"



int verbose = 0;

int dump_trace = 0;

tools/perf/util/event.h

+3 −62
Original line number Diff line number Diff line 
#ifndef __PERF_RECORD_H

#define __PERF_RECORD_H



#include <limits.h>



#include "../perf.h"

#include "util.h"

#include <linux/list.h>

#include <linux/rbtree.h>

#include "map.h"



/*

 * PERF_SAMPLE_IP | PERF_SAMPLE_TID | *
@@ -101,67 +101,8 @@ struct events_stats { 


void event__print_totals(void);



enum map_type {

	MAP__FUNCTION = 0,

	MAP__VARIABLE,

};



#define MAP__NR_TYPES (MAP__VARIABLE + 1)



struct map {

	union {

		struct rb_node	rb_node;

		struct list_head node;

	};

	u64			start;

	u64			end;

	enum map_type		type;

	u64			pgoff;

	u64			(*map_ip)(struct map *, u64);

	u64			(*unmap_ip)(struct map *, u64);

	struct dso		*dso;

};



static inline u64 map__map_ip(struct map *map, u64 ip)

{

	return ip - map->start + map->pgoff;

}



static inline u64 map__unmap_ip(struct map *map, u64 ip)

{

	return ip + map->start - map->pgoff;

}



static inline u64 identity__map_ip(struct map *map __used, u64 ip)

{

	return ip;

}



struct symbol;



typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);



void map__init(struct map *self, enum map_type type,

	       u64 start, u64 end, u64 pgoff, struct dso *dso);

struct map *map__new(struct mmap_event *event, enum map_type,

		     char *cwd, int cwdlen);

void map__delete(struct map *self);

struct map *map__clone(struct map *self);

int map__overlap(struct map *l, struct map *r);

size_t map__fprintf(struct map *self, FILE *fp);



struct perf_session;



int map__load(struct map *self, struct perf_session *session,

	      symbol_filter_t filter);

struct symbol *map__find_symbol(struct map *self, struct perf_session *session,

				u64 addr, symbol_filter_t filter);

struct symbol *map__find_symbol_by_name(struct map *self, const char *name,

					struct perf_session *session,

					symbol_filter_t filter);

void map__fixup_start(struct map *self);

void map__fixup_end(struct map *self);



int event__synthesize_thread(pid_t pid,

			     int (*process)(event_t *event,

					    struct perf_session *session),

tools/perf/util/map.h

0 → 100644
+73 −0
Original line number Diff line number Diff line 
#ifndef __PERF_MAP_H

#define __PERF_MAP_H



#include <linux/compiler.h>

#include <linux/list.h>

#include <linux/rbtree.h>

#include <linux/types.h>



enum map_type {

	MAP__FUNCTION = 0,

	MAP__VARIABLE,

};



#define MAP__NR_TYPES (MAP__VARIABLE + 1)



struct dso;



struct map {

	union {

		struct rb_node	rb_node;

		struct list_head node;

	};

	u64			start;

	u64			end;

	enum map_type		type;

	u64			pgoff;

	u64			(*map_ip)(struct map *, u64);

	u64			(*unmap_ip)(struct map *, u64);

	struct dso		*dso;

};



static inline u64 map__map_ip(struct map *map, u64 ip)

{

	return ip - map->start + map->pgoff;

}



static inline u64 map__unmap_ip(struct map *map, u64 ip)

{

	return ip + map->start - map->pgoff;

}



static inline u64 identity__map_ip(struct map *map __used, u64 ip)

{

	return ip;

}



struct symbol;

struct mmap_event;



typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);



void map__init(struct map *self, enum map_type type,

	       u64 start, u64 end, u64 pgoff, struct dso *dso);

struct map *map__new(struct mmap_event *event, enum map_type,

		     char *cwd, int cwdlen);

void map__delete(struct map *self);

struct map *map__clone(struct map *self);

int map__overlap(struct map *l, struct map *r);

size_t map__fprintf(struct map *self, FILE *fp);



struct perf_session;



int map__load(struct map *self, struct perf_session *session,

	      symbol_filter_t filter);

struct symbol *map__find_symbol(struct map *self, struct perf_session *session,

				u64 addr, symbol_filter_t filter);

struct symbol *map__find_symbol_by_name(struct map *self, const char *name,

					struct perf_session *session,

					symbol_filter_t filter);

void map__fixup_start(struct map *self);

void map__fixup_end(struct map *self);



#endif /* __PERF_MAP_H */

tools/perf/util/probe-finder.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _PROBE_FINDER_H

#define _PROBE_FINDER_H



#include "util.h"



#define MAX_PATH_LEN		 256

#define MAX_PROBE_BUFFER	1024

#define MAX_PROBES		 128