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

Commit 3d1d07ec authored by John Kacur's avatar John Kacur Committed by Ingo Molnar
Browse files

perf tools: Put common histogram functions in their own file 



Move histogram related functions into their own files (hist.c and
hist.h) and make use of them in builtin-annotate.c and
builtin-report.c.

Signed-off-by: default avatarJohn Kacur <jkacur@redhat.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <alpine.LFD.2.00.0909281531180.8316@localhost.localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent dd68ada2

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ LIB_H += util/module.h 
LIB_H += util/color.h

LIB_H += util/values.h

LIB_H += util/sort.h

LIB_H += util/hist.h



LIB_OBJS += util/abspath.o

LIB_OBJS += util/alias.o
@@ -376,6 +377,7 @@ LIB_OBJS += util/trace-event-read.o 
LIB_OBJS += util/trace-event-info.o

LIB_OBJS += util/svghelper.o

LIB_OBJS += util/sort.o

LIB_OBJS += util/hist.o



BUILTIN_OBJS += builtin-annotate.o

BUILTIN_OBJS += builtin-help.o

tools/perf/builtin-annotate.c

+2 −150
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "util/parse-events.h"

#include "util/thread.h"

#include "util/sort.h"

#include "util/hist.h"



static char		const *input_name = "perf.data";
@@ -47,45 +48,6 @@ struct sym_ext { 
	char		*path;

};



/*

 * histogram, sorted on item, collects counts

 */



static struct rb_root hist;



static int64_t

hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		cmp = se->cmp(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



static int64_t

hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		int64_t (*f)(struct hist_entry *, struct hist_entry *);



		f = se->collapse ?: se->cmp;



		cmp = f(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



/*

 * collect histogram counts
@@ -163,116 +125,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, 
	return 0;

}



static void hist_entry__free(struct hist_entry *he)

{

	free(he);

}



/*

 * collapse the histogram

 */



static struct rb_root collapse_hists;



static void collapse__insert_entry(struct hist_entry *he)

{

	struct rb_node **p = &collapse_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;

	int64_t cmp;



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		cmp = hist_entry__collapse(iter, he);



		if (!cmp) {

			iter->count += he->count;

			hist_entry__free(he);

			return;

		}



		if (cmp < 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &collapse_hists);

}



static void collapse__resort(void)

{

	struct rb_node *next;

	struct hist_entry *n;



	if (!sort__need_collapse)

		return;



	next = rb_first(&hist);

	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, &hist);

		collapse__insert_entry(n);

	}

}



/*

 * reverse the map, sort on count.

 */



static struct rb_root output_hists;



static void output__insert_entry(struct hist_entry *he)

{

	struct rb_node **p = &output_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		if (he->count > iter->count)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &output_hists);

}



static void output__resort(void)

{

	struct rb_node *next;

	struct hist_entry *n;

	struct rb_root *tree = &hist;



	if (sort__need_collapse)

		tree = &collapse_hists;



	next = rb_first(tree);



	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, tree);

		output__insert_entry(n);

	}

}



static unsigned long total = 0,

		     total_mmap = 0,

		     total_comm = 0,

		     total_fork = 0,

		     total_unknown = 0;



static int

process_sample_event(event_t *event, unsigned long offset, unsigned long head)

{
@@ -861,7 +713,7 @@ static int __cmd_annotate(void) 
		dsos__fprintf(stdout);



	collapse__resort();

	output__resort();

	output__resort(total);



	find_annotations();

tools/perf/builtin-report.c

+1 −163
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "util/thread.h"

#include "util/sort.h"

#include "util/hist.h"



static char		const *input_name = "perf.data";
@@ -55,8 +56,6 @@ static int exclude_other = 1; 


static char		callchain_default_opt[] = "fractal,0.5";



static int		callchain;



static char		__cwd[PATH_MAX];

static char		*cwd = __cwd;

static int		cwdlen;
@@ -66,50 +65,8 @@ static struct thread *last_match; 


static struct perf_header *header;



static

struct callchain_param	callchain_param = {

	.mode	= CHAIN_GRAPH_REL,

	.min_percent = 0.5

};



static u64		sample_type;



static struct rb_root hist;



static int64_t

hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		cmp = se->cmp(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



static int64_t

hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		int64_t (*f)(struct hist_entry *, struct hist_entry *);



		f = se->collapse ?: se->cmp;



		cmp = f(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask)

{

	int i;
@@ -308,7 +265,6 @@ hist_entry_callchain__fprintf(FILE *fp, struct hist_entry *self, 
	return ret;

}





static size_t

hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)

{
@@ -573,117 +529,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, 
	return 0;

}



static void hist_entry__free(struct hist_entry *he)

{

	free(he);

}



/*

 * collapse the histogram

 */



static struct rb_root collapse_hists;



static void collapse__insert_entry(struct hist_entry *he)

{

	struct rb_node **p = &collapse_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;

	int64_t cmp;



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		cmp = hist_entry__collapse(iter, he);



		if (!cmp) {

			iter->count += he->count;

			hist_entry__free(he);

			return;

		}



		if (cmp < 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &collapse_hists);

}



static void collapse__resort(void)

{

	struct rb_node *next;

	struct hist_entry *n;



	if (!sort__need_collapse)

		return;



	next = rb_first(&hist);

	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, &hist);

		collapse__insert_entry(n);

	}

}



/*

 * reverse the map, sort on count.

 */



