Move match to front (add_trace_to_tree): Break as soon as a recursive call

2006-11-22  Soren Sandmann <sandmann@daimi.au.dk>

        * profile.c (add_trace_to_tree): Move match to front
        (add_trace_to_tree): Break as soon as a recursive call is found.

        * stackstash.c (do_callback): Manual tail call optimization.
This commit is contained in:
Soren Sandmann
2006-11-22 07:06:04 +00:00
committed by Søren Sandmann Pedersen
parent d1a082ffec
commit d3c0e7be5c
4 changed files with 42 additions and 17 deletions

View File

@ -1,3 +1,10 @@
2006-11-22 Soren Sandmann <sandmann@daimi.au.dk>
* profile.c (add_trace_to_tree): Move match to front
(add_trace_to_tree): Break as soon as a recursive call is found.
* stackstash.c (do_callback): Manual tail call optimization.
2006-11-20 Soren Sandmann <sandmann@daimi.au.dk> 2006-11-20 Soren Sandmann <sandmann@daimi.au.dk>
* sysprof.c (ensure_profile): reset the collector after generating * sysprof.c (ensure_profile): reset the collector after generating

View File

@ -156,9 +156,9 @@ on_read (gpointer data)
#if 0 #if 0
{ {
int i; int i;
g_print ("pid: %d (%d)\n", trace.pid, trace.n_addresses); g_print ("pid: %d (%d)\n", trace->pid, trace->n_addresses);
for (i=0; i < trace.n_addresses; ++i) for (i=0; i < trace->n_addresses; ++i)
g_print ("rd: %08x\n", trace.addresses[i]); g_print ("rd: %08x\n", trace->addresses[i]);
g_print ("-=-\n"); g_print ("-=-\n");
} }
#endif #endif

View File

@ -265,11 +265,21 @@ add_trace_to_tree (GList *trace, gint size, gpointer data)
{ {
gpointer address = list->data; gpointer address = list->data;
ProfileDescendant *match = NULL; ProfileDescendant *match = NULL;
ProfileDescendant *prev = NULL;
for (match = *tree; match != NULL; match = match->siblings) for (match = *tree; match != NULL; prev = match, match = match->siblings)
{ {
if (match->name == address) if (match->name == address)
{
if (prev)
{
/* Move to front */
prev->siblings = match->siblings;
match->siblings = *tree;
*tree = match;
}
break; break;
}
} }
if (!match) if (!match)
@ -282,7 +292,10 @@ add_trace_to_tree (GList *trace, gint size, gpointer data)
for (n = parent; n != NULL; n = n->parent) for (n = parent; n != NULL; n = n->parent)
{ {
if (n->name == address) if (n->name == address)
{
seen_tree_node = n; seen_tree_node = n;
break;
}
} }
if (seen_tree_node) if (seen_tree_node)

View File

@ -204,21 +204,26 @@ do_callback (StackNode *node,
{ {
GList link; GList link;
if (!node)
return;
if (trace) if (trace)
trace->prev = &link; trace->prev = &link;
link.next = trace; link.next = trace;
link.data = node->address;
link.prev = NULL; link.prev = NULL;
if (node->size) while (node)
func (&link, node->size, data); {
link.data = node->address;
do_callback (node->children, &link, func, data); if (node->size)
do_callback (node->siblings, trace, func, data); func (&link, node->size, data);
do_callback (node->children, &link, func, data);
node = node->siblings;
}
if (trace)
trace->prev = NULL;
} }
void void