perf callchain: Rename cumul_hits into callchain_cumul_hits (f08c3154) · Commits · 戴 / test

tools/perf/util/callchain.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -38,14 +38,14 @@ rb_insert_callchain(struct rb_root root, struct callchain_node chain,
	struct rb_node **p = &root->rb_node;		struct rb_node **p = &root->rb_node;
	struct rb_node *parent = NULL;		struct rb_node *parent = NULL;
	struct callchain_node *rnode;		struct callchain_node *rnode;
	u64 chain_cumul = cumul_hits(chain);		u64 chain_cumul = callchain_cumul_hits(chain);

	while (*p) {		while (*p) {
	u64 rnode_cumul;		u64 rnode_cumul;

	parent = *p;		parent = *p;
	rnode = rb_entry(parent, struct callchain_node, rb_node);		rnode = rb_entry(parent, struct callchain_node, rb_node);
	rnode_cumul = cumul_hits(rnode);		rnode_cumul = callchain_cumul_hits(rnode);

	switch (mode) {		switch (mode) {
	case CHAIN_FLAT:		case CHAIN_FLAT:
	@@ -104,7 +104,7 @@ static void __sort_chain_graph_abs(struct callchain_node *node,

	chain_for_each_child(child, node) {		chain_for_each_child(child, node) {
	__sort_chain_graph_abs(child, min_hit);		__sort_chain_graph_abs(child, min_hit);
	if (cumul_hits(child) >= min_hit)		if (callchain_cumul_hits(child) >= min_hit)
	rb_insert_callchain(&node->rb_root, child,		rb_insert_callchain(&node->rb_root, child,
	CHAIN_GRAPH_ABS);		CHAIN_GRAPH_ABS);
	}		}
	@@ -129,7 +129,7 @@ static void __sort_chain_graph_rel(struct callchain_node *node,

	chain_for_each_child(child, node) {		chain_for_each_child(child, node) {
	__sort_chain_graph_rel(child, min_percent);		__sort_chain_graph_rel(child, min_percent);
	if (cumul_hits(child) >= min_hit)		if (callchain_cumul_hits(child) >= min_hit)
	rb_insert_callchain(&node->rb_root, child,		rb_insert_callchain(&node->rb_root, child,
	CHAIN_GRAPH_REL);		CHAIN_GRAPH_REL);
	}		}
	@@ -270,7 +270,7 @@ split_add_child(struct callchain_node *parent,
	/* split the hits */		/* split the hits */
	new->hit = parent->hit;		new->hit = parent->hit;
	new->children_hit = parent->children_hit;		new->children_hit = parent->children_hit;
	parent->children_hit = cumul_hits(new);		parent->children_hit = callchain_cumul_hits(new);
	new->val_nr = parent->val_nr - idx_local;		new->val_nr = parent->val_nr - idx_local;
	parent->val_nr = idx_local;		parent->val_nr = idx_local;

tools/perf/util/callchain.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ static inline void callchain_init(struct callchain_root *root)
	root->max_depth = 0;		root->max_depth = 0;
	}		}

	static inline u64 cumul_hits(struct callchain_node *node)		static inline u64 callchain_cumul_hits(struct callchain_node *node)
	{		{
	return node->hit + node->children_hit;		return node->hit + node->children_hit;
	}		}

tools/perf/util/hist.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -430,7 +430,7 @@ static size_t __callchain__fprintf_graph(FILE fp, struct callchain_node self,
	u64 cumul;		u64 cumul;

	child = rb_entry(node, struct callchain_node, rb_node);		child = rb_entry(node, struct callchain_node, rb_node);
	cumul = cumul_hits(child);		cumul = callchain_cumul_hits(child);
	remaining -= cumul;		remaining -= cumul;

	/*		/*

tools/perf/util/ui/browsers/hists.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -377,7 +377,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *self,
	while (node) {		while (node) {
	struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);		struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
	struct rb_node *next = rb_next(node);		struct rb_node *next = rb_next(node);
	u64 cumul = cumul_hits(child);		u64 cumul = callchain_cumul_hits(child);
	struct callchain_list *chain;		struct callchain_list *chain;
	char folded_sign = ' ';		char folded_sign = ' ';
	int first = true;		int first = true;

Admin message