8328278: Do not print the tenuring threshold in AgeTable::print_on

Reviewed-by: ayang, ysr
robehn · Apr 3, 2024 · e3e6c2a · e3e6c2a
1 parent 16b842a
commit e3e6c2a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1185,7 +1185,7 @@ size_t G1Policy::desired_survivor_size(uint max_regions) const {
 }
 
 void G1Policy::print_age_table() {
-  _survivors_age_table.print_age_table(_tenuring_threshold);
+  _survivors_age_table.print_age_table();
 }
 
 // Calculates survivor space parameters.

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -644,7 +644,7 @@ void DefNewGeneration::adjust_desired_tenuring_threshold() {
     gc_counters->desired_survivor_size()->set_value(desired_survivor_size * oopSize);
   }
 
-  age_table()->print_age_table(_tenuring_threshold);
+  age_table()->print_age_table();
 }
 
 void DefNewGeneration::collect(bool   full,

diff --git a/src/hotspot/share/gc/shared/ageTable.cpp b/src/hotspot/share/gc/shared/ageTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,17 +114,16 @@ uint AgeTable::compute_tenuring_threshold(size_t desired_survivor_size) {
   return result;
 }
 
-void AgeTable::print_age_table(uint tenuring_threshold) {
+void AgeTable::print_age_table() {
   LogTarget(Trace, gc, age) lt;
   if (lt.is_enabled() || _use_perf_data || AgeTableTracer::is_tenuring_distribution_event_enabled()) {
     LogStream st(lt);
-    print_on(&st, tenuring_threshold);
+    print_on(&st);
   }
 }
 
-void AgeTable::print_on(outputStream* st, uint tenuring_threshold) {
-  st->print_cr("Age table with threshold %u (max threshold %u)",
-               tenuring_threshold, MaxTenuringThreshold);
+void AgeTable::print_on(outputStream* st) {
+  st->print_cr("Age table:");
 
   size_t total = 0;
   uint age = 1;

diff --git a/src/hotspot/share/gc/shared/ageTable.hpp b/src/hotspot/share/gc/shared/ageTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,8 +72,8 @@ class AgeTable: public CHeapObj<mtGC> {
 
   // Calculate new tenuring threshold based on age information.
   uint compute_tenuring_threshold(size_t desired_survivor_size);
-  void print_age_table(uint tenuring_threshold);
-  void print_on(outputStream* st, uint tenuring_threshold);
+  void print_age_table();
+  void print_on(outputStream* st);
 
  private:
   bool _use_perf_data;

diff --git a/test/hotspot/jtreg/gc/TestAgeOutput.java b/test/hotspot/jtreg/gc/TestAgeOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ public static void runTest(String gcArg) throws Exception {
         String stdout = output.getStdout();
 
         checkPattern(".*GC\\(0\\) .*Desired survivor size.*", stdout);
-        checkPattern(".*GC\\(0\\) .*Age table with threshold.*", stdout);
+        checkPattern(".*GC\\(0\\) .*Age table:.*", stdout);
         checkPattern(".*GC\\(0\\) .*- age   1:.*", stdout);
     }