fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-15 18:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nest copying and merging of flags to avoid repeated traversals

Browse source 
When merging the flags from all the packages together, each flags list
was being copied and then concatenated to then end of the combined list.
This was extremely inefficient because it caused the combined list to be
traversed multiple times to find the end. Instead, nest the copying and
merging of the flags together so the last element is always tracked and
can easily be appended to.

Freedesktop #54716 (https://bugs.freedesktop.org/show_bug.cgi?id=54716)
This commit is contained in:
Dan Nicholson 2012-10-29 17:30:18 -07:00
parent 3aa62167be
commit 90e0ec0f6f
1 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
pkg.c
View file

@ -612,16 +612,6 @@ packages_sort_by_path_position (GSList *list)
return g_slist_sort (list, pathposcmp);
}
static void
fill_one_level (Package *pkg, GetListFunc func, GSList **listp)
{
GSList *copy;
copy = g_slist_copy ((*func)(pkg));
*listp = g_slist_concat (*listp, copy);
}
static void
recursive_fill_list (Package *pkg, GetListFunc func, GSList **listp)
{
@ -657,6 +647,38 @@ recursive_fill_list (Package *pkg, GetListFunc func, GSList **listp)
chain = g_slist_remove (chain, pkg);
}
/* merge the flags from the individual packages */
static void
merge_flag_lists (GSList *packages, GetListFunc func, GSList **listp)
{
GSList *pkg;
GSList *last = NULL;
GSList *flags;
for (pkg = packages; pkg != NULL; pkg = pkg->next)
{
/* manually copy the elements so we can keep track of the end */
for (flags = (*func) (pkg->data); flags != NULL; flags = flags->next)
{
if (last == NULL)
{
*listp = g_slist_alloc ();
last = *listp;
}
else
{
last->next = g_slist_alloc ();
last = last->next;
}
last->data = flags->data;
}
}
/* terminate the last element */
if (last != NULL)
last->next = NULL;
}
static void
fill_list (GSList *packages, GetListFunc func,
GSList **listp, gboolean in_path_order, gboolean include_private)
@ -683,14 +705,8 @@ fill_list (GSList *packages, GetListFunc func,
spew_package_list ("sorted", expanded);
}
tmp = expanded;
while (tmp != NULL)
{
fill_one_level (tmp->data, func, listp);
tmp = tmp->next;
}
merge_flag_lists (expanded, func, listp);
g_slist_free (expanded);
}