06c9891ae3
This commit implements multiple performance improvements to the transaction code: - Don't process xbps_pkg_name() N times each time we access its package dictionary (via pkgdb or rpool), just do it once at xbps_pkgdb_init() time. At pkgdb init time, it just creates a property in pkgdb, "pkgname". At rpool time, each time a package is accessed, the "pkgname" string property is added. - The package transaction dictionary contains the "transaction" object to know what's the pkg type. This has been changed to an uint8, this simplifies the logic and it's faster than checking a string object. See xbps_trans_type_t and xbps_transaction_pkg_type(). - Fixed the issue that was marked with XXX in transaction shlibs checking code. This has been fixed and improved and resources are now just freed as expected. - Simplified random code all over the place, avoiding unnecessary allocations or operations. - Rename some transaction files to have a better description. This is my first rototill to the code in 2020.
346 lines
8.0 KiB
C
346 lines
8.0 KiB
C
/*-
|
|
* Copyright (c) 2008-2016 Juan Romero Pardines.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <dirent.h>
|
|
#include <pthread.h>
|
|
|
|
#include "xbps_api_impl.h"
|
|
|
|
static xbps_dictionary_t
|
|
get_pkg_in_array(xbps_array_t array, const char *str, xbps_trans_type_t tt, bool virtual)
|
|
{
|
|
xbps_object_t obj;
|
|
xbps_object_iterator_t iter;
|
|
xbps_trans_type_t ttype;
|
|
bool found = false;
|
|
|
|
assert(array);
|
|
assert(str);
|
|
|
|
iter = xbps_array_iterator(array);
|
|
if (!iter)
|
|
return NULL;
|
|
|
|
while ((obj = xbps_object_iterator_next(iter))) {
|
|
const char *pkgver = NULL, *pkgname = NULL;
|
|
|
|
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver)) {
|
|
continue;
|
|
}
|
|
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname)) {
|
|
break;
|
|
}
|
|
if (virtual) {
|
|
/*
|
|
* Check if package pattern matches
|
|
* any virtual package version in dictionary.
|
|
*/
|
|
found = xbps_match_virtual_pkg_in_dict(obj, str);
|
|
if (found)
|
|
break;
|
|
} else if (xbps_pkgpattern_version(str)) {
|
|
/* match by pattern against pkgver */
|
|
if (xbps_pkgpattern_match(pkgver, str)) {
|
|
found = true;
|
|
break;
|
|
}
|
|
} else if (xbps_pkg_version(str)) {
|
|
/* match by exact pkgver */
|
|
if (strcmp(str, pkgver) == 0) {
|
|
found = true;
|
|
break;
|
|
}
|
|
} else {
|
|
/* match by pkgname */
|
|
if (strcmp(pkgname, str) == 0) {
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
xbps_object_iterator_release(iter);
|
|
|
|
ttype = xbps_transaction_pkg_type(obj);
|
|
if (found && tt && (ttype != tt)) {
|
|
found = false;
|
|
}
|
|
if (!found) {
|
|
errno = ENOENT;
|
|
return NULL;
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
xbps_dictionary_t HIDDEN
|
|
xbps_find_pkg_in_array(xbps_array_t a, const char *s, xbps_trans_type_t tt)
|
|
{
|
|
assert(xbps_object_type(a) == XBPS_TYPE_ARRAY);
|
|
assert(s);
|
|
|
|
return get_pkg_in_array(a, s, tt, false);
|
|
}
|
|
|
|
xbps_dictionary_t HIDDEN
|
|
xbps_find_virtualpkg_in_array(struct xbps_handle *x,
|
|
xbps_array_t a,
|
|
const char *s,
|
|
xbps_trans_type_t tt)
|
|
{
|
|
xbps_dictionary_t pkgd;
|
|
const char *vpkg;
|
|
|
|
assert(x);
|
|
assert(xbps_object_type(a) == XBPS_TYPE_ARRAY);
|
|
assert(s);
|
|
|
|
if ((vpkg = vpkg_user_conf(x, s, false))) {
|
|
if ((pkgd = get_pkg_in_array(a, vpkg, tt, true)))
|
|
return pkgd;
|
|
}
|
|
|
|
return get_pkg_in_array(a, s, tt, true);
|
|
}
|
|
|
|
static xbps_dictionary_t
|
|
match_pkg_by_pkgver(xbps_dictionary_t repod, const char *p)
|
|
{
|
|
xbps_dictionary_t d = NULL;
|
|
const char *pkgver = NULL;
|
|
char pkgname[XBPS_NAME_SIZE] = {0};
|
|
|
|
assert(repod);
|
|
assert(p);
|
|
|
|
/* exact match by pkgver */
|
|
if (!xbps_pkg_name(pkgname, sizeof(pkgname), p))
|
|
return NULL;
|
|
|
|
d = xbps_dictionary_get(repod, pkgname);
|
|
if (d) {
|
|
xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
|
|
if (strcmp(pkgver, p)) {
|
|
d = NULL;
|
|
errno = ENOENT;
|
|
}
|
|
}
|
|
|
|
return d;
|
|
}
|
|
|
|
static xbps_dictionary_t
|
|
match_pkg_by_pattern(xbps_dictionary_t repod, const char *p)
|
|
{
|
|
xbps_dictionary_t d = NULL;
|
|
const char *pkgver = NULL;
|
|
char pkgname[XBPS_NAME_SIZE] = {0};
|
|
|
|
assert(repod);
|
|
assert(p);
|
|
|
|
/* match by pkgpattern in pkgver */
|
|
if (!xbps_pkgpattern_name(pkgname, sizeof(pkgname), p)) {
|
|
if (xbps_pkg_name(pkgname, sizeof(pkgname), p)) {
|
|
return match_pkg_by_pkgver(repod, p);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
d = xbps_dictionary_get(repod, pkgname);
|
|
if (d) {
|
|
xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
|
|
assert(pkgver);
|
|
if (!xbps_pkgpattern_match(pkgver, p)) {
|
|
d = NULL;
|
|
errno = ENOENT;
|
|
}
|
|
}
|
|
|
|
return d;
|
|
}
|
|
|
|
const char HIDDEN *
|
|
vpkg_user_conf(struct xbps_handle *xhp, const char *vpkg, bool only_conf)
|
|
{
|
|
xbps_dictionary_t d;
|
|
xbps_object_t obj;
|
|
xbps_object_iterator_t iter;
|
|
const char *pkg = NULL;
|
|
bool found = false;
|
|
|
|
assert(xhp);
|
|
assert(vpkg);
|
|
|
|
if (only_conf) {
|
|
d = xhp->vpkgd_conf;
|
|
} else {
|
|
d = xhp->vpkgd;
|
|
/* init pkgdb just in case to detect vpkgs */
|
|
(void)xbps_pkgdb_init(xhp);
|
|
}
|
|
|
|
if (d == NULL)
|
|
return NULL;
|
|
|
|
iter = xbps_dictionary_iterator(d);
|
|
assert(iter);
|
|
|
|
while ((obj = xbps_object_iterator_next(iter))) {
|
|
xbps_string_t rpkg;
|
|
char buf[XBPS_NAME_SIZE] = {0};
|
|
char *vpkgver = NULL;
|
|
const char *vpkgname = NULL, *vpkg_conf = NULL;
|
|
|
|
vpkg_conf = xbps_dictionary_keysym_cstring_nocopy(obj);
|
|
rpkg = xbps_dictionary_get_keysym(xhp->vpkgd, obj);
|
|
pkg = xbps_string_cstring_nocopy(rpkg);
|
|
|
|
if (xbps_pkg_version(vpkg_conf)) {
|
|
if (!xbps_pkg_name(buf, XBPS_NAME_SIZE, vpkg_conf)) {
|
|
abort();
|
|
}
|
|
vpkgname = buf;
|
|
} else {
|
|
vpkgname = vpkg_conf;
|
|
}
|
|
assert(vpkgname);
|
|
|
|
if (xbps_pkgpattern_version(vpkg)) {
|
|
if (xbps_pkg_version(vpkg_conf)) {
|
|
if (!xbps_pkgpattern_match(vpkg_conf, vpkg)) {
|
|
continue;
|
|
}
|
|
} else {
|
|
vpkgver = xbps_xasprintf("%s-999999_1", vpkg_conf);
|
|
if (!xbps_pkgpattern_match(vpkgver, vpkg)) {
|
|
free(vpkgver);
|
|
continue;
|
|
}
|
|
free(vpkgver);
|
|
}
|
|
} else if (xbps_pkg_version(vpkg)) {
|
|
if (!xbps_pkg_name(buf, XBPS_NAME_SIZE, vpkg)) {
|
|
abort();
|
|
}
|
|
if (strcmp(buf, vpkgname)) {
|
|
continue;
|
|
}
|
|
} else {
|
|
if (strcmp(vpkg, vpkgname)) {
|
|
continue;
|
|
}
|
|
}
|
|
found = true;
|
|
break;
|
|
}
|
|
xbps_object_iterator_release(iter);
|
|
|
|
return found ? pkg : NULL;
|
|
}
|
|
|
|
xbps_dictionary_t HIDDEN
|
|
xbps_find_virtualpkg_in_conf(struct xbps_handle *xhp,
|
|
xbps_dictionary_t d,
|
|
const char *pkg)
|
|
{
|
|
xbps_dictionary_t pkgd;
|
|
const char *vpkg;
|
|
|
|
/* Try matching vpkg from configuration files */
|
|
vpkg = vpkg_user_conf(xhp, pkg, true);
|
|
if (vpkg != NULL) {
|
|
if (xbps_pkgpattern_version(vpkg))
|
|
pkgd = match_pkg_by_pattern(d, vpkg);
|
|
else if (xbps_pkg_version(vpkg))
|
|
pkgd = match_pkg_by_pkgver(d, vpkg);
|
|
else
|
|
pkgd = xbps_dictionary_get(d, vpkg);
|
|
|
|
if (pkgd)
|
|
return pkgd;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
xbps_dictionary_t HIDDEN
|
|
xbps_find_virtualpkg_in_dict(struct xbps_handle *xhp,
|
|
xbps_dictionary_t d,
|
|
const char *pkg)
|
|
{
|
|
xbps_object_t obj;
|
|
xbps_object_iterator_t iter;
|
|
xbps_dictionary_t pkgd = NULL;
|
|
const char *vpkg;
|
|
|
|
/* Try matching vpkg via xhp->vpkgd */
|
|
vpkg = vpkg_user_conf(xhp, pkg, false);
|
|
if (vpkg != NULL) {
|
|
if (xbps_pkgpattern_version(vpkg))
|
|
pkgd = match_pkg_by_pattern(d, vpkg);
|
|
else if (xbps_pkg_version(vpkg))
|
|
pkgd = match_pkg_by_pkgver(d, vpkg);
|
|
else
|
|
pkgd = xbps_dictionary_get(d, vpkg);
|
|
|
|
if (pkgd)
|
|
return pkgd;
|
|
}
|
|
/* ... otherwise match the first one in dictionary */
|
|
iter = xbps_dictionary_iterator(d);
|
|
assert(iter);
|
|
|
|
while ((obj = xbps_object_iterator_next(iter))) {
|
|
pkgd = xbps_dictionary_get_keysym(d, obj);
|
|
if (xbps_match_virtual_pkg_in_dict(pkgd, pkg)) {
|
|
xbps_object_iterator_release(iter);
|
|
return pkgd;
|
|
}
|
|
}
|
|
xbps_object_iterator_release(iter);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
xbps_dictionary_t HIDDEN
|
|
xbps_find_pkg_in_dict(xbps_dictionary_t d, const char *pkg)
|
|
{
|
|
xbps_dictionary_t pkgd = NULL;
|
|
|
|
if (xbps_pkgpattern_version(pkg))
|
|
pkgd = match_pkg_by_pattern(d, pkg);
|
|
else if (xbps_pkg_version(pkg))
|
|
pkgd = match_pkg_by_pkgver(d, pkg);
|
|
else
|
|
pkgd = xbps_dictionary_get(d, pkg);
|
|
|
|
return pkgd;
|
|
}
|