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
249
lib/transaction_check_conflicts.c
Normal file
249
lib/transaction_check_conflicts.c
Normal file
@ -0,0 +1,249 @@
|
||||
/*-
|
||||
* Copyright (c) 2012-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 "xbps_api_impl.h"
|
||||
|
||||
static void
|
||||
pkg_conflicts_trans(struct xbps_handle *xhp, xbps_array_t array,
|
||||
xbps_dictionary_t pkg_repod)
|
||||
{
|
||||
xbps_array_t pkg_cflicts, trans_cflicts;
|
||||
xbps_dictionary_t pkgd, tpkgd;
|
||||
xbps_object_t obj;
|
||||
xbps_object_iterator_t iter;
|
||||
xbps_trans_type_t ttype;
|
||||
const char *cfpkg, *repopkgver, *repopkgname;
|
||||
char *buf;
|
||||
|
||||
assert(xhp);
|
||||
assert(array);
|
||||
assert(pkg_repod);
|
||||
|
||||
pkg_cflicts = xbps_dictionary_get(pkg_repod, "conflicts");
|
||||
if (xbps_array_count(pkg_cflicts) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
ttype = xbps_transaction_pkg_type(pkg_repod);
|
||||
if (ttype == XBPS_TRANS_HOLD || ttype == XBPS_TRANS_REMOVE) {
|
||||
return;
|
||||
}
|
||||
|
||||
trans_cflicts = xbps_dictionary_get(xhp->transd, "conflicts");
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver)) {
|
||||
return;
|
||||
}
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkg_repod, "pkgname", &repopkgname)) {
|
||||
return;
|
||||
}
|
||||
|
||||
iter = xbps_array_iterator(pkg_cflicts);
|
||||
assert(iter);
|
||||
|
||||
while ((obj = xbps_object_iterator_next(iter))) {
|
||||
const char *pkgver = NULL, *pkgname = NULL;
|
||||
|
||||
cfpkg = xbps_string_cstring_nocopy(obj);
|
||||
|
||||
/*
|
||||
* Check if current pkg conflicts with an installed package.
|
||||
*/
|
||||
if ((pkgd = xbps_pkgdb_get_pkg(xhp, cfpkg)) ||
|
||||
(pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) {
|
||||
/* If the conflicting pkg is on hold, ignore it */
|
||||
if (xbps_dictionary_get(pkgd, "hold"))
|
||||
continue;
|
||||
|
||||
/* Ignore itself */
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgname", &pkgname)) {
|
||||
break;
|
||||
}
|
||||
if (strcmp(pkgname, repopkgname) == 0) {
|
||||
continue;
|
||||
}
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver)) {
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* If there's a pkg for the conflict in transaction,
|
||||
* ignore it.
|
||||
*/
|
||||
if ((tpkgd = xbps_find_pkg_in_array(array, pkgname, 0))) {
|
||||
ttype = xbps_transaction_pkg_type(tpkgd);
|
||||
if (ttype == XBPS_TRANS_INSTALL ||
|
||||
ttype == XBPS_TRANS_UPDATE ||
|
||||
ttype == XBPS_TRANS_REMOVE ||
|
||||
ttype == XBPS_TRANS_HOLD) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
xbps_dbg_printf(xhp, "found conflicting installed "
|
||||
"pkg %s with pkg in transaction %s "
|
||||
"(matched by %s [trans])\n", pkgver, repopkgver, cfpkg);
|
||||
buf = xbps_xasprintf("CONFLICT: %s with "
|
||||
"installed pkg %s (matched by %s)",
|
||||
repopkgver, pkgver, cfpkg);
|
||||
if (!xbps_match_string_in_array(trans_cflicts, buf))
|
||||
xbps_array_add_cstring(trans_cflicts, buf);
|
||||
|
||||
free(buf);
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* Check if current pkg conflicts with any pkg in transaction.
|
||||
*/
|
||||
if ((pkgd = xbps_find_pkg_in_array(array, cfpkg, 0)) ||
|
||||
(pkgd = xbps_find_virtualpkg_in_array(xhp, array, cfpkg, 0))) {
|
||||
/* ignore pkgs to be removed or on hold */
|
||||
ttype = xbps_transaction_pkg_type(pkgd);
|
||||
if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD) {
|
||||
continue;
|
||||
}
|
||||
/* ignore itself */
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgname", &pkgname)) {
|
||||
break;
|
||||
}
|
||||
if (strcmp(pkgname, repopkgname) == 0) {
|
||||
continue;
|
||||
}
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver)) {
|
||||
break;
|
||||
}
|
||||
xbps_dbg_printf(xhp, "found conflicting pkgs in "
|
||||
"transaction %s <-> %s (matched by %s [trans])\n",
|
||||
pkgver, repopkgver, cfpkg);
|
||||
buf = xbps_xasprintf("CONFLICT: %s with "
|
||||
"%s in transaction (matched by %s)",
|
||||
repopkgver, pkgver, cfpkg);
|
||||
if (!xbps_match_string_in_array(trans_cflicts, buf))
|
||||
xbps_array_add_cstring(trans_cflicts, buf);
|
||||
|
||||
free(buf);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
xbps_object_iterator_release(iter);
|
||||
}
|
||||
|
||||
static int
|
||||
pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj,
|
||||
const char *key UNUSED, void *arg, bool *done UNUSED)
|
||||
{
|
||||
xbps_array_t pkg_cflicts, trans_cflicts, pkgs = arg;
|
||||
xbps_dictionary_t pkgd;
|
||||
xbps_object_t obj2;
|
||||
xbps_object_iterator_t iter;
|
||||
xbps_trans_type_t ttype;
|
||||
const char *cfpkg, *repopkgver, *repopkgname;
|
||||
char *buf;
|
||||
int rv = 0;
|
||||
|
||||
pkg_cflicts = xbps_dictionary_get(obj, "conflicts");
|
||||
if (xbps_array_count(pkg_cflicts) == 0)
|
||||
return 0;
|
||||
|
||||
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &repopkgver)) {
|
||||
return EINVAL;
|
||||
}
|
||||
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgname", &repopkgname)) {
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
/* if a pkg is in the transaction, ignore the one from pkgdb */
|
||||
if (xbps_find_pkg_in_array(pkgs, repopkgname, 0)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
trans_cflicts = xbps_dictionary_get(xhp->transd, "conflicts");
|
||||
iter = xbps_array_iterator(pkg_cflicts);
|
||||
assert(iter);
|
||||
|
||||
while ((obj2 = xbps_object_iterator_next(iter))) {
|
||||
const char *pkgver = NULL, *pkgname = NULL;
|
||||
|
||||
cfpkg = xbps_string_cstring_nocopy(obj2);
|
||||
if ((pkgd = xbps_find_pkg_in_array(pkgs, cfpkg, 0)) ||
|
||||
(pkgd = xbps_find_virtualpkg_in_array(xhp, pkgs, cfpkg, 0))) {
|
||||
/* ignore pkgs to be removed or on hold */
|
||||
ttype = xbps_transaction_pkg_type(pkgd);
|
||||
if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD) {
|
||||
continue;
|
||||
}
|
||||
/* ignore itself */
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgname", &pkgname)) {
|
||||
rv = EINVAL;
|
||||
break;
|
||||
}
|
||||
if (strcmp(pkgname, repopkgname) == 0) {
|
||||
continue;
|
||||
}
|
||||
if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver)) {
|
||||
rv = EINVAL;
|
||||
break;
|
||||
}
|
||||
xbps_dbg_printf(xhp, "found conflicting pkgs in "
|
||||
"transaction %s <-> %s (matched by %s [pkgdb])\n",
|
||||
pkgver, repopkgver, cfpkg);
|
||||
buf = xbps_xasprintf("CONFLICT: %s with "
|
||||
"%s in transaction (matched by %s)",
|
||||
repopkgver, pkgver, cfpkg);
|
||||
if (!xbps_match_string_in_array(trans_cflicts, buf))
|
||||
xbps_array_add_cstring(trans_cflicts, buf);
|
||||
|
||||
free(buf);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
xbps_object_iterator_release(iter);
|
||||
return rv;
|
||||
}
|
||||
|
||||
bool HIDDEN
|
||||
xbps_transaction_check_conflicts(struct xbps_handle *xhp, xbps_array_t pkgs)
|
||||
{
|
||||
xbps_array_t array;
|
||||
unsigned int i;
|
||||
|
||||
/* find conflicts in transaction */
|
||||
for (i = 0; i < xbps_array_count(pkgs); i++) {
|
||||
pkg_conflicts_trans(xhp, pkgs, xbps_array_get(pkgs, i));
|
||||
}
|
||||
/* find conflicts in pkgdb */
|
||||
if (xbps_pkgdb_foreach_cb_multi(xhp, pkgdb_conflicts_cb, pkgs) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
array = xbps_dictionary_get(xhp->transd, "conflicts");
|
||||
if (xbps_array_count(array) == 0) {
|
||||
xbps_dictionary_remove(xhp->transd, "conflicts");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
Reference in New Issue
Block a user