Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(completion): use one call to globpath() for .vim and .lua #21942

Merged
merged 1 commit into from
Jan 23, 2023
Merged

perf(completion): use one call to globpath() for .vim and .lua #21942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
perf(completion): use one call to globpath() for .vim and .lua 
Test using the following test script (timings with ASAN):
```vim
let start = reltime()
for i in range(100)
  call getcompletion('', 'filetype')
endfor
echomsg reltimefloat(reltime(start))
```
Without this PR: 3.251825 seconds
With this PR: 2.747285 seconds
  • Loading branch information
@zeertzjq
zeertzjq committed Jan 22, 2023
commit 7b7ca5998210c895046d194856e114a4d9cdf6b0
32 changes: 11 additions & 21 deletions src/nvim/runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,56 +1190,46 @@ int ExpandRTDir(char *pat, int flags, int *num_file, char ***file, char *dirname
garray_T ga;
ga_init(&ga, (int)sizeof(char *), 10);

// TODO(bfredl): this is bullshit, exandpath should not reinvent path logic.
// TODO(bfredl): this is bullshit, expandpath should not reinvent path logic.
for (int i = 0; dirnames[i] != NULL; i++) {
size_t size = strlen(dirnames[i]) + pat_len + 7;
size_t size = strlen(dirnames[i]) + pat_len + 16;
char *s = xmalloc(size);
snprintf(s, size, "%s/%s*.vim", dirnames[i], pat);
globpath(p_rtp, s, &ga, 0);
snprintf(s, size, "%s/%s*.lua", dirnames[i], pat);
snprintf(s, size, "%s/%s*.\\(vim\\|lua\\)", dirnames[i], pat);
globpath(p_rtp, s, &ga, 0);
xfree(s);
}

if (flags & DIP_START) {
for (int i = 0; dirnames[i] != NULL; i++) {
size_t size = strlen(dirnames[i]) + pat_len + 22;
size_t size = strlen(dirnames[i]) + pat_len + 31;
char *s = xmalloc(size);
snprintf(s, size, "pack/*/start/*/%s/%s*.vim", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
snprintf(s, size, "pack/*/start/*/%s/%s*.lua", dirnames[i], pat); // NOLINT
snprintf(s, size, "pack/*/start/*/%s/%s*.\\(vim\\|lua\\)", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
xfree(s);
}

for (int i = 0; dirnames[i] != NULL; i++) {
size_t size = strlen(dirnames[i]) + pat_len + 22;
size_t size = strlen(dirnames[i]) + pat_len + 31;
char *s = xmalloc(size);
snprintf(s, size, "start/*/%s/%s*.vim", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
snprintf(s, size, "start/*/%s/%s*.lua", dirnames[i], pat); // NOLINT
snprintf(s, size, "start/*/%s/%s*.\\(vim\\|lua\\)", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
xfree(s);
}
}

if (flags & DIP_OPT) {
for (int i = 0; dirnames[i] != NULL; i++) {
size_t size = strlen(dirnames[i]) + pat_len + 20;
size_t size = strlen(dirnames[i]) + pat_len + 29;
char *s = xmalloc(size);
snprintf(s, size, "pack/*/opt/*/%s/%s*.vim", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
snprintf(s, size, "pack/*/opt/*/%s/%s*.lua", dirnames[i], pat); // NOLINT
snprintf(s, size, "pack/*/opt/*/%s/%s*.\\(vim\\|lua\\)", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
xfree(s);
}

for (int i = 0; dirnames[i] != NULL; i++) {
size_t size = strlen(dirnames[i]) + pat_len + 20;
size_t size = strlen(dirnames[i]) + pat_len + 29;
char *s = xmalloc(size);
snprintf(s, size, "opt/*/%s/%s*.vim", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
snprintf(s, size, "opt/*/%s/%s*.lua", dirnames[i], pat); // NOLINT
snprintf(s, size, "opt/*/%s/%s*.\\(vim\\|lua\\)", dirnames[i], pat); // NOLINT
globpath(p_pp, s, &ga, 0);
xfree(s);
}
Expand Down