refactor(benchmarks): introduce DIAdapter abstraction, migrate all scenarios to use DIAdapter

benchmark_cherrypick/bin/main.dart

@@ -1,14 +1,19 @@
 import 'package:benchmark_cherrypick/cherrypick_benchmark.dart';
 import 'package:benchmark_cherrypick/complex_bindings_benchmark.dart';
 import 'package:benchmark_cherrypick/async_chain_benchmark.dart';
+import 'package:benchmark_cherrypick/di_adapter.dart';
 import 'package:benchmark_cherrypick/scope_override_benchmark.dart';
 import 'package:args/args.dart';
+import 'dart:io';
+import 'dart:math';
 
 Future<void> main(List<String> args) async {
   final parser = ArgParser()
     ..addOption('benchmark', abbr: 'b', help: 'Benchmark name (register, chain_singleton, chain_factory, named, override, async_chain, all)', defaultsTo: 'all')
     ..addOption('chainCount', abbr: 'c', help: 'Comma-separated chainCounts (используется в chain_singleton/factory)', defaultsTo: '100')
     ..addOption('nestingDepth', abbr: 'd', help: 'Comma-separated depths (используется в chain_singleton/factory)', defaultsTo: '100')
+    ..addOption('repeat', abbr: 'r', help: 'Repeats for each run (statistical run, >=2)', defaultsTo: '5')
+    ..addOption('warmup', abbr: 'w', help: 'Warmup runs before timing', defaultsTo: '2')
     ..addOption('format', abbr: 'f', help: 'Output format (pretty, csv, json)', defaultsTo: 'pretty')
     ..addFlag('help', abbr: 'h', negatable: false, help: 'Show help');
 
@@ -17,40 +22,90 @@ Future<void> main(List<String> args) async {
   if (result['help'] == true) {
     print('Dart DI benchmarks');
     print(parser.usage);
+    print('\nExamples:\n'
+        '  dart run bin/main.dart --benchmark=chain_singleton --chainCount=10,100 --nestingDepth=5,10 --format=csv\n'
+        '  dart run bin/main.dart --benchmark=named\n'
+        'Extra: --repeat=7 --warmup=3\n');
     return;
   }
 
+  final di = CherrypickDIAdapter();
+
   final benchmark = result['benchmark'] as String;
   final format = result['format'] as String;
 
   final chainCounts = _parseIntList(result['chainCount'] as String);
   final nestDepths  = _parseIntList(result['nestingDepth'] as String);
+  final repeats     = int.tryParse(result['repeat'] as String? ?? "") ?? 5;
+  final warmups     = int.tryParse(result['warmup'] as String? ?? "") ?? 2;
 
   final results = <Map<String, dynamic>>[];
-  void addResult(String name, int? chainCount, int? nestingDepth, num elapsed) {
+  void addResult(
+    String name,
+    int? chainCount,
+    int? nestingDepth,
+    List<num> timings,
+    int? memoryDiffKb,
+    int? deltaPeakKb,
+    int? peakRssKb,
+  ) {
+    timings.sort();
+    
+    var mean = timings.reduce((a, b) => a + b) / timings.length;
+    var median = timings[timings.length ~/ 2];
+    var minVal = timings.first;
+    var maxVal = timings.last;
+    var stddev = sqrt(timings.map((x) => pow(x - mean, 2)).reduce((a, b) => a + b) / timings.length);
     results.add({
       'benchmark': name,
       'chainCount': chainCount,
       'nestingDepth': nestingDepth,
-      'elapsed_us': elapsed.round()
+      'mean_us': mean.round(),
+      'median_us': median.round(),
+      'stddev_us': stddev.round(),
+      'min_us': minVal.round(),
+      'max_us': maxVal.round(),
+      'trials': timings.length,
+      'timings_us': timings.map((t) => t.round()).toList(),
+      'memory_diff_kb': memoryDiffKb,
+      'delta_peak_kb': deltaPeakKb,
+      'peak_rss_kb': peakRssKb,
     });
   }
 
-  Future<void> runAndCollect(String name, Future<num> Function() fn, {int? chainCount, int? nestingDepth}) async {
+  Future<void> runAndCollect(
-    final elapsed = await fn();
+    String name,
-    addResult(name, chainCount, nestingDepth, elapsed);
+    Future<num> Function() fn, {
+    int? chainCount,
+    int? nestingDepth,
+  }) async {
+    for (int i = 0; i < warmups; i++) {
+      await fn();
+    }
+    final timings = <num>[];
+    final rssValues = <int>[];
+    final memBefore = ProcessInfo.currentRss;
+    for (int i = 0; i < repeats; i++) {
+      timings.add(await fn());
+      rssValues.add(ProcessInfo.currentRss);
+    }
+    final memAfter = ProcessInfo.currentRss;
+    final memDiffKB = ((memAfter - memBefore) / 1024).round();
+    final peakRss = [...rssValues, memBefore].reduce(max);
+    final deltaPeakKb = ((peakRss - memBefore) / 1024).round();
+    addResult(name, chainCount, nestingDepth, timings, memDiffKB, deltaPeakKb, (peakRss/1024).round());
   }
 
   if (benchmark == 'all' || benchmark == 'register') {
     await runAndCollect('RegisterAndResolve', () async {
-      return _captureReport(RegisterAndResolveBenchmark().report);
+      return _captureReport(RegisterAndResolveBenchmark(di).report);
     });
   }
   if (benchmark == 'all' || benchmark == 'chain_singleton') {
     for (final c in chainCounts) {
       for (final d in nestDepths) {
         await runAndCollect('ChainSingleton', () async {
-          return _captureReport(() => ChainSingletonBenchmark(chainCount: c, nestingDepth: d).report());
+          return _captureReport(() => ChainSingletonBenchmark(di,chainCount: c, nestingDepth: d).report());
         }, chainCount: c, nestingDepth: d);
       }
     }
@@ -59,24 +114,24 @@ Future<void> main(List<String> args) async {
     for (final c in chainCounts) {
       for (final d in nestDepths) {
         await runAndCollect('ChainFactory', () async {
-          return _captureReport(() => ChainFactoryBenchmark(chainCount: c, nestingDepth: d).report());
+          return _captureReport(() => ChainFactoryBenchmark(di, chainCount: c, nestingDepth: d).report());
         }, chainCount: c, nestingDepth: d);
       }
     }
   }
   if (benchmark == 'all' || benchmark == 'named') {
     await runAndCollect('NamedResolve', () async {
-      return _captureReport(NamedResolveBenchmark().report);
+      return _captureReport(NamedResolveBenchmark(di).report);
     });
   }
   if (benchmark == 'all' || benchmark == 'override') {
     await runAndCollect('ScopeOverride', () async {
-      return _captureReport(ScopeOverrideBenchmark().report);
+      return _captureReport(ScopeOverrideBenchmark(di).report);
     });
   }
   if (benchmark == 'all' || benchmark == 'async_chain') {
     await runAndCollect('AsyncChain', () async {
-      return _captureReportAsync(AsyncChainBenchmark().report);
+      return _captureReportAsync(AsyncChainBenchmark(di).report);
     });
   }
 
@@ -106,16 +161,28 @@ Future<num> _captureReportAsync(Future<void> Function() fn) async {
 }
 
 String _toPretty(List<Map<String, dynamic>> rows) {
-  final keys = ['benchmark','chainCount','nestingDepth','elapsed_us'];
+  final keys = [
+    'benchmark','chainCount','nestingDepth','mean_us','median_us','stddev_us',
+    'min_us','max_us','trials','memory_diff_kb','delta_peak_kb','peak_rss_kb'
+  ];
   final header = keys.join('\t');
   final lines = rows.map((r) => keys.map((k) => (r[k] ?? '').toString()).join('\t')).toList();
   return ([header] + lines).join('\n');
 }
 
 String _toCsv(List<Map<String, dynamic>> rows) {
-  final keys = ['benchmark','chainCount','nestingDepth','elapsed_us'];
+  final keys = [
+    'benchmark','chainCount','nestingDepth','mean_us','median_us','stddev_us',
+    'min_us','max_us','trials','timings_us','memory_diff_kb','delta_peak_kb','peak_rss_kb'
+  ];
   final header = keys.join(',');
-  final lines = rows.map((r) => keys.map((k) => (r[k] ?? '').toString()).join(',')).toList();
+  final lines = rows.map((r) =>
+    keys.map((k) {
+      final v = r[k];
+      if (v is List) return '"${v.join(';')}"';
+      return (v ?? '').toString();
+    }).join(',')
+  ).toList();
   return ([header] + lines).join('\n');
 }
 

benchmark_cherrypick/lib/async_chain_benchmark.dart

@@ -1,7 +1,8 @@
 // ignore: depend_on_referenced_packages
+import 'package:benchmark_cherrypick/di_adapter.dart';
+// ignore: depend_on_referenced_packages
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:cherrypick/cherrypick.dart';
-import 'benchmark_utils.dart';
 
 class AsyncA {}
 
@@ -30,21 +31,22 @@ class AsyncChainModule extends Module {
   }
 }
 
-class AsyncChainBenchmark extends AsyncBenchmarkBase with BenchmarkWithScope {
+class AsyncChainBenchmark extends AsyncBenchmarkBase {
-  AsyncChainBenchmark() : super('AsyncChain (A->B->C, async)');
+  final DIAdapter di;
+  AsyncChainBenchmark(this.di) : super('AsyncChain (A->B->C, async)');
 
   @override
   Future<void> setup() async {
-    setupScope([AsyncChainModule()]);
+    di.setupModules([AsyncChainModule()]);
   }
 
   @override
   Future<void> teardown() async {
-    teardownScope();
+    di.teardown();
   }
 
   @override
   Future<void> run() async {
-    await scope.resolveAsync<AsyncC>();
+    await di.resolveAsync<AsyncC>();
   }
 }

benchmark_cherrypick/lib/cherrypick_benchmark.dart

@@ -1,4 +1,6 @@
 // ignore: depend_on_referenced_packages
+import 'package:benchmark_cherrypick/di_adapter.dart';
+// ignore: depend_on_referenced_packages
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:cherrypick/cherrypick.dart';
 
@@ -13,26 +15,20 @@ class AppModule extends Module {
 class FooService {}
 
 class RegisterAndResolveBenchmark extends BenchmarkBase {
-  RegisterAndResolveBenchmark() : super('RegisterAndResolve');
+  final DIAdapter di;
-  late final Scope scope;
+
+  RegisterAndResolveBenchmark(this.di) : super('RegisterAndResolve');
 
   @override
   void setup() {
-    CherryPick.disableGlobalCycleDetection();
+    di.setupModules([AppModule()]);
-    CherryPick.disableGlobalCrossScopeCycleDetection();
-    scope = CherryPick.openRootScope();
-    scope.installModules([AppModule()]);
   }
 
   @override
   void run() {
-    scope.resolve<FooService>();
+    di.resolve<FooService>();
   }
 
   @override
-  void teardown() => CherryPick.closeRootScope();
+  void teardown() => di.teardown();
-}
-
-void main() {
-  RegisterAndResolveBenchmark().report();
 }

benchmark_cherrypick/lib/complex_bindings_benchmark.dart

@@ -1,7 +1,8 @@
 // ignore: depend_on_referenced_packages
+import 'package:benchmark_cherrypick/di_adapter.dart';
+// ignore: depend_on_referenced_packages
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:cherrypick/cherrypick.dart';
-import 'benchmark_utils.dart';
 
 // === DI graph: A -> B -> C (singleton) ===
 abstract class Service {
@@ -59,11 +60,13 @@ class ChainSingletonModule extends Module {
   }
 }
 
-class ChainSingletonBenchmark extends BenchmarkBase with BenchmarkWithScope {
+class ChainSingletonBenchmark extends BenchmarkBase {
+  final DIAdapter di;
   final int chainCount;
   final int nestingDepth;
 
-  ChainSingletonBenchmark({
+  ChainSingletonBenchmark(
+    this.di, {
     this.chainCount = 1,
     this.nestingDepth = 3,
   }) : super(
@@ -73,7 +76,7 @@ class ChainSingletonBenchmark extends BenchmarkBase with BenchmarkWithScope {
 
   @override
   void setup() {
-    setupScope([
+    di.setupModules([
       ChainSingletonModule(
         chainCount: chainCount,
         nestingDepth: nestingDepth,
@@ -82,12 +85,12 @@ class ChainSingletonBenchmark extends BenchmarkBase with BenchmarkWithScope {
   }
 
   @override
-  void teardown() => teardownScope();
+  void teardown() => di.teardown();
 
   @override
   void run() {
     final serviceName = '${chainCount.toString()}_${nestingDepth.toString()}';
-    scope.resolve<Service>(named: serviceName);
+    di.resolve<Service>(named: serviceName);
   }
 }
 
@@ -129,11 +132,13 @@ class ChainFactoryModule extends Module {
   }
 }
 
-class ChainFactoryBenchmark extends BenchmarkBase with BenchmarkWithScope {
+class ChainFactoryBenchmark extends BenchmarkBase {
+  final DIAdapter di;
   final int chainCount;
   final int nestingDepth;
 
-  ChainFactoryBenchmark({
+  ChainFactoryBenchmark(
+    this.di, {
     this.chainCount = 1,
     this.nestingDepth = 3,
   }) : super(
@@ -143,7 +148,7 @@ class ChainFactoryBenchmark extends BenchmarkBase with BenchmarkWithScope {
 
   @override
   void setup() {
-    setupScope([
+    di.setupModules([
       ChainFactoryModule(
         chainCount: chainCount,
         nestingDepth: nestingDepth,
@@ -152,12 +157,12 @@ class ChainFactoryBenchmark extends BenchmarkBase with BenchmarkWithScope {
   }
 
   @override
-  void teardown() => teardownScope();
+  void teardown() => di.teardown();
 
   @override
   void run() {
     final serviceName = '${chainCount.toString()}_${nestingDepth.toString()}';
-    scope.resolve<Service>(named: serviceName);
+    di.resolve<Service>(named: serviceName);
   }
 }
 
@@ -174,20 +179,21 @@ class NamedModule extends Module {
   }
 }
 
-class NamedResolveBenchmark extends BenchmarkBase with BenchmarkWithScope {
+class NamedResolveBenchmark extends BenchmarkBase {
-  NamedResolveBenchmark() : super('NamedResolve (by name)');
+  final DIAdapter di;
+
+  NamedResolveBenchmark(this.di) : super('NamedResolve (by name)');
 
   @override
   void setup() {
-    setupScope([NamedModule()]);
+    di.setupModules([NamedModule()]);
   }
 
   @override
-  void teardown() => teardownScope();
+  void teardown() => di.teardown();
 
   @override
   void run() {
-    // Switch name for comparison
+    di.resolve<Object>(named: 'impl2');
-    scope.resolve<Object>(named: 'impl2');
   }
 }

benchmark_cherrypick/lib/di_adapter.dart

@@ -0,0 +1,78 @@
+import 'package:cherrypick/cherrypick.dart';
+
+abstract class DIAdapter {
+  void setupModules(List<Module> modules);
+  T resolve<T>({String? named});
+  Future<T> resolveAsync<T>({String? named});
+  void teardown();
+  DIAdapter openSubScope(String name);
+}
+
+class CherrypickDIAdapter implements DIAdapter {
+  Scope? _scope;
+
+  @override
+  void setupModules(List<Module> modules) {
+    _scope = CherryPick.openRootScope();
+    _scope!.installModules(modules);
+  }
+
+  @override
+  T resolve<T>({String? named}) {
+    return named == null
+      ? _scope!.resolve<T>()
+      : _scope!.resolve<T>(named: named);
+  }
+
+  @override
+  Future<T> resolveAsync<T>({String? named}) async {
+    return named == null
+      ? await _scope!.resolveAsync<T>()
+      : await _scope!.resolveAsync<T>(named: named);
+  }
+
+  @override
+  void teardown() {
+    CherryPick.closeRootScope();
+    _scope = null;
+  }
+
+  @override
+  CherrypickDIAdapter openSubScope(String name) {
+    final sub = _scope!.openSubScope(name);
+    return _CherrypickSubScopeAdapter(sub);
+  }
+}
+
+class _CherrypickSubScopeAdapter extends CherrypickDIAdapter {
+  final Scope _subScope;
+  _CherrypickSubScopeAdapter(this._subScope);
+  @override
+  void setupModules(List<Module> modules) {
+    _subScope.installModules(modules);
+  }
+
+  @override
+  T resolve<T>({String? named}) {
+    return named == null
+      ? _subScope.resolve<T>()
+      : _subScope.resolve<T>(named: named);
+  }
+
+  @override
+  Future<T> resolveAsync<T>({String? named}) async {
+    return named == null
+      ? await _subScope.resolveAsync<T>()
+      : await _subScope.resolveAsync<T>(named: named);
+  }
+
+  @override
+  void teardown() {
+    // subScope teardown убирать отдельно не требуется
+  }
+
+  @override
+  CherrypickDIAdapter openSubScope(String name) {
+    return _CherrypickSubScopeAdapter(_subScope.openSubScope(name));
+  }
+}

benchmark_cherrypick/lib/scope_override_benchmark.dart

@@ -1,7 +1,8 @@
 // ignore: depend_on_referenced_packages
+import 'package:benchmark_cherrypick/di_adapter.dart';
+// ignore: depend_on_referenced_packages
 import 'package:benchmark_harness/benchmark_harness.dart';
 import 'package:cherrypick/cherrypick.dart';
-import 'benchmark_utils.dart';
 
 class Shared {}
 
@@ -23,26 +24,26 @@ class ChildOverrideModule extends Module {
   }
 }
 
-class ScopeOverrideBenchmark extends BenchmarkBase with BenchmarkWithScope {
+class ScopeOverrideBenchmark extends BenchmarkBase {
-  ScopeOverrideBenchmark() : super('ScopeOverride (child overrides parent)');
+  final DIAdapter di;
-  late Scope child;
+  late DIAdapter childDi;
+
+  ScopeOverrideBenchmark(this.di) : super('ScopeOverride (child overrides parent)');
 
   @override
   void setup() {
-    setupScope([ParentModule()]);
+    di.setupModules([ParentModule()]);
-    child = scope.openSubScope('child');
+    childDi = di.openSubScope('child');
-    child.installModules([ChildOverrideModule()]);
+    childDi.setupModules([ChildOverrideModule()]);
   }
 
   @override
-  void teardown() {
+  void teardown() => di.teardown();
-    teardownScope();
-  }
 
   @override
   void run() {
-    // Должен возвращать ChildImpl, а не ParentImpl
+    // Should return ChildImpl, not ParentImpl
-    final resolved = child.resolve<Shared>();
+    final resolved = childDi.resolve<Shared>();
     assert(resolved is ChildImpl);
   }
 }