mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(load-path-filter-cache-directory-files): Filter only for must-suffix

Browse source 
Most loads set the `must-suffix` (e.g. `require and
`autoload-do-load`), but some don't (e.g. `load-library`).
This results in two separate entries in
`load-path-filter--cache` with two hash-tables.  The entry for
`must-suffix=nil` is larger and much less often used than the
other, so just skip filtering when `must-suffix=nil`.
Reduces the memory size of the cache from ~1MB to ~400kB in my
test case.

* lisp/startup.el (load-path-filter-cache-directory-files):
Don't use a filtering cache when `must-suffix` is nil.
This commit is contained in:
Stefan Monnier 2025-05-31 13:29:05 -04:00
parent 4b527088e6
commit c3d9581f84
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lisp/startup.el
View file

@ -1148,11 +1148,12 @@ the `--debug-init' option to view a complete error backtrace."
The value is an alist. The car of each entry is a list of load suffixes,
such as returned by `get-load-suffixes'. The cdr of each entry is a
cons whose car is an `regex-opt' optimized regex matching those suffixes
cons whose car is a regex matching those suffixes
at the end of a string, and whose cdr is a hash-table mapping directories
to files in those directories which end with one of the suffixes.
Since the list of load suffixes usually includes an empty string, the
hash-table will also include subdirectories of those directories.
These can also be nil, in which case no filtering will happen.
The files named in the hash-table can be of any kind,
including subdirectories.
The hash-table uses `equal' as its key comparison function.")
(defun load-path-filter-cache-directory-files (path file suffixes)
@ -1170,19 +1171,28 @@ This function is called from `load' via `load-path-filter-function'."
(if (file-name-directory file)
;; FILE has more than one component, don't bother filtering.
path
(seq-filter
(let ((rx-and-ht
(with-memoization (alist-get suffixes load-path-filter--cache nil nil #'equal)
(cons
(concat (regexp-opt suffixes) "\\'")
(make-hash-table :test #'equal)))))
(lambda (dir)
(when (file-directory-p dir)
(try-completion
file
(with-memoization (gethash dir (cdr rx-and-ht))
(directory-files dir nil (car rx-and-ht) t))))))
path)))
(pcase-let
((`(,rx . ,ht)
(with-memoization (alist-get suffixes load-path-filter--cache
nil nil #'equal)
(if (member "" suffixes)
'(nil ;; Optimize the filtering.
;; Don't bother filtering if "" is among the suffixes.
;; It's a much less common use-case and it would use
;; more memory to keep the corresponding info.
. nil)
(cons (concat (regexp-opt suffixes) "\\'")
(make-hash-table :test #'equal))))))
(if (null ht)
path
(seq-filter
(lambda (dir)
(when (file-directory-p dir)
(try-completion
file
(with-memoization (gethash dir ht)
(directory-files dir nil rx t)))))
path)))))
(defun command-line ()
"A subroutine of `normal-top-level'.