emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_transaction_prepare: optimize a bit.

Browse Source 
If all packages in transaction are on hold, there's no
need to check for conflicts, shlibs, etc.

This makes `xbps-install -un` work faster on my system:
~0.450ms -> ~0.250ms

There's still room for more improvements :-)
This commit is contained in:
Juan RP 2019-12-27 21:11:29 +01:00
parent 73e0668840
commit c81a2806ff
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/transaction_prepare.c
View File

@ -276,8 +276,10 @@ int
xbps_transaction_prepare(struct xbps_handle *xhp) xbps_transaction_prepare(struct xbps_handle *xhp)
{ {
xbps_array_t array, pkgs, edges; xbps_array_t array, pkgs, edges;
xbps_dictionary_t tpkgd;
unsigned int i, cnt; unsigned int i, cnt;
int rv = 0; int rv = 0;
bool all_on_hold = true;
if ((rv = xbps_transaction_init(xhp)) != 0) if ((rv = xbps_transaction_init(xhp)) != 0)
return rv; return rv;
@ -327,6 +329,24 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
} }
xbps_object_release(edges); xbps_object_release(edges);
/*
* If all pkgs in transaction are on hold, no need to check
* for anything else.
*/
all_on_hold = true;
for (i = 0; i < cnt; i++) {
const char *action;
tpkgd = xbps_array_get(pkgs, i);
xbps_dictionary_get_cstring_nocopy(tpkgd, "transaction", &action);
if (strcmp(action, "hold")) {
all_on_hold = false;
break;
}
}
if (all_on_hold)
goto out;
/* /*
* Check for packages to be replaced. * Check for packages to be replaced.
*/ */
@ -365,6 +385,7 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
return ENOEXEC; return ENOEXEC;
} }
} }
out:
/* /*
* Add transaction stats for total download/installed size, * Add transaction stats for total download/installed size,
* number of packages to be installed, updated, configured * number of packages to be installed, updated, configured