Minor code refactors.

Author: jovanstevanovic

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/JFRFileParser.java

@@ -33,6 +33,7 @@
 import java.util.HashMap;
 
 import com.oracle.svm.core.jfr.JfrChunkWriter;
+import com.oracle.svm.core.jfr.JfrTicks;
 import com.oracle.svm.core.jfr.JfrTypes;
 
 import com.oracle.svm.test.jfr.utils.poolparsers.ClassConstantPoolParser;
@@ -41,7 +42,6 @@
 import com.oracle.svm.test.jfr.utils.poolparsers.FrameTypeConstantPoolParser;
 import com.oracle.svm.test.jfr.utils.poolparsers.MethodConstantPoolParser;
 import com.oracle.svm.test.jfr.utils.poolparsers.ModuleConstantPoolParser;
-import com.oracle.svm.test.jfr.utils.poolparsers.NotFoundConstantPoolParser;
 import com.oracle.svm.test.jfr.utils.poolparsers.PackageConstantPoolParser;
 import com.oracle.svm.test.jfr.utils.poolparsers.StacktraceConstantPoolParser;
 import com.oracle.svm.test.jfr.utils.poolparsers.SymbolConstantPoolParser;
@@ -53,12 +53,10 @@
 
 public class JFRFileParser {
 
-    private static final NotFoundConstantPoolParser notFoundConstantPoolParser;
     private static final HashMap<Long, ConstantPoolParser> supportedConstantPools;
 
     static {
         supportedConstantPools = new HashMap<>();
-        notFoundConstantPoolParser = new NotFoundConstantPoolParser();
 
         supportedConstantPools.put(JfrTypes.Class.getId(), new ClassConstantPoolParser());
         supportedConstantPools.put(JfrTypes.ClassLoader.getId(), new ClassLoaderConstantPoolParser());
@@ -90,14 +88,16 @@ private static Positions parserFileHeader(RecordingInput input) throws IOExcepti
         long constantPoolPosition = input.readRawLong();
         assertTrue("Constant pool positions is invalid!", constantPoolPosition > 0);
         long metadataPosition = input.readRawLong();
-        assertTrue("Metadata positions is equals to null!", metadataPosition > 0);
+        assertTrue("Metadata positions is null!", metadataPosition != 0);
 
-        assertTrue("Starting time is invalid!", input.readRawLong() > 0); // Starting time.
+        long startingTime = input.readRawLong();
+        assertTrue("Starting time is invalid!", startingTime > 0); // Starting time.
+        Assert.assertTrue("Starting time is bigger than current time!", startingTime < JfrTicks.currentTimeNanos());
         input.readRawLong(); // Duration.
         assertTrue("Chunk start tick is invalid!", input.readRawLong() > 0); // ChunkStartTick.
         assertTrue("Tick frequency is invalid!", input.readRawLong() > 0); // Tick frequency.
         int shouldUseCompressedInt = input.readRawInt();
-        assertTrue("Compressed int can be either 0 or 1!", shouldUseCompressedInt == 0 || shouldUseCompressedInt == 1); // ChunkWriteTick.
+        assertTrue("Compressed int must be either 0 or 1!", shouldUseCompressedInt == 0 || shouldUseCompressedInt == 1); // ChunkWriteTick.
 
         return new Positions(constantPoolPosition, metadataPosition);
     }
@@ -116,12 +116,12 @@ private static void parseMetadata(RecordingInput input, long metadataPosition) t
         MetadataDescriptor.read(input);
     }
 
