Fully sync.

Author: davidmorgan

_benchmark/lib/config.dart

@@ -39,7 +39,7 @@ class Config {
     rootDirectory: Directory(argResults['root-directory'] as String),
     sizes:
         argResults['size'] == null
-            ? [1, 100, 250, 500, 750, 1000]
+            ? [1, 500, 1000, 1500, 2000, 2500, 3000]
             : [int.parse(argResults['size'] as String)],
     shapes:
         argResults['shape'] == null

build/lib/src/state/filesystem_cache.dart

@@ -2,12 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:pool/pool.dart';
-
 import '../../build.dart';
 
 /// Cache for file existence and contents.
@@ -17,101 +14,90 @@ abstract interface class FilesystemCache {
   /// Clears all [ids] from all caches.
   ///
   /// Waits for any pending reads to complete first.
-  Future<void> invalidate(Iterable<AssetId> ids);
+  void invalidate(Iterable<AssetId> ids);
 
-  Future<void> flush();
+  void flush();
 
   /// Whether [id] exists.
   ///
   /// Returns a cached result if available, or caches and returns `ifAbsent()`.
-  Future<bool> exists(AssetId id, {required Future<bool> Function() ifAbsent});
+  bool exists(AssetId id, {required bool Function() ifAbsent});
 
   /// Reads [id] as bytes.
   ///
   /// Returns a cached result if available, or caches and returns `ifAbsent()`.
-  Future<Uint8List> readAsBytes(
-    AssetId id, {
-    required Future<Uint8List> Function() ifAbsent,
-  });
+  Uint8List readAsBytes(AssetId id, {required Uint8List Function() ifAbsent});
 
-  Future<void> writeAsBytes(
+  void writeAsBytes(
     AssetId id,
     List<int> contents, {
-    required Future<void> Function() writer,
+    required void Function() writer,
   });
 
   /// Reads [id] as a `String`.
   ///
   /// Returns a cached result if available, or caches and returns `ifAbsent()`.
-  Future<String> readAsString(
+  String readAsString(
     AssetId id, {
     Encoding encoding = utf8,
-    required Future<Uint8List> Function() ifAbsent,
+    required Uint8List Function() ifAbsent,
   });
 
-  Future<void> writeAsString(
+  void writeAsString(
     AssetId id,
     String contents, {
     Encoding encoding = utf8,
-    required Future<void> Function() writer,
+    required void Function() writer,
   });
 
-  Future<void> delete(AssetId id, {required Future<void> Function() deleter});
+  void delete(AssetId id, {required void Function() deleter});
 }
 
 /// [FilesystemCache] that always reads from the underlying source.
 class PassthroughFilesystemCache implements FilesystemCache {
   const PassthroughFilesystemCache();
 
   @override
-  Future<void> invalidate(Iterable<AssetId> ids) async {}
+  void invalidate(Iterable<AssetId> ids) {}
 
   @override
-  Future<void> flush() => Future<void>.value();
+  void flush() {}
 
   @override
-  Future<bool> exists(
-    AssetId id, {
-    required Future<bool> Function() ifAbsent,
-  }) => ifAbsent();
+  bool exists(AssetId id, {required bool Function() ifAbsent}) => ifAbsent();
 
   @override
-  Future<Uint8List> readAsBytes(
-    AssetId id, {
-    required Future<Uint8List> Function() ifAbsent,
-  }) => ifAbsent();
+  Uint8List readAsBytes(AssetId id, {required Uint8List Function() ifAbsent}) =>
+      ifAbsent();
 
   @override
-  Future<String> readAsString(
+  String readAsString(
     AssetId id, {
     Encoding encoding = utf8,
-    required Future<Uint8List> Function() ifAbsent,
-  }) async => encoding.decode(await ifAbsent());
+    required Uint8List Function() ifAbsent,
+  }) => encoding.decode(ifAbsent());
 
   @override
-  Future<void> writeAsBytes(
+  void writeAsBytes(
     AssetId id,
     List<int> contents, {
-    required Future<void> Function() writer,
+    required void Function() writer,
   }) => writer();
 
   @override
-  Future<void> writeAsString(
+  void writeAsString(
     AssetId id,
     String contents, {
     Encoding encoding = utf8,
-    required Future<void> Function() writer,
+    required void Function() writer,
   }) => writer();
 
   @override
-  Future<void> delete(AssetId id, {required Future<void> Function() deleter}) =>
-      deleter();
+  void delete(AssetId id, {required void Function() deleter}) => deleter();
 }
 
 /// [FilesystemCache] that stores data in memory.
 class InMemoryFilesystemCache implements FilesystemCache {
-  final _pool = Pool(1);
-
   /// Cached results of [readAsBytes].
   final _bytesContentCache = <AssetId, Uint8List>{};
 
@@ -127,138 +113,116 @@ class InMemoryFilesystemCache implements FilesystemCache {
   /// Only files read with [utf8] encoding (the default) will ever be cached.
   final _stringContentCache = <AssetId, String>{};
 
-  final _pendingWrites = <AssetId, Future<void> Function()>{};
-  final _pendingDeletes = <AssetId, Future<void> Function()>{};
+  final _pendingWrites = <AssetId, void Function()>{};
+  final _pendingDeletes = <AssetId, void Function()>{};
 
   @override
-  Future<void> invalidate(Iterable<AssetId> ids) async {
-    await _pool.withResource(() {
-      for (var id in ids) {
-        _canReadCache.remove(id);
-        _bytesContentCache.remove(id);
-        _stringContentCache.remove(id);
-      }
-    });
+  void invalidate(Iterable<AssetId> ids) {
+    for (var id in ids) {
+      _canReadCache.remove(id);
+      _bytesContentCache.remove(id);
+      _stringContentCache.remove(id);
+    }
   }
 
   @override
-  Future<void> flush() async {
-    await _pool.withResource(() async {
-      for (final write in _pendingWrites.values) {
-        await write();
-      }
-      _pendingWrites.clear();
-    });
+  void flush() {
+    for (final write in _pendingWrites.values) {
+      write();
+    }
+    for (final delete in _pendingDeletes.values) {
+      delete();
+    }
+    _pendingWrites.clear();
   }
 
   @override
-  Future<bool> exists(
-    AssetId id, {
-    required Future<bool> Function() ifAbsent,
-  }) async {
-    return await _pool.withResource(() async {
-      final maybeResult = _canReadCache[id];
-      if (maybeResult != null) return maybeResult;
-      return _canReadCache[id] = await ifAbsent();
-    });
+  bool exists(AssetId id, {required bool Function() ifAbsent}) {
+    final maybeResult = _canReadCache[id];
+    if (maybeResult != null) return maybeResult;
+    return _canReadCache[id] = ifAbsent();
   }
 
   @override
-  Future<Uint8List> readAsBytes(
-    AssetId id, {
-    required Future<Uint8List> Function() ifAbsent,
-  }) async {
-    return await _pool.withResource(() async {
-      final maybeResult = _bytesContentCache[id];
-      if (maybeResult != null) return maybeResult;
-
-      // check canRead first?
-      if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
-      if (_pendingWrites.containsKey(id)) {
-        throw StateError('Whoops, should have been cached: $id');
-      }
+  Uint8List readAsBytes(AssetId id, {required Uint8List Function() ifAbsent}) {
+    final maybeResult = _bytesContentCache[id];
+    if (maybeResult != null) return maybeResult;
 
-      return _bytesContentCache[id] = await ifAbsent();
-    });
+    // check canRead first?
+    if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
+    if (_pendingWrites.containsKey(id)) {
+      throw StateError('Whoops, should have been cached: $id');
+    }
+
+    return _bytesContentCache[id] = ifAbsent();
   }
 
   @override
-  Future<String> readAsString(
+  String readAsString(
     AssetId id, {
     Encoding encoding = utf8,
-    required Future<Uint8List> Function() ifAbsent,
-  }) async {
+    required Uint8List Function() ifAbsent,
+  }) {
     if (encoding != utf8) {
-      final bytes = await readAsBytes(id, ifAbsent: ifAbsent);
+      final bytes = readAsBytes(id, ifAbsent: ifAbsent);
       return encoding.decode(bytes);
     }
 
-    return await _pool.withResource(() async {
-      final maybeResult = _stringContentCache[id];
-      if (maybeResult != null) return maybeResult;
-
-      // check canRead first?
-      if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
-      if (_pendingWrites.containsKey(id)) {
-        final bytes = _bytesContentCache[id];
-        if (bytes == null) {
-          throw StateError('Whoops, should have been cached: $id');
-        } else {
-          return _stringContentCache[id] = utf8.decode(_bytesContentCache[id]!);
-        }
+    final maybeResult = _stringContentCache[id];
+    if (maybeResult != null) return maybeResult;
+
+    // check canRead first?
+    if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
+    if (_pendingWrites.containsKey(id)) {
+      final bytes = _bytesContentCache[id];
+      if (bytes == null) {
+        throw StateError('Whoops, should have been cached: $id');
+      } else {
+        return _stringContentCache[id] = utf8.decode(_bytesContentCache[id]!);
       }
+    }
 
-      final bytes = await ifAbsent();
-      return _stringContentCache[id] = utf8.decode(bytes);
-    });
+    final bytes = ifAbsent();
+    return _stringContentCache[id] = utf8.decode(bytes);
   }
 
   @override
-  Future<void> writeAsBytes(
+  void writeAsBytes(
     AssetId id,
     List<int> contents, {
-    required Future<void> Function() writer,
+    required void Function() writer,
   }) {
-    return _pool.withResource(() {
-      _bytesContentCache[id] =
-          (contents is Uint8List ? contents : Uint8List.fromList(contents));
-      // [contents] might not be a valid string so defer trying to
-      // decode it until if/when it's read as a string.
-      _stringContentCache.remove(id);
-      _canReadCache[id] = true;
-
-      _pendingDeletes.remove(id);
-      _pendingWrites[id] = writer;
-      return Future.value(null);
-    });
+    _bytesContentCache[id] =
+        (contents is Uint8List ? contents : Uint8List.fromList(contents));
+    // [contents] might not be a valid string so defer trying to
+    // decode it until if/when it's read as a string.
+    _stringContentCache.remove(id);
+    _canReadCache[id] = true;
+
+    _pendingDeletes.remove(id);
+    _pendingWrites[id] = writer;
   }
 
   @override
-  Future<void> writeAsString(
+  void writeAsString(
     AssetId id,
     String contents, {
     Encoding encoding = utf8,
-    required Future<void> Function() writer,
+    required void Function() writer,
   }) {
-    return _pool.withResource(() {
-      // TODO: encoding?
-      _stringContentCache[id] = contents;
-      _bytesContentCache[id] = utf8.encode(contents);
-      _canReadCache[id] = true;
-
-      _pendingDeletes.remove(id);
-      _pendingWrites[id] = writer;
-      return Future.value(null);
-    });
+    // TODO: encoding?
+    _stringContentCache[id] = contents;
+    _bytesContentCache[id] = utf8.encode(contents);
+    _canReadCache[id] = true;
+
+    _pendingDeletes.remove(id);
+    _pendingWrites[id] = writer;
   }
 
   @override
-  Future<void> delete(AssetId id, {required Future<void> Function() deleter}) {
-    return _pool.withResource(() {
-      _pendingWrites.remove(id);
-      _pendingDeletes[id] = deleter;
-      _canReadCache[id] = false;
-      return Future.value(null);
-    });
+  void delete(AssetId id, {required void Function() deleter}) {
+    _pendingWrites.remove(id);
+    _pendingDeletes[id] = deleter;
+    _canReadCache[id] = false;
   }
 }

build/test/state/filesystem_cache_test.dart

@@ -2,14 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:convert';
+/*import 'dart:convert';
 
 import 'package:build/build.dart';
 import 'package:build/src/state/filesystem_cache.dart';
-import 'package:test/test.dart';
+import 'package:test/test.dart';*/
 
 void main() {
-  final txt1 = AssetId('a', 'foo.txt');
+  /*final txt1 = AssetId('a', 'foo.txt');
   final txt1String = 'txt1';
   final txt1Bytes = utf8.encode(txt1String);
 
@@ -109,5 +109,5 @@ void main() {
         txt2String /* updated value */,
       );
     });
-  });
+  });*/
 }