Skip to content

[GR-64420] Use initial system properties for jvmstat performance counters. #11049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

[GR-64420] Use initial system properties for jvmstat performance counters. #11049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/SystemCounters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.oracle.svm.core.Uninterruptible;
import com.oracle.svm.core.attach.AttachApiSupport;
import com.oracle.svm.core.heap.Heap;
import com.oracle.svm.core.jdk.SystemPropertiesSupport;
import com.oracle.svm.core.thread.VMOperation;
import com.oracle.svm.core.thread.VMOperationListener;
import com.oracle.svm.core.util.BasedOnJDKFile;
Expand Down Expand Up @@ -128,15 +129,16 @@ public void allocate() {
loadedClasses.allocate(numberOfLoadedClasses());
processors.allocate(getAvailableProcessors());

tempDir.allocate(getSystemProperty("java.io.tmpdir"));
javaVersion.allocate(getSystemProperty("java.version"));
vmName.allocate(getSystemProperty("java.vm.name"));
vmVendor.allocate(getSystemProperty("java.vm.vendor"));
vmVersion.allocate(getSystemProperty("java.vm.version"));
osArch.allocate(getSystemProperty("os.arch"));
osName.allocate(getSystemProperty("os.name"));
userDir.allocate(getSystemProperty("user.dir"));
userName.allocate(getSystemProperty("user.name"));
SystemPropertiesSupport properties = SystemPropertiesSupport.singleton();
tempDir.allocate(properties.getInitialProperty("java.io.tmpdir"));
javaVersion.allocate(properties.getInitialProperty("java.version"));
vmName.allocate(properties.getInitialProperty("java.vm.name"));
vmVendor.allocate(properties.getInitialProperty("java.vm.vendor"));
vmVersion.allocate(properties.getInitialProperty("java.vm.version"));
osArch.allocate(properties.getInitialProperty("os.arch"));
osName.allocate(properties.getInitialProperty("os.name"));
userDir.allocate(properties.getInitialProperty("user.dir"));
userName.allocate(properties.getInitialProperty("user.name"));
jvmCapabilities.allocate(getJvmCapabilities());

gcInProgress.allocate();
Expand All @@ -151,15 +153,6 @@ public void allocate() {
initDoneTime.allocate(Isolates.getInitDoneTimeMillis());
}

private static String getSystemProperty(String s) {
/* Certain system properties (e.g., "user.dir"), may throw an exception. */
try {
return System.getProperty(s);
} catch (Throwable e) {
return "";
}
}

@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+18/src/hotspot/share/services/runtimeService.cpp#L68-L77") //
private static String getJvmCapabilities() {
/*
Expand Down
Loading