anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix slowness problem reported on the mailing list on Windows.

Browse Source 
https://marc.info/?l=lyx-devel&m=154458979925296&w=2

This is related to the fix for #9158 and the caching of bibfile
information. On Windows, it is incredibly slow to run kpsewhich,
which we do to check where files actually are, so as to get info
about them (e.g., timestamps). So we have started to cache that
as a map. The map is supposed to be invalidated when various
things happen, but an oversight was causing it to be invalidated
on every cut operation. This is because cutting uses a temporary
Buffer, and the operations on it were affecting the *global* cache
of biblio file info. (It makes sense to have a global cache, since
these files are not document-specific.) Basically, we have to update
the list of bibfiles in that temporary Buffer---but that is one of
the things that invalidated the cache. The solution is only to
invalidate the cache if the list of bibfiles has actually changed
(a sensible idea anyway). The only time that will happen in the
temporary Buffer is when the copied information contains a BibTeX
inset. That should be fairly rare.

(cherry picked from commit e9614a36eb)
This commit is contained in:
Richard Kimberly Heck 2018-12-12 01:18:16 -05:00
parent 2e6eab9938
commit 5492fab1c9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Buffer.cpp
View File

@ -2334,6 +2334,7 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
return;
}
docstring_list old_cache = d->bibfiles_cache_;
d->bibfiles_cache_.clear();
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == BIBTEX_CODE) {
@ -2357,8 +2358,9 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
}
}
d->bibfile_cache_valid_ = true;
d->bibinfo_cache_valid_ = false;
d->cite_labels_valid_ = false;
if (d->bibfiles_cache_ != old_cache)
d->bibinfo_cache_valid_ = false;
}
@ -2455,6 +2457,9 @@ void Buffer::checkIfBibInfoCacheIsValid() const
return;
}
// we'll assume it's ok and change this if it's not
d->bibinfo_cache_valid_ = true;
d->cite_labels_valid_ = true;
// compare the cached timestamps with the actual ones.
docstring_list const & bibfiles_cache = getBibfiles();
for (auto const & bf : bibfiles_cache) {
@ -2488,6 +2493,7 @@ void Buffer::reloadBibInfoCache() const
checkIfBibInfoCacheIsValid();
if (d->bibinfo_cache_valid_)
return;
LYXERR(Debug::FILES, "Bibinfo cache was invalid.");
// re-read file locations when this info changes
// FIXME Is this sufficient? Or should we also force that