Merge branch 'main' of github.com:microsoft/gctoolkit into 316

Fixes DateTimeStamp
microsoft · Feb 22, 2024 · 15a86b9 · 15a86b9
2 parents f7efb6e + 26e08f2
commit 15a86b9
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/api/src/main/java/com/microsoft/gctoolkit/event/generational/ConcurrentModeFailure.java b/api/src/main/java/com/microsoft/gctoolkit/event/generational/ConcurrentModeFailure.java
@@ -6,7 +6,7 @@
 import com.microsoft.gctoolkit.event.GarbageCollectionTypes;
 import com.microsoft.gctoolkit.time.DateTimeStamp;
 
-public class ConcurrentModeFailure extends FullGC {
+public class ConcurrentModeFailure extends FullGC implements CMSPhase {
 
     public ConcurrentModeFailure(DateTimeStamp timeStamp, GCCause cause, double duration) {
         super(timeStamp, GarbageCollectionTypes.ConcurrentModeFailure, cause, duration);

diff --git a/api/src/main/java/com/microsoft/gctoolkit/event/generational/ConcurrentModeInterrupted.java b/api/src/main/java/com/microsoft/gctoolkit/event/generational/ConcurrentModeInterrupted.java
@@ -6,7 +6,7 @@
 import com.microsoft.gctoolkit.event.GarbageCollectionTypes;
 import com.microsoft.gctoolkit.time.DateTimeStamp;
 
-public class ConcurrentModeInterrupted extends FullGC {
+public class ConcurrentModeInterrupted extends FullGC implements CMSPhase {
 
     public ConcurrentModeInterrupted(DateTimeStamp timeStamp, GarbageCollectionTypes type, GCCause cause, double duration) {
         super(timeStamp, type, cause, duration);

diff --git a/parser/src/main/java/com/microsoft/gctoolkit/parser/G1GCForwardReference.java b/parser/src/main/java/com/microsoft/gctoolkit/parser/G1GCForwardReference.java
@@ -32,7 +32,6 @@
 import com.microsoft.gctoolkit.parser.jvm.Decorators;
 import com.microsoft.gctoolkit.time.DateTimeStamp;
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
@@ -43,17 +42,17 @@ class G1GCForwardReference extends ForwardReference {
 
     private static final Logger LOGGER = Logger.getLogger(G1GCForwardReference.class.getName());
 
-    private static int heapRegionSize = 0;
-    private static long minHeapSize;
-    private static long initialHeapSize;
-    private static long maxHeapSize;
+    private int heapRegionSize = 0;
+    private long minHeapSize;
+    private long initialHeapSize;
+    private long maxHeapSize;
     private DateTimeStamp concurrentCycleStartTime;
 
-    static void setHeapRegionSize(int sizeInMegaBytes) {
+    void setHeapRegionSize(int sizeInMegaBytes) {
         heapRegionSize = sizeInMegaBytes;
     }
 
-    static int getHeapRegionSize() {
+    int getHeapRegionSize() {
         return heapRegionSize;
     }
 
@@ -70,27 +69,27 @@ boolean isConcurrentCycle() {
     }
 
     //bag of stuff to maybe eliminate
-    static void setMinHeapSize(long minHeapSize) {
-        G1GCForwardReference.minHeapSize = minHeapSize;
+    void setMinHeapSize(long minHeapSize) {
+        this.minHeapSize = minHeapSize;
     }
 
-    static long getMinHeapSize() {
+    long getMinHeapSize() {
         return minHeapSize;
     }
 
-    static void setInitialHeapSize(long initialHeapSize) {
-        G1GCForwardReference.initialHeapSize = initialHeapSize;
+    void setInitialHeapSize(long initialHeapSize) {
+        this.initialHeapSize = initialHeapSize;
     }
 
-    static long getInitialHeapSize() {
+    long getInitialHeapSize() {
         return initialHeapSize;
     }
 
-    static void setMaxHeapSize(long maxHeapSize) {
-        G1GCForwardReference.maxHeapSize = maxHeapSize;
+    void setMaxHeapSize(long maxHeapSize) {
+        this.maxHeapSize = maxHeapSize;
     }
 
-    static long getMaxHeapSize() {
+    long getMaxHeapSize() {
         return maxHeapSize;
     }
 

diff --git a/parser/src/main/java/com/microsoft/gctoolkit/parser/UnifiedG1GCParser.java b/parser/src/main/java/com/microsoft/gctoolkit/parser/UnifiedG1GCParser.java
@@ -219,6 +219,10 @@ private void applyRule(GCParseRule ruleToApply, GCLogTrace trace, String line) {
     private void setForwardReference(int gcid, String line) {
         if (gcid != -1) {
             forwardReference = collectionsUnderway.computeIfAbsent(gcid, k -> new G1GCForwardReference(new Decorators(line), gcid));
+            forwardReference.setHeapRegionSize(regionSize);
+            forwardReference.setMaxHeapSize(maxHeapSize);
+            forwardReference.setMinHeapSize(minHeapSize);
+            forwardReference.setInitialHeapSize(initialHeapSize);
         }
     }
 
@@ -280,22 +284,25 @@ private void heapSummary(GCLogTrace trace, String line) {
     //Minimum heap 8388608  Initial heap 268435456  Maximum heap 268435456
     //these values go back to the JavaVirtualMachine..
     public void heapSize(GCLogTrace trace, String line) {
-        G1GCForwardReference.setMinHeapSize(trace.getLongGroup(1));
-        G1GCForwardReference.setInitialHeapSize(trace.getLongGroup(2));
-        G1GCForwardReference.setMaxHeapSize(trace.getLongGroup(3));
+        this.minHeapSize = trace.getLongGroup(1);
+        this.initialHeapSize = trace.getLongGroup(2);
+        this.maxHeapSize = trace.getLongGroup(3);
     }
 
     //return to JVM
     private int regionSize = 0; //region size in Gigabytes
+    private long minHeapSize = 0;
+    private long initialHeapSize = 0;
+    private long maxHeapSize = 0;
 
     public void heapRegionSize(GCLogTrace trace, String line) {
         regionSize = trace.getIntegerGroup(1);
-        G1GCForwardReference.setHeapRegionSize(regionSize);
     }
 
     //[15.316s][debug][gc,heap      ] GC(0)   region size 1024K, 24 young (24576K), 0 survivors (0K)
     //ignore this logging for now
     private void youngRegionAllotment(GCLogTrace trace, String line) {
+        forwardReference.setHeapRegionSize(trace.getIntegerGroup(1) / 1024);
         if (before) {
             forwardReference.setYoungOccupancyBeforeCollection(trace.getLongGroup(3));
             forwardReference.setSurvivorOccupancyBeforeCollection(trace.getLongGroup(5));

diff --git a/pom.xml b/pom.xml
@@ -56,9 +56,9 @@
 
     <properties>
         <revision>3.0.3-SNAPSHOT</revision>
-        <checkstyle.version>10.12.6</checkstyle.version>
-        <jreleaser.plugin.version>1.9.0</jreleaser.plugin.version>
-        <junit5.version>5.10.1</junit5.version>
+        <checkstyle.version>10.13.0</checkstyle.version>
+        <jreleaser.plugin.version>1.10.0</jreleaser.plugin.version>
+        <junit5.version>5.10.2</junit5.version>
         <maven.antrun-plugin.version>3.1.0</maven.antrun-plugin.version>
         <maven.changes-plugin.version>2.12.1</maven.changes-plugin.version>
         <maven.checkstyle-plugin.version>3.3.1</maven.checkstyle-plugin.version>
@@ -74,18 +74,18 @@
         <maven.jacoco-plugin.version>0.8.11</maven.jacoco-plugin.version>
         <maven.jar-plugin.version>3.3.0</maven.jar-plugin.version>
         <maven.javadoc-plugin.version>3.6.3</maven.javadoc-plugin.version>
-        <maven.jxr-plugin.version>3.3.1</maven.jxr-plugin.version>
-        <maven.license-plugin.version>2.3.0</maven.license-plugin.version>
+        <maven.jxr-plugin.version>3.3.2</maven.jxr-plugin.version>
+        <maven.license-plugin.version>2.4.0</maven.license-plugin.version>
         <maven.pmd-plugin.version>3.21.2</maven.pmd-plugin.version>
         <maven.project-info-reports-plugin.version>3.5.0</maven.project-info-reports-plugin.version>
-        <maven.rat-plugin.version>0.15</maven.rat-plugin.version>
+        <maven.rat-plugin.version>0.16.1</maven.rat-plugin.version>
         <maven.resources-plugin.version>3.3.1</maven.resources-plugin.version>
         <maven.site-plugin.version>4.0.0-M13</maven.site-plugin.version>
         <maven.source-plugin.version>3.3.0</maven.source-plugin.version>
-        <maven.spotbugs-plugin.version>4.8.2.0</maven.spotbugs-plugin.version>
-        <maven.surefire-plugin.version>3.2.3</maven.surefire-plugin.version>
+        <maven.spotbugs-plugin.version>4.8.3.0</maven.spotbugs-plugin.version>
+        <maven.surefire-plugin.version>3.2.5</maven.surefire-plugin.version>
         <maven.version>3.9.6</maven.version>
-        <maven.versions-plugin.version>2.16.1</maven.versions-plugin.version>
+        <maven.versions-plugin.version>2.16.2</maven.versions-plugin.version>
         <mutability.detector.version>0.9.1</mutability.detector.version>
         <pmd.version>6.55.0</pmd.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -497,7 +497,6 @@
             <plugin>
                 <groupId>org.hjug.refactorfirst.plugin</groupId>
                 <artifactId>refactor-first-maven-plugin</artifactId>
-                <version>0.4.0</version>
             </plugin>
         </plugins>
     </reporting>

diff --git a/vertx/pom.xml b/vertx/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-core</artifactId>
-            <version>4.5.1</version>
+            <version>4.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>