Clean up ack handling, fix test

dart-archive · Jan 22, 2024 · 3010760 · 3010760
1 parent 8a2c57f
commit 3010760
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/lib/src/benchmark_base_perf.dart b/lib/src/benchmark_base_perf.dart
@@ -27,20 +27,7 @@ class BenchmarkBase extends base.BenchmarkBase {
       if (perfControlAck != null) {
         openedAck = File(perfControlAck!).openSync();
         openedFifo.writeStringSync('enable\n');
-
-        var ack = <int>[...openedAck.readSync(4)];
-        while (ack.length < 4) {
-          ack.addAll(openedAck.readSync(4 - ack.length));
-          print('reading $ack');
-        }
-        if (String.fromCharCodes(ack) != 'ack\n') {
-          print('Ack was $ack');
-        }
-        /*  var ackLength = 0;
-        while (ackLength < 4) {
-          ackLength += openedAck.readSync(4 - ackLength).length;
-          print('reading $ackLength');
-        }*/
+        waitForAck();
       } else {
         openedFifo.writeStringSync('enable\n');
       }
@@ -52,8 +39,22 @@ class BenchmarkBase extends base.BenchmarkBase {
     if (perfControlFifo != null) {
       openedFifo.writeStringSync('disable\n');
       openedFifo.closeSync();
+      if (perfControlAck != null) {
+        waitForAck();
+        openedAck.closeSync();
+      }
       emitter.emit('$name.totalIterations', totalIterations.toDouble());
     }
-    // TODO: await ack.
+  }
+
+  void waitForAck() {
+    var ack = <int>[...openedAck.readSync(4)];
+    while (ack.length < 4) {
+      ack.addAll(openedAck.readSync(4 - ack.length));
+      print('reading $ack');
+    }
+    if (String.fromCharCodes(ack) != 'ack\n') {
+      print('Ack was $ack');
+    }
   }
 }
diff --git a/test/result_emitter_test.dart b/test/result_emitter_test.dart
@@ -20,7 +20,7 @@ class MockResultEmitter extends ScoreEmitter {
 
 // Create a new benchmark which has an emitter.
 class BenchmarkWithResultEmitter extends BenchmarkBase {
-  const BenchmarkWithResultEmitter(ScoreEmitter emitter)
+  BenchmarkWithResultEmitter(ScoreEmitter emitter)
       : super('Template', emitter: emitter);
 
   @override