languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 02:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some clean ups for cache partitions.

Browse source 
R=brianwilkerson@google.com
BUG=

Review URL: https://codereview.chromium.org//1130263002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@45615 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
scheglov@google.com 2015-05-07 20:15:49 +00:00
parent 90759b7299
commit 1ccf10f617
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkg/analyzer/lib/src/context/cache.dart
View file

@ -65,8 +65,9 @@ class AnalysisCache {
CacheEntry get(AnalysisTarget target) {
int count = _partitions.length;
for (int i = 0; i < count; i++) {
if (_partitions[i].contains(target)) {
return _partitions[i].get(target);
CachePartition partition = _partitions[i];
if (partition.isResponsibleFor(target)) {
return partition.get(target);
}
}
//
@ -83,8 +84,9 @@ class AnalysisCache {
InternalAnalysisContext getContextFor(AnalysisTarget target) {
int count = _partitions.length;
for (int i = 0; i < count; i++) {
if (_partitions[i].contains(target)) {
return _partitions[i].context;
CachePartition partition = _partitions[i];
if (partition.isResponsibleFor(target)) {
return partition.context;
}
}
//
@ -119,9 +121,10 @@ class AnalysisCache {
entry.fixExceptionState();
int count = _partitions.length;
for (int i = 0; i < count; i++) {
if (_partitions[i].contains(target)) {
CachePartition partition = _partitions[i];
if (partition.isResponsibleFor(target)) {
if (_TRACE_CHANGES) {
CacheEntry oldEntry = _partitions[i].get(target);
CacheEntry oldEntry = partition.get(target);
if (oldEntry == null) {
AnalysisEngine.instance.logger
.logInformation('Added a cache entry for $target.');
@ -131,7 +134,7 @@ class AnalysisCache {
// 'Diff = ${entry.getDiff(oldEntry)}');
}
}
_partitions[i].put(target, entry);
partition.put(target, entry);
return;
}
}
@ -145,12 +148,13 @@ class AnalysisCache {
void remove(AnalysisTarget target) {
int count = _partitions.length;
for (int i = 0; i < count; i++) {
if (_partitions[i].contains(target)) {
CachePartition partition = _partitions[i];
if (partition.isResponsibleFor(target)) {
if (_TRACE_CHANGES) {
AnalysisEngine.instance.logger
.logInformation('Removed the cache entry for $target.');
}
_partitions[i].remove(target);
partition.remove(target);
return;
}
}
@ -169,13 +173,9 @@ class AnalysisCache {
}
ResultData _getDataFor(TargetedResult result) {
AnalysisTarget target = result.target;
int count = _partitions.length;
for (int i = 0; i < count; i++) {
if (_partitions[i].contains(target)) {
CacheEntry entry = _partitions[i].get(target);
return entry._getResultData(result.result);
}
CacheEntry entry = get(result.target);
if (entry != null) {
return entry._getResultData(result.result);
}
return null;
}
@ -675,11 +675,9 @@ abstract class CachePartition {
Map<AnalysisTarget, CacheEntry> get map => _targetMap;
/**
* Return `true` if the given [target] is contained in this partition.
* Return `true` if this partition is responsible for the given [target].
*/
// TODO(brianwilkerson) Rename this to something more meaningful, such as
// isResponsibleFor.
bool contains(AnalysisTarget target);
bool isResponsibleFor(AnalysisTarget target);
/**
* Return the entry associated with the given [target].
@ -832,7 +830,7 @@ class SdkCachePartition extends CachePartition {
SdkCachePartition(InternalAnalysisContext context) : super(context);
@override
bool contains(AnalysisTarget target) {
bool isResponsibleFor(AnalysisTarget target) {
if (target is AnalysisContextTarget) {
return true;
}
@ -892,5 +890,5 @@ class UniversalCachePartition extends CachePartition {
UniversalCachePartition(InternalAnalysisContext context) : super(context);
@override
bool contains(AnalysisTarget target) => true;
bool isResponsibleFor(AnalysisTarget target) => true;
}

6
pkg/analyzer/test/src/context/cache_test.dart
View file

@ -743,7 +743,7 @@ class SdkCachePartitionTest extends CachePartitionTest {
void test_contains_false() {
CachePartition partition = createPartition();
AnalysisTarget target = new TestSource();
expect(partition.contains(target), isFalse);
expect(partition.isResponsibleFor(target), isFalse);
}
void test_contains_true() {
@ -751,7 +751,7 @@ class SdkCachePartitionTest extends CachePartitionTest {
SourceFactory factory = new SourceFactory(
[new DartUriResolver(DirectoryBasedDartSdk.defaultSdk)]);
AnalysisTarget target = factory.forUri("dart:core");
expect(partition.contains(target), isTrue);
expect(partition.isResponsibleFor(target), isTrue);
}
}
@ -764,7 +764,7 @@ class UniversalCachePartitionTest extends CachePartitionTest {
void test_contains() {
UniversalCachePartition partition = new UniversalCachePartition(null);
TestSource source = new TestSource();
expect(partition.contains(source), isTrue);
expect(partition.isResponsibleFor(source), isTrue);
}
}