-    private static long parseConstantPoolsHeader(RecordingInput input, long constantPoolPosition) throws IOException {
+    private static long parseConstantPoolHeader(RecordingInput input, long constantPoolPosition) throws IOException {
         input.position(constantPoolPosition); // Seek to starting position of constant pools.
-        assertTrue("Constant pool size is invalid!", input.readInt() > 0); // Size of constant
-                                                                           // pools.
-        assertEquals(JfrChunkWriter.CONSTANT_POOL_TYPE_ID, input.readLong()); // Constant pools
-                                                                              // region ID.
+        // Size of constant pools.
+        assertTrue("Constant pool size is invalid!", input.readInt() > 0);
+        // Constant pools region ID.
+        assertEquals(JfrChunkWriter.CONSTANT_POOL_TYPE_ID, input.readLong());
         assertTrue("Constant pool timestamp is invalid!", input.readLong() > 0); // Timestamp.
         input.readLong(); // Duration.
         long deltaNext = input.readLong(); // Offset to a next constant pools region.
@@ -131,29 +131,30 @@ private static long parseConstantPoolsHeader(RecordingInput input, long constant
 
     private static void compareFoundAndExceptedIds() {
         for (ConstantPoolParser parser : supportedConstantPools.values()) {
-            Assert.assertTrue("Number of expected IDs are not equals to the number of found during parsing " +
-                            "of " + parser + " constant pool!", parser.compare());
+            parser.compareFoundAndExceptedIds();
         }
     }
 
-    private static void parseConstantPools(RecordingInput input, long constantPoolPosition) throws IOException {
-        long deltaNext = parseConstantPoolsHeader(input, constantPoolPosition);
-        long numberOfCPs = input.readInt();
-        for (int i = 0; i < numberOfCPs; i++) {
-            supportedConstantPools.getOrDefault(input.readLong(), notFoundConstantPoolParser).parse(input);
-        }
-
-        compareFoundAndExceptedIds();
-
-        if (deltaNext != 0) {
-            parseConstantPools(input, constantPoolPosition + deltaNext);
-        }
+    private static void verifyConstantPools(RecordingInput input, long constantPoolPosition) throws IOException {
+        long deltaNext;
+        long currentConstantPoolPosition = constantPoolPosition;
+        do {
+            deltaNext = parseConstantPoolHeader(input, currentConstantPoolPosition);
+            long numberOfCPs = input.readInt();
+            for (int i = 0; i < numberOfCPs; i++) {
+                ConstantPoolParser constantPoolParser = supportedConstantPools.get(input.readLong());
+                Assert.assertNotNull("Unknown constant pool!", constantPoolParser);
+                constantPoolParser.parse(input);
+            }
+            compareFoundAndExceptedIds();
+            currentConstantPoolPosition += deltaNext;
+        } while (deltaNext != 0);
     }
 
     public static void parse(Recording recording) throws IOException {
         RecordingInput input = new RecordingInput(recording.getDestination().toFile());
         Positions positions = parserFileHeader(input);
-        parseConstantPools(input, positions.getConstantPoolPosition());
+        verifyConstantPools(input, positions.getConstantPoolPosition());
         parseMetadata(input, positions.getMetadataPosition());
     }
 

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ClassConstantPoolParser.java

@@ -41,9 +41,9 @@ public void parse(RecordingInput input) throws IOException {
         int numberOfClasses = input.readInt();
         for (int i = 0; i < numberOfClasses; i++) {
             addFoundId(input.readLong()); // ClassId.
-            addExpectedId(JfrTypes.ClassLoader.getId(), input.readLong()); // ClassLoaderId.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // ClassName.
-            addExpectedId(JfrTypes.Package.getId(), input.readLong()); // PackageId.
+            addExpectedId(JfrTypes.ClassLoader, input.readLong()); // ClassLoaderId.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // ClassName.
+            addExpectedId(JfrTypes.Package, input.readLong()); // PackageId.
             Assert.assertTrue("Modifier value is not correct!", input.readLong() >= 0); // Modifier.
             if (JavaVersionUtil.JAVA_SPEC >= 17) {
                 input.readBoolean(); // IsHiddenClass.

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ClassLoaderConstantPoolParser.java

@@ -38,8 +38,8 @@ public void parse(RecordingInput input) throws IOException {
         int numberOfClassLoaders = input.readInt();
         for (int i = 0; i < numberOfClassLoaders; i++) {
             addFoundId(input.readLong()); // ClassLoaderId.
-            addExpectedId(JfrTypes.Class.getId(), input.readLong()); // ClassId.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // ClassLoaderName.
+            addExpectedId(JfrTypes.Class, input.readLong()); // ClassId.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // ClassLoaderName.
         }
     }
 }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ConstantPoolParser.java

@@ -30,8 +30,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.oracle.svm.core.jfr.JfrTypes;
 import com.oracle.svm.test.jfr.utils.JFRFileParser;
 import com.oracle.svm.test.jfr.utils.RecordingInput;
+import org.junit.Assert;
 
 public abstract class ConstantPoolParser {
 
@@ -53,18 +55,17 @@ protected final void addFoundId(long id) {
         foundIds.add(id);
     }
 
-    protected static void addExpectedId(long typeId, long id) {
-        ConstantPoolParser poolParser = JFRFileParser.getSupportedConstantPools().get(typeId);
+    protected static void addExpectedId(JfrTypes typeId, long id) {
+        ConstantPoolParser poolParser = JFRFileParser.getSupportedConstantPools().get(typeId.getId());
         poolParser.expectedIds.add(id);
     }
 
-    public boolean compare() {
-        return foundIds.size() == 0 || foundIds.containsAll(expectedIds);
+    public void compareFoundAndExceptedIds() {
+        Assert.assertTrue("Error during parsing " + this + " constant pool!" +
+                        " Expected IDs: " + expectedIds +
+                        ". Found IDs: " + foundIds, foundIds.size() == 0 || foundIds.containsAll(expectedIds));
     }
 
-    /**
-     * Parse the constant pool, beginning for {@code input} position.
-     */
     public abstract void parse(RecordingInput input) throws IOException;
 
     @Override

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/MethodConstantPoolParser.java

@@ -39,9 +39,9 @@ public void parse(RecordingInput input) throws IOException {
         int numberOfMethods = input.readInt();
         for (int i = 0; i < numberOfMethods; i++) {
             addFoundId(input.readLong()); // MethodId.
-            addExpectedId(JfrTypes.Class.getId(), input.readLong()); // ClassId.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // MethodName.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // Descriptor.
+            addExpectedId(JfrTypes.Class, input.readLong()); // ClassId.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // MethodName.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // Descriptor.
             Assert.assertTrue("Modifier value is not correct!", input.readInt() >= 0); // Modifier.
             input.readBoolean(); // Hidden.
         }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ModuleConstantPoolParser.java

@@ -38,10 +38,10 @@ public void parse(RecordingInput input) throws IOException {
         int numberOfModules = input.readInt();
         for (int i = 0; i < numberOfModules; i++) {
             addFoundId(input.readLong()); // ModuleId.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // ModuleName.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // Version.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // Location.
-            addExpectedId(JfrTypes.ClassLoader.getId(), input.readLong()); // ClassLoaderId.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // ModuleName.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // Version.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // Location.
+            addExpectedId(JfrTypes.ClassLoader, input.readLong()); // ClassLoaderId.
         }
     }
 }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/NotFoundConstantPoolParser.java

@@ -38,8 +38,8 @@ public void parse(RecordingInput input) throws IOException {
         int numberOfPackages = input.readInt();
         for (int i = 0; i < numberOfPackages; i++) {
             addFoundId(input.readLong()); // PackageId.
-            addExpectedId(JfrTypes.Symbol.getId(), input.readLong()); // PackageName.
-            addExpectedId(JfrTypes.Module.getId(), input.readLong()); // ModuleId.
+            addExpectedId(JfrTypes.Symbol, input.readLong()); // PackageName.
+            addExpectedId(JfrTypes.Module, input.readLong()); // ModuleId.
             input.readBoolean(); // IsExported.
         }
     }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/PackageConstantPoolParser.java

@@ -41,10 +41,10 @@ public void parse(RecordingInput input) throws IOException {
             input.readBoolean(); // IsTruncated.
             int stackTraceSize = input.readInt(); // StackFrameSize.
             for (int j = 0; j < stackTraceSize; j++) {
-                addExpectedId(JfrTypes.Method.getId(), input.readLong()); // MethodId.
+                addExpectedId(JfrTypes.Method, input.readLong()); // MethodId.
                 input.readInt(); // LineNumber.
                 input.readInt(); // Bci.
-                addExpectedId(JfrTypes.FrameType.getId(), input.readLong()); // FrameTypeId.
+                addExpectedId(JfrTypes.FrameType, input.readLong()); // FrameTypeId.
             }
         }
     }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/StacktraceConstantPoolParser.java

@@ -43,7 +43,7 @@ public void parse(RecordingInput input) throws IOException {
             Assert.assertTrue("OSThreadId is not correct!", input.readLong() >= 0); // OSThreadId.
             input.readUTF(); // JavaThreadName.
             Assert.assertTrue("JavaThreadId is not correct!", input.readLong() >= 0); // JavaThreadId.
-            addExpectedId(JfrTypes.ThreadGroup.getId(), input.readLong()); // ThreadGroupId.
+            addExpectedId(JfrTypes.ThreadGroup, input.readLong()); // ThreadGroupId.
         }
     }
 }