Merge pull request #21840 from adpopescu/gc-young-generation-config

Add JFR YoungGenerationConfiguration Event

Author: tajila

runtime/vm/JFRChunkWriter.cpp

@@ -873,6 +873,33 @@ VM_JFRChunkWriter::writeGCHeapConfigurationEvent()
 
 }
 
+void
+VM_JFRChunkWriter::writeYoungGenerationConfigurationEvent()
+{
+	YoungGenerationConfigurationEntry *youngGenConfig = &(VM_JFRConstantPoolTypes::getJFRConstantEvents(_vm)->YoungGenConfigEntry);
+
+	/* reserve size field */
+	U_8 *dataStart = reserveEventSize();
+
+	/* write event type */
+	_bufferWriter->writeLEB128(YoungGenerationConfigID);
+
+	/* write event start time */
+	_bufferWriter->writeLEB128(j9time_nano_time());
+
+	/* write young generation min size */
+	_bufferWriter->writeLEB128(youngGenConfig->minSize);
+
+	/* write young generation max size */
+	_bufferWriter->writeLEB128(youngGenConfig->maxSize);
+
+	/* write young generation to old generation ratio */
+	_bufferWriter->writeLEB128(youngGenConfig->newRatio);
+
+	/* write event size */
+	writeEventSize(dataStart);
+}
+
 void
 VM_JFRChunkWriter::writeInitialSystemPropertyEvents(J9JavaVM *vm)
 {

runtime/vm/JFRChunkWriter.hpp

@@ -89,6 +89,7 @@ enum MetadataTypeID {
 	ThreadDumpID = 111,
 	NativeLibraryID = 112,
 	GCHeapConfigID = 133,
+	YoungGenerationConfigID = 134,
 	ThreadID = 164,
 	ThreadGroupID = 165,
 	ClassID = 166,
@@ -416,6 +417,8 @@ class VM_JFRChunkWriter {
 				writeInitialEnvironmentVariableEvents();
 
 				writeGCHeapConfigurationEvent();
+
+				writeYoungGenerationConfigurationEvent();
 			}
 
 			writePhysicalMemoryEvent();
@@ -823,6 +826,8 @@ class VM_JFRChunkWriter {
 
 	void writeGCHeapConfigurationEvent();
 
+	void writeYoungGenerationConfigurationEvent();
+
 	void writeInitialSystemPropertyEvents(J9JavaVM *vm);
 
 	void writeInitialEnvironmentVariableEvents();

runtime/vm/JFRConstantPoolTypes.hpp

@@ -309,6 +309,12 @@ struct GCHeapConfigurationEntry {
 	UDATA heapAddressBits;
 };
 
+struct YoungGenerationConfigurationEntry {
+	U_64 minSize;
+	U_64 maxSize;
+	U_64 newRatio;
+};
+
 struct VirtualizationInformationEntry {
 	const char *name;
 };
@@ -331,6 +337,7 @@ struct JFRConstantEvents {
 	VirtualizationInformationEntry VirtualizationInfoEntry;
 	OSInformationEntry OSInfoEntry;
 	GCHeapConfigurationEntry GCHeapConfigEntry;
+	YoungGenerationConfigurationEntry YoungGenConfigEntry;
 };
 
 class VM_JFRConstantPoolTypes {
@@ -1063,6 +1070,7 @@ class VM_JFRConstantPoolTypes {
 		initializeVirtualizationInformation(vm);
 		initializeOSInformation(vm, result);
 		initializeGCHeapConfigurationEvent(vm, result);
+		initializeYoungGenerationConfigurationEvent(vm);
 	}
 
 	/**
@@ -1303,6 +1311,27 @@ class VM_JFRConstantPoolTypes {
 		gcConfiguration->heapAddressBits = J9JAVAVM_REFERENCE_SIZE(vm) * 8;
 	}
 
+	/**
+	 * Initialize YoungGenerationConfigurationEntry
+	 *
+	 * @param vm[in] the J9JavaVM
+	 */
+	static void initializeYoungGenerationConfigurationEvent(J9JavaVM *vm)
+	{
+		J9MemoryManagerFunctions *mmFuncs = vm->memoryManagerFunctions;
+		YoungGenerationConfigurationEntry *youngGenConfiguration = &(getJFRConstantEvents(vm)->YoungGenConfigEntry);
+
+		youngGenConfiguration->minSize = mmFuncs->j9gc_get_minimum_young_generation_size(vm);
+		youngGenConfiguration->maxSize = mmFuncs->j9gc_get_maximum_young_generation_size(vm);
+		if (0 != mmFuncs->j9gc_get_maximum_young_generation_size(vm)) {
+			youngGenConfiguration->newRatio = mmFuncs->j9gc_get_maximum_heap_size(vm)/mmFuncs->j9gc_get_maximum_young_generation_size(vm) - 1;
+		} else {
+			youngGenConfiguration->newRatio = 0;
+		}
+	}
+
+
+
 	static uintptr_t recordSystemProcessEvent(uintptr_t pid, const char *commandLine, void *userData)
 	{
 		VM_JFRConstantPoolTypes *constantPoolTypes = reinterpret_cast<VM_JFRConstantPoolTypes *>(userData);

test/functional/cmdLineTests/jfr/jfrevents.xml

@@ -81,6 +81,12 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<output type="success" caseSensitive="yes" regex="no">jdk.GCHeapConfiguration</output>
 		<output type="failure" caseSensitive="yes" regex="no">jfr print: could not read recording</output>
 	</test>
+	<test id="test jfr young generation configuration - approx 30seconds">
+		<command>$JFR_EXE$ print --xml --events "YoungGenerationConfiguration" defaultJ9recording.jfr</command>
+		<output type="required" caseSensitive="yes" regex="no">http://www.w3.org/2001/XMLSchema-instance</output>
+		<output type="success" caseSensitive="yes" regex="no">jdk.YoungGenerationConfiguration</output>
+		<output type="failure" caseSensitive="yes" regex="no">jfr print: could not read recording</output>
+	</test>
 	<test id="test jfr system process - approx 30 seconds" platforms="linux.*">
 		<command>$JFR_EXE$ print --xml --events "SystemProcess" defaultJ9recording.jfr</command>
 		<output type="required" caseSensitive="yes" regex="no">http://www.w3.org/2001/XMLSchema-instance</output>