Merge pull request #2021 from SAP/pr-jdk-25+33

Merge to tag jdk-25+33

Author: RealCLanger

src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

@@ -1452,27 +1452,23 @@ void ShenandoahHeap::print_heap_regions_on(outputStream* st) const {
   }
 }
 
-size_t ShenandoahHeap::trash_humongous_region_at(ShenandoahHeapRegion* start) {
+size_t ShenandoahHeap::trash_humongous_region_at(ShenandoahHeapRegion* start) const {
   assert(start->is_humongous_start(), "reclaim regions starting with the first one");
-
-  oop humongous_obj = cast_to_oop(start->bottom());
-  size_t size = humongous_obj->size();
-  size_t required_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
-  size_t index = start->index() + required_regions - 1;
-
   assert(!start->has_live(), "liveness must be zero");
 
-  for(size_t i = 0; i < required_regions; i++) {
-    // Reclaim from tail. Otherwise, assertion fails when printing region to trace log,
-    // as it expects that every region belongs to a humongous region starting with a humongous start region.
-    ShenandoahHeapRegion* region = get_region(index --);
-
-    assert(region->is_humongous(), "expect correct humongous start or continuation");
+  // Do not try to get the size of this humongous object. STW collections will
+  // have already unloaded classes, so an unmarked object may have a bad klass pointer.
+  ShenandoahHeapRegion* region = start;
+  size_t index = region->index();
+  do {
+    assert(region->is_humongous(), "Expect correct humongous start or continuation");
     assert(!region->is_cset(), "Humongous region should not be in collection set");
-
     region->make_trash_immediate();
-  }
-  return required_regions;
+    region = get_region(++index);
+  } while (region != nullptr && region->is_humongous_continuation());
+
+  // Return number of regions trashed
+  return index - start->index();
 }
 
 class ShenandoahCheckCleanGCLABClosure : public ThreadClosure {

src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp

@@ -828,7 +828,7 @@ class ShenandoahHeap : public CollectedHeap {
   static inline void atomic_clear_oop(narrowOop* addr,       oop compare);
   static inline void atomic_clear_oop(narrowOop* addr, narrowOop compare);
 
-  size_t trash_humongous_region_at(ShenandoahHeapRegion *r);
+  size_t trash_humongous_region_at(ShenandoahHeapRegion *r) const;
 
   static inline void increase_object_age(oop obj, uint additional_age);
 

src/java.base/share/classes/java/io/File.java

@@ -1134,15 +1134,9 @@ public File[] listFiles() {
         if (ss == null) return null;
         int n = ss.length;
         File[] fs = new File[n];
-        if (path.isEmpty()) {
-            for (int i = 0; i < n; i++) {
-                fs[i] = new File(ss[i]);
-            }
-        } else {
-            for (int i = 0; i < n; i++) {
-                fs[i] = new File(ss[i], this);
-            }
-        }
+        boolean isEmpty = path.isEmpty();
+        for (int i = 0; i < n; i++)
+            fs[i] = isEmpty ? new File(ss[i]) : new File(ss[i], this);
         return fs;
     }
 
@@ -1175,9 +1169,10 @@ public File[] listFiles(FilenameFilter filter) {
         String[] ss = normalizedList();
         if (ss == null) return null;
         ArrayList<File> files = new ArrayList<>();
+        boolean isEmpty = path.isEmpty();
         for (String s : ss)
             if ((filter == null) || filter.accept(this, s))
-                files.add(new File(s, this));
+                files.add(isEmpty ? new File(s) : new File(s, this));
         return files.toArray(new File[files.size()]);
     }
 
@@ -1208,8 +1203,9 @@ public File[] listFiles(FileFilter filter) {
         String[] ss = normalizedList();
         if (ss == null) return null;
         ArrayList<File> files = new ArrayList<>();
+        boolean isEmpty = path.isEmpty();
         for (String s : ss) {
-            File f = new File(s, this);
+            File f = isEmpty ? new File(s) : new File(s, this);
             if ((filter == null) || filter.accept(f))
                 files.add(f);
         }

src/java.base/share/man/java.md

@@ -2817,9 +2817,8 @@ Java HotSpot VM.
 `-XX:+UseNUMA`
 :   Enables performance optimization of an application on a machine with
     nonuniform memory architecture (NUMA) by increasing the application's use
-    of lower latency memory. By default, this option is disabled and no
-    optimization for NUMA is made. The option is available only when the
-    parallel garbage collector is used (`-XX:+UseParallelGC`).
+    of lower latency memory. The default value for this option depends on the
+    garbage collector.
 
 `-XX:+UseParallelGC`
 :   Enables the use of the parallel scavenge garbage collector (also known as

src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java

@@ -38,7 +38,13 @@
 @Label("File Read")
 @Category("Java Application")
 @Description("Reading data from a file")
-@StackFilter({"java.io.FileInputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@StackFilter({"java.nio.channels.FileChannel",
+              "java.io.DataInputStream",
+              "java.io.FileInputStream",
+              "java.io.InputStream",
+              "java.io.RandomAccessFile",
+              "sun.nio.ch.ChannelInputStream",
+              "sun.nio.ch.FileChannelImpl"})
 @Throttle
 public final class FileReadEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java

@@ -38,7 +38,13 @@
 @Label("File Write")
 @Category("Java Application")
 @Description("Writing data to a file")
-@StackFilter({"java.io.FileOutputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@StackFilter({"java.nio.channels.FileChannel",
+              "java.io.DataOutputStream",
+              "java.io.FileOutputStream",
+              "java.io.OutputStream",
+              "java.io.RandomAccessFile",
+              "sun.nio.ch.ChannelOutputStream",
+              "sun.nio.ch.FileChannelImpl"})
 @Throttle
 public final class FileWriteEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java

@@ -39,6 +39,10 @@
 @Label("Socket Read")
 @Category("Java Application")
 @Description("Reading data from a socket")
+@StackFilter({"java.io.InputStream",
+              "java.net.Socket$SocketInputStream",
+              "java.nio.channels.SocketChannel",
+              "sun.nio.ch.SocketInputStream"})
 @Throttle
 public final class SocketReadEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java

@@ -38,6 +38,10 @@
 @Label("Socket Write")
 @Category("Java Application")
 @Description("Writing data to a socket")
+@StackFilter({"java.io.OutputStream",
+              "java.net.Socket$SocketOutputStream",
+              "java.nio.channels.SocketChannel",
+              "sun.nio.ch.SocketOutputStream"})
 @Throttle
 public final class SocketWriteEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java

@@ -95,18 +95,6 @@ private boolean isExceptionEvent() {
         return false;
     }
 
-    private boolean isStaticCommit() {
-        switch (getName()) {
-            case Type.EVENT_NAME_PREFIX + "SocketRead"  :
-            case Type.EVENT_NAME_PREFIX + "SocketWrite" :
-            case Type.EVENT_NAME_PREFIX + "FileRead"    :
-            case Type.EVENT_NAME_PREFIX + "FileWrite"   :
-            case Type.EVENT_NAME_PREFIX + "FileForce"   :
-                return true;
-        }
-        return false;
-    }
-
     private int determineStackTraceOffset() {
         if (isJDK) {
             // Order matters
@@ -116,9 +104,14 @@ private int determineStackTraceOffset() {
             if (getModification() == Modification.TRACING) {
                 return 5;
             }
-            if (isStaticCommit()) {
-                return 3;
-            }
+            return switch (getName()) {
+                case Type.EVENT_NAME_PREFIX + "SocketRead",
+                     Type.EVENT_NAME_PREFIX + "SocketWrite",
+                     Type.EVENT_NAME_PREFIX + "FileRead",
+                     Type.EVENT_NAME_PREFIX + "FileWrite" -> 6;
+                case Type.EVENT_NAME_PREFIX + "FileForce" -> 5;
+                default -> 3;
+            };
         }
         return 3;
     }