averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Factor use of the CodeCompletion sys::Cache into get() and set() methods

Browse Source 
Now get() and set() manage determining whether the results are stale,
and getResults() can just rely on that.

Also drive-by fix a data race where we were inserting our results sink
into the cache before it was finished being modified.

Swift SVN r28175
This commit is contained in:
Ben Langmuir
2015-05-05 19:02:16 +00:00
parent 563cd0acf0
commit c40100af66
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/IDE/CodeCompletion.cpp
View File

@@ -578,20 +578,10 @@ void CodeCompletionCache::getResults(
std::function<ValueRefCntPtr(CodeCompletionCache &, Key, const Module *)>
FillCacheCallback) {
// FIXME(thread-safety): lock the whole AST context. We might load a module.
auto &TheCache = Impl->TheCache;
llvm::Optional<ValueRefCntPtr> V = TheCache.get(K);
llvm::Optional<ValueRefCntPtr> V = get(K);
if (!V.hasValue()) {
// No cached results found. Fill the cache.
// No cached results found. Fill the cache.
V = FillCacheCallback(*this, K, TheModule);
} else {
llvm::sys::fs::file_status ModuleStatus;
if (llvm::sys::fs::status(K.ModuleFilename, ModuleStatus) ||
V.getValue()->ModuleModificationTime !=
ModuleStatus.getLastModificationTime()) {
// Cache is stale. Update the cache.
TheCache.remove(K);
V = FillCacheCallback(*this, K, TheModule);
}
}
assert(V.hasValue());
auto &SourceSink = V.getValue()->Sink;
@@ -637,16 +627,29 @@ void CodeCompletionCache::getResults(
}
}
CodeCompletionCache::ValueRefCntPtr
CodeCompletionCache::getResultSinkFor(const Key &K) {
CodeCompletionCache::ValueRefCntPtr CodeCompletionCache::createValue() {
return ValueRefCntPtr(new Value);
}
Optional<CodeCompletionCache::ValueRefCntPtr>
CodeCompletionCache::get(const Key &K) {
auto &TheCache = Impl->TheCache;
TheCache.remove(K);
auto V = ValueRefCntPtr(new Value);
TheCache.set(K, V);
llvm::Optional<ValueRefCntPtr> V = TheCache.get(K);
if (V) {
// Check whether V is up to date.
llvm::sys::fs::file_status ModuleStatus;
if (llvm::sys::fs::status(K.ModuleFilename, ModuleStatus) ||
V.getValue()->ModuleModificationTime !=
ModuleStatus.getLastModificationTime()) {
// Cache is stale.
V = None;
TheCache.remove(K);
}
}
return V;
}
void CodeCompletionCache::storeResults(const Key &K, ValueRefCntPtr V) {
void CodeCompletionCache::set(const Key &K, ValueRefCntPtr V) {
{
assert(!K.ModuleFilename.empty());
@@ -657,11 +660,7 @@ void CodeCompletionCache::storeResults(const Key &K, ValueRefCntPtr V) {
V->ModuleModificationTime = ModuleStatus.getLastModificationTime();
}
}
// Remove the cache entry and add it back to refresh the cost value.
auto &TheCache = Impl->TheCache;
TheCache.remove(K);
TheCache.set(K, V);
Impl->TheCache.set(K, V);
}
CodeCompletionCache::CodeCompletionCache()
@@ -2905,10 +2904,10 @@ void CodeCompletionCallbacksImpl::doneParsing() {
auto FillCacheCallback = [&SwiftContext, &SF](
CodeCompletionCache &Cache, const CodeCompletionCache::Key &K,
const Module *TheModule) {
auto V = Cache.getResultSinkFor(K);
auto V = Cache.createValue();
lookupCodeCompletionResultsFromModule(V->Sink, TheModule, K.AccessPath,
K.ResultsHaveLeadingDot, &SF);
Cache.storeResults(K, V);
Cache.set(K, V);
return V;
};