Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Speed up kldload descriptions with alternative to __fish_whatis

Browse source 
__kld_whatis is an order of magnitude faster than calling `whatis` by means of
`__fish_whatis`. (It could be even faster if we could somehow tell `string
replace` to return after the first result, since the .Nd line comes at the start
of the file.)

It still takes some ~3.5 to print descriptions for all available klds (864 under
FreeBSD 13), so we still need to decide when it's prudent to do so and when it's
not.
This commit is contained in:
Mahmoud Al-Qudsi 2024-06-24 15:05:19 -05:00
parent d914f4e991
commit 4d7ef1fad8
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
share/completions/kldload.fish
View file

@ -5,15 +5,15 @@ function __fish_list_kldload_options
# is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following: # is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following:
# 10671 11892698 > complete -C"kldload " # 10671 11892698 > complete -C"kldload "
# A 12 second completion delay is obviously out of the question, so don't provide a description unless there are # A 12 second completion delay is obviously out of the question, so don't provide a description unless there are
# fewer than 50 results. # fewer than 50 results. (Update: now 200 after the switch to __kld_whatis.)
# Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module # Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module
# in question does not exist, since the paths are hardcoded. # in question does not exist, since the paths are hardcoded.
set -l kld_count (count $klds) set -l kld_count (count $klds)
if test $kld_count -le 50 -a $kld_count -gt 0 if test $kld_count -le 200 -a $kld_count -gt 0
# print name and description # print name and description
for kld in $klds for kld in $klds
printf '%s\t%s\n' $kld (test -e /usr/share/man/man4/$kld.4.gz; printf '%s\t%s\n' $kld (test -f /usr/share/man/man4/$kld.4.gz;
and __fish_whatis $kld; or echo "kernel module") and __kld_whatis $kld; or echo "kernel module")[1]
end end
else if test $kld_count -gt 0 else if test $kld_count -gt 0
# print name only # print name only
@ -24,6 +24,15 @@ function __fish_list_kldload_options
end end
end end
# This is up to 10-50x faster than using __fish_whatis but it could someday break.
# (zcat is part of the standard FreeBSD distribution.)
# Without this, we can't reasonably show descriptions for most completions within our time budget.
function __kld_whatis
set -l kld $argv[1]
set -l path /usr/share/man/man4/$kld.4.gz
zcat $path | string replace -rf '\.Nd "?([^"]+).*' '$1'
end
# Only attempt to match a local file if there isn't a match in /boot/kernel, # Only attempt to match a local file if there isn't a match in /boot/kernel,
# as odds are that is the desired source. # as odds are that is the desired source.
complete -c kldload -xa '(__fish_list_kldload_options)' complete -c kldload -xa '(__fish_list_kldload_options)'