Use callbacks from stackstash.

Sat Nov  5 18:06:40 2005  Soeren Sandmann  <sandmann@redhat.com>

        * profile.c (profile_create_descendants): Use callbacks from
        stackstash.

        * stackstash.c (stack_node_foreach_trace): New function
        * stackstash.c (do_node_callback): New function
This commit is contained in:
Soeren Sandmann
2005-11-05 22:57:09 +00:00
committed by Søren Sandmann Pedersen
parent 1f5b6ff38c
commit c0aed2a4de
4 changed files with 59 additions and 29 deletions

View File

@ -1,3 +1,11 @@
Sat Nov 5 18:06:40 2005 Soeren Sandmann <sandmann@redhat.com>
* profile.c (profile_create_descendants): Use callbacks from
stackstash.
* stackstash.c (stack_node_foreach_trace): New function
* stackstash.c (do_node_callback): New function
Sat Nov 5 12:39:33 2005 Soeren Sandmann <sandmann@redhat.com>
* profile.c (add_trace_to_tree): Don't compute the total field.

View File

@ -243,18 +243,22 @@ profile_new (StackStash *stash)
}
static void
add_trace_to_tree (ProfileDescendant **tree, GList *trace, guint size)
add_trace_to_tree (GSList *trace, gpointer data)
{
GList *list;
GSList *list;
GPtrArray *nodes_to_unmark = g_ptr_array_new ();
ProfileDescendant *parent = NULL;
int i, len;
ProfileDescendant **tree = data;
guint size = ((StackNode *)trace->data)->size;
trace = g_slist_reverse (g_slist_copy (trace));
for (list = trace; list != NULL; list = list->next)
{
StackNode *node = list->data;
ProfileDescendant *match = NULL;
update();
for (match = *tree; match != NULL; match = match->siblings)
@ -329,20 +333,7 @@ add_trace_to_tree (ProfileDescendant **tree, GList *trace, guint size)
}
g_ptr_array_free (nodes_to_unmark, TRUE);
}
static void
add_leaf_to_tree (ProfileDescendant **tree, StackNode *leaf, StackNode *top)
{
GList *trace = NULL;
StackNode *node;
for (node = leaf; node != top->parent; node = node->parent)
trace = g_list_prepend (trace, node);
add_trace_to_tree (tree, trace, leaf->size);
g_list_free (trace);
g_slist_free (trace);
}
ProfileDescendant *
@ -356,17 +347,7 @@ profile_create_descendants (Profile *profile,
while (node)
{
if (node->toplevel)
{
GList *leaves = NULL;
GList *list;
stack_node_list_leaves (node, &leaves);
for (list = leaves; list != NULL; list = list->next)
add_leaf_to_tree (&tree, list->data, node);
g_list_free (leaves);
}
stack_node_foreach_trace (node, add_trace_to_tree, &tree);
node = node->next;
}

View File

@ -155,6 +155,42 @@ stack_stash_foreach (StackStash *stash,
do_callback (stash->root, NULL, stack_func, data);
}
static void
do_node_callback (StackNode *node, const GSList *trace,
StackTraceFunction func,
gpointer data)
{
GSList link;
if (!node)
return;
link.next = (GSList *)trace;
link.data = node;
if (node->size)
func (&link, data);
do_node_callback (node->children, &link, func, data);
do_node_callback (node->siblings, trace, func, data);
}
void
stack_node_foreach_trace (StackNode *node,
StackTraceFunction func,
gpointer data)
{
GSList link;
link.next = NULL;
link.data = node;
if (node->size)
func (&link, data);
do_node_callback (node->children, &link, func, data);
}
static void
stack_node_free (StackNode *node)
{

View File

@ -59,6 +59,11 @@ StackNode *stack_stash_find_node (StackStash *stash,
/* FIXME: should probably return a list */
void stack_node_list_leaves (StackNode *node,
GList **leaves);
typedef void (* StackTraceFunction) (GSList *trace, gpointer data);
void stack_node_foreach_trace (StackNode *node,
StackTraceFunction func,
gpointer data);
typedef void (* StackNodeFunc) (StackNode *node,
gpointer data);
void stack_stash_foreach_by_address (StackStash *stash,