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
2020-02-21 09:08:22 +01:00
parent 701132071d
commit 06c9891ae3
28 changed files with 960 additions and 742 deletions

@ -1,5 +1,5 @@
/*-
* Copyright (c) 2009-2015 Juan Romero Pardines.
* Copyright (c) 2009-2020 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -61,7 +61,8 @@ xbps_transaction_commit(struct xbps_handle *xhp)
{
xbps_object_t obj;
xbps_object_iterator_t iter;
const char *pkgver, *tract;
xbps_trans_type_t ttype;
const char *pkgver = NULL;
int rv = 0;
bool update;
@ -140,10 +141,10 @@ xbps_transaction_commit(struct xbps_handle *xhp)
goto out;
}
while ((obj = xbps_object_iterator_next(iter)) != NULL) {
xbps_dictionary_get_cstring_nocopy(obj, "transaction", &tract);
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
if (strcmp(tract, "remove") == 0) {
ttype = xbps_transaction_pkg_type(obj);
if (ttype == XBPS_TRANS_REMOVE) {
/*
* Remove package.
*/
@ -157,7 +158,7 @@ xbps_transaction_commit(struct xbps_handle *xhp)
}
continue;
} else if (strcmp(tract, "configure") == 0) {
} else if (ttype == XBPS_TRANS_CONFIGURE) {
/*
* Reconfigure pending package.
*/
@ -169,7 +170,7 @@ xbps_transaction_commit(struct xbps_handle *xhp)
}
continue;
} else if (strcmp(tract, "update") == 0) {
} else if (ttype == XBPS_TRANS_UPDATE) {
/*
* Update a package: execute pre-remove action of
* existing package before unpacking new version.
@ -185,13 +186,13 @@ xbps_transaction_commit(struct xbps_handle *xhp)
strerror(rv));
goto out;
}
} else if (strcmp(tract, "hold") == 0) {
} else if (ttype == XBPS_TRANS_HOLD) {
/*
* Package is on hold mode, ignore it.
*/
continue;
} else {
/* Install a package */
/* Install or reinstall package */
xbps_set_cb_state(xhp, XBPS_STATE_INSTALL, 0,
pkgver, NULL);
}
@ -227,7 +228,8 @@ xbps_transaction_commit(struct xbps_handle *xhp)
xbps_object_iterator_reset(iter);
/* Force a pkgdb write for all unpacked pkgs in transaction */
(void)xbps_pkgdb_update(xhp, true, true);
if ((rv = xbps_pkgdb_update(xhp, true, true)) != 0)
goto out;
/*
* Configure all unpacked packages.
@ -236,16 +238,15 @@ xbps_transaction_commit(struct xbps_handle *xhp)
while ((obj = xbps_object_iterator_next(iter)) != NULL) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
xbps_dictionary_get_cstring_nocopy(obj, "transaction", &tract);
if ((strcmp(tract, "remove") == 0) ||
(strcmp(tract, "hold") == 0) ||
(strcmp(tract, "configure") == 0)) {
ttype = xbps_transaction_pkg_type(obj);
if (ttype == XBPS_TRANS_REMOVE || ttype == XBPS_TRANS_HOLD ||
ttype == XBPS_TRANS_CONFIGURE) {
xbps_dbg_printf(xhp, "%s: skipping configuration for "
"%s: %s\n", __func__, pkgver, tract);
"%s: %d\n", __func__, pkgver, ttype);
continue;
}
update = false;
if (strcmp(tract, "update") == 0)
if (ttype == XBPS_TRANS_UPDATE)
update = true;
rv = xbps_configure_pkg(xhp, pkgver, false, update);
@ -269,8 +270,9 @@ xbps_transaction_commit(struct xbps_handle *xhp)
out:
xbps_object_iterator_release(iter);
/* Force a pkgdb write for all unpacked pkgs in transaction */
(void)xbps_pkgdb_update(xhp, true, true);
if (rv == 0) {
/* Force a pkgdb write for all unpacked pkgs in transaction */
rv = xbps_pkgdb_update(xhp, true, true);
}
return rv;
}