Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve 'package-get-descriptor' performance

Browse source 
* lisp/emacs-lisp/package.el (package-get-descriptor): Use
'assq' to look up element in package alists instead of iterative
over them manually.  This was initially not possible, since we
merged all alists into one, which would require using a consing
function like 'map-merge-with' to look up all package descriptor
objects we want to consider in a single 'assq' call.  As we
ended up not merging lists, we can assume that there are no
duplicate keys in the alists, making the efficient 'assq'
viable.
This commit is contained in:
Philip Kaludercic 2026-04-25 12:29:00 +02:00
parent d378e4355f
commit ca2c477d01
No known key found for this signature in database
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/emacs-lisp/package.el
View file

@ -4963,25 +4963,22 @@ and `archive'. Any other symbol will be converted to a singleton list.
The order is significant, in that the first hit will be returned. If
specified, PRED is a function that takes a single `package-desc' argument
and prevents the object from being returned if the predicate returns nil."
(unless sources
(setq sources '(installed archive)))
(cond
((package-desc-p pkg)
(and (or (not pred) (funcall pred pkg)) pkg))
((or (and (stringp pkg) (setq pkg (intern pkg)))
(symbolp pkg))
(catch 'found
(dolist (source (if (eq sources t)
'(installed builtin archive)
(delete-dups (ensure-list sources))))
(dolist (ent (pcase-exhaustive source
('installed (package--alist))
('builtin package--builtin-alist)
('archive (package--archive-contents))))
(when (eq (car ent) pkg)
(dolist (desc (cdr ent))
(when (or (null pred) (funcall pred desc))
(throw 'found desc))))))))
(dolist (source (cond
((eq sources nil) '(installed archive))
((eq sources t) '(installed builtin archive))
((delete-dups (ensure-list sources)))))
(dolist (desc (alist-get pkg (pcase-exhaustive source
('installed (package--alist))
('builtin package--builtin-alist)
('archive (package--archive-contents)))))
(when (or (null pred) (funcall pred desc))
(throw 'found desc))))))
((error "Failed to recognize package %S" pkg))))
(provide 'package)