Tweaks

Author: Gabriel-Darbord

src/main/java/fr/bl/drit/flow/agent/BinaryThreadRecorder.java

@@ -245,7 +245,7 @@ protected void writeVarInt(long value) throws IOException {
    * @param value The positive integer to encode
    * @throws IOException If an I/O error occurs when writing to file.
    */
-  protected void writeFlagAndVarInt(int flag, long value) throws IOException {
+  protected void writeFlagAndVarInt(byte flag, long value) throws IOException {
     // Extract lowest 6 bits for first byte
     int firstPayload = (int) (value & M_PACK_PAYLOAD); // 6 bits
     value >>>= 6;

src/main/java/fr/bl/drit/flow/agent/FlowAdvice.java

@@ -4,8 +4,8 @@
 import net.bytebuddy.asm.Advice;
 
 /**
- * Contains the enter and exit {@link net.bytebuddy.asm.Advice Advice} methods. Their code is
- * inserted at the start and end of instrumented methods, respectively.
+ * Contains the enter and exit {@link Advice} methods. Their code is inserted at the start and end
+ * of instrumented methods, respectively.
  */
 public final class FlowAdvice {
 

src/main/java/fr/bl/drit/flow/agent/Recorder.java

@@ -5,6 +5,7 @@
 
 /** Specifies a recorder that is used to record flow data. */
 public interface Recorder extends Closeable {
+
   /**
    * Emit a method enter event with the given method ID.
    *

src/main/java/fr/bl/drit/flow/agent/ThreadLocalRecorder.java

@@ -2,20 +2,20 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Queue;
+import java.util.Collection;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /** A recorder that orchestrates per-thread recorders. */
 public final class ThreadLocalRecorder implements Recorder {
 
   private final ThreadLocal<ThreadRecorder> local;
-  private final Queue<ThreadRecorder> all = new ConcurrentLinkedQueue<>();
+  private final Collection<ThreadRecorder> all = new ConcurrentLinkedQueue<>();
 
   /**
    * @param factory Responsible for creating {@link ThreadRecorder}s
    * @param outputDir Path to the output directory
    */
-  public ThreadLocalRecorder(ThreadRecorderFactory factory, Path outputDir) {
+  public ThreadLocalRecorder(final ThreadRecorderFactory factory, final Path outputDir) {
     this.local =
         ThreadLocal.withInitial(
             () -> {

src/test/java/fr/bl/drit/flow/agent/BinaryThreadRecorderTest.java

@@ -99,28 +99,42 @@ private static Object[] readFlagAndVarInt(InputStream in) throws IOException {
   }
 
   @Test
-  public void testWriteVarInt_smallValues() throws Exception {
+  public void testWriteVarInt_noContinuation() throws Exception {
     String outputPath = null;
     try (BinaryThreadRecorder rec = new BinaryThreadRecorder(tempDir)) {
       outputPath = rec.getFileName();
       rec.writeVarInt(0L);
       rec.writeVarInt(1L);
       rec.writeVarInt(127L);
-      rec.writeVarInt(128L);
-      rec.writeVarInt(300L);
-      rec.writeVarInt(Long.MAX_VALUE);
     }
 
     byte[] actual = Files.readAllBytes(tempDir.resolve(outputPath));
 
     byte[] e0 = leb128Expected(0L); // 00
     byte[] e1 = leb128Expected(1L); // 01
     byte[] e127 = leb128Expected(127L); // 7F
+
+    byte[] expected = concat(e0, e1, e127);
+    assertBytesEquals(expected, actual);
+  }
+
+  @Test
+  public void testWriteVarInt_withContinuation() throws Exception {
+    String outputPath = null;
+    try (BinaryThreadRecorder rec = new BinaryThreadRecorder(tempDir)) {
+      outputPath = rec.getFileName();
+      rec.writeVarInt(128L);
+      rec.writeVarInt(300L);
+      rec.writeVarInt(Long.MAX_VALUE);
+    }
+
+    byte[] actual = Files.readAllBytes(tempDir.resolve(outputPath));
+
     byte[] e128 = leb128Expected(128L); // 80 01
     byte[] e300 = leb128Expected(300L); // AC 02
     byte[] eMax = leb128Expected(Long.MAX_VALUE);
 
-    byte[] expected = concat(e0, e1, e127, e128, e300, eMax);
+    byte[] expected = concat(e128, e300, eMax);
     assertBytesEquals(expected, actual);
   }