static struct rb_root output_hists;



static void output__insert_entry(struct hist_entry *he, u64 min_callchain_hits)

{

	struct rb_node **p = &output_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;



	if (callchain)

		callchain_param.sort(&he->sorted_chain, &he->callchain,

				      min_callchain_hits, &callchain_param);



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		if (he->count > iter->count)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &output_hists);

}



static void output__resort(u64 total_samples)

{

	struct rb_node *next;

	struct hist_entry *n;

	struct rb_root *tree = &hist;

	u64 min_callchain_hits;



	min_callchain_hits = total_samples * (callchain_param.min_percent / 100);



	if (sort__need_collapse)

		tree = &collapse_hists;



	next = rb_first(tree);



	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, tree);

		output__insert_entry(n, min_callchain_hits);

	}

}



static size_t output__fprintf(FILE *fp, u64 total_samples)

{

	struct hist_entry *pos;
@@ -778,13 +623,6 @@ static size_t output__fprintf(FILE *fp, u64 total_samples) 
	return ret;

}



static unsigned long total = 0,

		     total_mmap = 0,

		     total_comm = 0,

		     total_fork = 0,

		     total_unknown = 0,

		     total_lost = 0;



static int validate_chain(struct ip_callchain *chain, event_t *event)

{

	unsigned int chain_size;

tools/perf/util/hist.c

0 → 100644
+164 −0
Original line number Diff line number Diff line 
#include "hist.h"



struct rb_root hist;

struct rb_root collapse_hists;

struct rb_root output_hists;

int callchain;



struct callchain_param	callchain_param = {

	.mode	= CHAIN_GRAPH_REL,

	.min_percent = 0.5

};



unsigned long total;

unsigned long total_mmap;

unsigned long total_comm;

unsigned long total_fork;

unsigned long total_unknown;

unsigned long total_lost;



/*

 * histogram, sorted on item, collects counts

 */



int64_t

hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		cmp = se->cmp(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



int64_t

hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)

{

	struct sort_entry *se;

	int64_t cmp = 0;



	list_for_each_entry(se, &hist_entry__sort_list, list) {

		int64_t (*f)(struct hist_entry *, struct hist_entry *);



		f = se->collapse ?: se->cmp;



		cmp = f(left, right);

		if (cmp)

			break;

	}



	return cmp;

}



void hist_entry__free(struct hist_entry *he)

{

	free(he);

}



/*

 * collapse the histogram

 */



void collapse__insert_entry(struct hist_entry *he)

{

	struct rb_node **p = &collapse_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;

	int64_t cmp;



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		cmp = hist_entry__collapse(iter, he);



		if (!cmp) {

			iter->count += he->count;

			hist_entry__free(he);

			return;

		}



		if (cmp < 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &collapse_hists);

}



void collapse__resort(void)

{

	struct rb_node *next;

	struct hist_entry *n;



	if (!sort__need_collapse)

		return;



	next = rb_first(&hist);

	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, &hist);

		collapse__insert_entry(n);

	}

}



/*

 * reverse the map, sort on count.

 */



void output__insert_entry(struct hist_entry *he, u64 min_callchain_hits)

{

	struct rb_node **p = &output_hists.rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;



	if (callchain)

		callchain_param.sort(&he->sorted_chain, &he->callchain,

				      min_callchain_hits, &callchain_param);



	while (*p != NULL) {

		parent = *p;

		iter = rb_entry(parent, struct hist_entry, rb_node);



		if (he->count > iter->count)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, &output_hists);

}



void output__resort(u64 total_samples)

{

	struct rb_node *next;

	struct hist_entry *n;

	struct rb_root *tree = &hist;

	u64 min_callchain_hits;



	min_callchain_hits =

		total_samples * (callchain_param.min_percent / 100);



	if (sort__need_collapse)

		tree = &collapse_hists;



	next = rb_first(tree);



	while (next) {

		n = rb_entry(next, struct hist_entry, rb_node);

		next = rb_next(&n->rb_node);



		rb_erase(&n->rb_node, tree);

		output__insert_entry(n, min_callchain_hits);

	}

}

tools/perf/util/hist.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
#ifndef __PERF_HIST_H

#define __PERF_HIST_H

#include "../builtin.h"



#include "util.h"



#include "color.h"

#include <linux/list.h>

#include "cache.h"

#include <linux/rbtree.h>

#include "symbol.h"

#include "string.h"

#include "callchain.h"

#include "strlist.h"

#include "values.h"



#include "../perf.h"

#include "debug.h"

#include "header.h"



#include "parse-options.h"

#include "parse-events.h"



#include "thread.h"

#include "sort.h"



extern struct rb_root hist;

extern struct rb_root collapse_hists;

extern struct rb_root output_hists;

extern int callchain;

extern struct callchain_param callchain_param;

extern unsigned long total;

extern unsigned long total_mmap;

extern unsigned long total_comm;

extern unsigned long total_fork;

extern unsigned long total_unknown;

extern unsigned long total_lost;



extern int64_t hist_entry__cmp(struct hist_entry *, struct hist_entry *);

extern int64_t hist_entry__collapse(struct hist_entry *, struct hist_entry *);

extern void hist_entry__free(struct hist_entry *);

extern void collapse__insert_entry(struct hist_entry *);

extern void collapse__resort(void);

extern void output__insert_entry(struct hist_entry *, u64);

extern void output__resort(u64);



#endif	/* __PERF_HIST_H */