Skip to content

lib/pkgdb: cache virtual package lookups in generate_full_revdeps_tree #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Duncaen wants to merge 1 commit into from
Closed

lib/pkgdb: cache virtual package lookups in generate_full_revdeps_tree #624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions lib/pkgdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,17 @@ generate_full_revdeps_tree(struct xbps_handle *xhp)
{
xbps_object_t obj;
xbps_object_iterator_t iter;
xbps_dictionary_t vpkg_cache;

if (xhp->pkgdb_revdeps)
return;

xhp->pkgdb_revdeps = xbps_dictionary_create();
assert(xhp->pkgdb_revdeps);

vpkg_cache = xbps_dictionary_create();
assert(vpkg_cache);

iter = xbps_dictionary_iterator(xhp->pkgdb);
assert(iter);

Expand All @@ -421,20 +425,33 @@ generate_full_revdeps_tree(struct xbps_handle *xhp)
xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
for (unsigned int i = 0; i < xbps_array_count(rundeps); i++) {
xbps_array_t pkg;
const char *pkgdep = NULL, *vpkgname = NULL;
char *v, curpkgname[XBPS_NAME_SIZE];
const char *pkgdep = NULL, *v;
char curpkgname[XBPS_NAME_SIZE];
bool alloc = false;

xbps_array_get_cstring_nocopy(rundeps, i, &pkgdep);
if ((!xbps_pkgpattern_name(curpkgname, sizeof(curpkgname), pkgdep)) &&
(!xbps_pkg_name(curpkgname, sizeof(curpkgname), pkgdep))) {
abort();
}
vpkgname = vpkg_user_conf(xhp, curpkgname, false);
if (vpkgname == NULL) {
v = strdup(curpkgname);
} else {
v = strdup(vpkgname);

/* TODO: this is kind of a workaround, to avoid calling vpkg_user_conf
* over and over again for the same packages which is slow. A better
* solution for itself vpkg_user_conf being slow should probably be
* implemented at some point.
*/
if (!xbps_dictionary_get_cstring_nocopy(vpkg_cache, curpkgname, &v)) {
const char *vpkgname = vpkg_user_conf(xhp, curpkgname, false);
if (vpkgname) {
v = vpkgname;
} else {
v = curpkgname;
}
errno = 0;
if (!xbps_dictionary_set_cstring_nocopy(vpkg_cache, curpkgname, v)) {
xbps_error_printf("%s\n", strerror(errno ? errno : ENOMEM));
abort();
}
}

pkg = xbps_dictionary_get(xhp->pkgdb_revdeps, v);
Expand All @@ -446,12 +463,12 @@ generate_full_revdeps_tree(struct xbps_handle *xhp)
xbps_array_add_cstring_nocopy(pkg, pkgver);
xbps_dictionary_set(xhp->pkgdb_revdeps, v, pkg);
}
free(v);
if (alloc)
xbps_object_release(pkg);
}
}
xbps_object_iterator_release(iter);
xbps_object_release(vpkg_cache);
}

xbps_array_t
Expand Down