xbps_transaction_*: multiple performance improvements (v2).
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.
This commit is contained in:
Juan RP
185
lib/transaction_check_replaces.c
Normal file
185
lib/transaction_check_replaces.c
Normal file
@@ -0,0 +1,185 @@
|
||||
/*-
|
||||
* Copyright (c) 2011-2020 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 <unistd.h>
|
||||
#include <libgen.h>
|
||||
|
||||
#include "xbps_api_impl.h"
|
||||
|
||||
/*
|
||||
* Processes the array of pkg dictionaries in "pkgs" to
|
||||
* find matching package replacements via "replaces" pkg obj.
|
||||
*
|
||||
* This array contains the unordered list of packages in
|
||||
* the transaction dictionary.
|
||||
*/
|
||||
bool HIDDEN
|
||||
xbps_transaction_check_replaces(struct xbps_handle *xhp, xbps_array_t pkgs)
|
||||
{
|
||||
assert(xhp);
|
||||
assert(pkgs);
|
||||
|
||||
for (unsigned int i = 0; i < xbps_array_count(pkgs); i++) {
|
||||
xbps_array_t replaces;
|
||||
xbps_object_t obj, obj2;
|
||||
xbps_object_iterator_t iter;
|
||||
xbps_dictionary_t instd, reppkgd;
|
||||
const char *pkgver = NULL;
|
||||
char pkgname[XBPS_NAME_SIZE] = {0};
|
||||
|
||||
obj = xbps_array_get(pkgs, i);
|
||||
replaces = xbps_dictionary_get(obj, "replaces");
|
||||
if (replaces == NULL || xbps_array_count(replaces) == 0)
|
||||
continue;
|
||||
|
||||
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver)) {
|
||||
return false;
|
||||
}
|
||||
if (!xbps_pkg_name(pkgname, XBPS_NAME_SIZE, pkgver)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
iter = xbps_array_iterator(replaces);
|
||||
assert(iter);
|
||||
|
||||
while ((obj2 = xbps_object_iterator_next(iter)) != NULL) {
|
||||
const char *curpkgver = NULL, *pattern = NULL;
|
||||
char curpkgname[XBPS_NAME_SIZE] = {0};
|
||||
bool instd_auto = false, hold = false;
|
||||
xbps_trans_type_t ttype;
|
||||
|
||||
pattern = xbps_string_cstring_nocopy(obj2);
|
||||
/*
|
||||
* Find the installed package that matches the pattern
|
||||
* to be replaced.
|
||||
*/
|
||||
if (((instd = xbps_pkgdb_get_pkg(xhp, pattern)) == NULL) &&
|
||||
((instd = xbps_pkgdb_get_virtualpkg(xhp, pattern)) == NULL))
|
||||
continue;
|
||||
|
||||
if (!xbps_dictionary_get_cstring_nocopy(instd, "pkgver", &curpkgver)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
/* ignore pkgs on hold mode */
|
||||
if (xbps_dictionary_get_bool(instd, "hold", &hold) && hold)
|
||||
continue;
|
||||
|
||||
if (!xbps_pkg_name(curpkgname, XBPS_NAME_SIZE, curpkgver)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
/*
|
||||
* Check that we are not replacing the same package,
|
||||
* due to virtual packages.
|
||||
*/
|
||||
if (strcmp(pkgname, curpkgname) == 0) {
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* Make sure to not add duplicates.
|
||||
*/
|
||||
xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto);
|
||||
reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, 0);
|
||||
if (reppkgd) {
|
||||
ttype = xbps_transaction_pkg_type(reppkgd);
|
||||
if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD)
|
||||
continue;
|
||||
if (!xbps_dictionary_get_cstring_nocopy(reppkgd,
|
||||
"pkgver", &curpkgver)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (!xbps_match_virtual_pkg_in_dict(reppkgd, pattern) &&
|
||||
!xbps_pkgpattern_match(curpkgver, pattern))
|
||||
continue;
|
||||
/*
|
||||
* Package contains replaces="pkgpattern", but the
|
||||
* package that should be replaced is also in the
|
||||
* transaction and it's going to be updated.
|
||||
*/
|
||||
if (!xbps_dictionary_set_bool(reppkgd, "automatic-install", instd_auto)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (!xbps_dictionary_set_bool(reppkgd, "replaced", true)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (!xbps_transaction_pkg_type_set(reppkgd, XBPS_TRANS_REMOVE)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (xbps_array_replace_dict_by_name(pkgs, reppkgd, curpkgname) != 0) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
xbps_dbg_printf(xhp,
|
||||
"Package `%s' in transaction will be "
|
||||
"replaced by `%s', matched with `%s'\n",
|
||||
curpkgver, pkgver, pattern);
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* If new package is providing a virtual package to the
|
||||
* package that we want to replace we should respect
|
||||
* the automatic-install object.
|
||||
*/
|
||||
if (xbps_match_virtual_pkg_in_dict(obj, pattern)) {
|
||||
if (!xbps_dictionary_set_bool(obj, "automatic-install", instd_auto)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Add package dictionary into the transaction and mark
|
||||
* it as to be "removed".
|
||||
*/
|
||||
if (!xbps_transaction_pkg_type_set(instd, XBPS_TRANS_REMOVE)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (!xbps_dictionary_set_bool(instd, "replaced", true)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
if (!xbps_array_add_first(pkgs, instd)) {
|
||||
xbps_object_iterator_release(iter);
|
||||
return false;
|
||||
}
|
||||
xbps_dbg_printf(xhp,
|
||||
"Package `%s' will be replaced by `%s', "
|
||||
"matched with `%s'\n", curpkgver, pkgver, pattern);
|
||||
}
|
||||
xbps_object_iterator_release(iter);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
Reference in New Issue
Block a user