Skip to content

8309390: [JVMCI] improve copying system properties into libgraal #14291

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

Closed
wants to merge 6 commits into from
+451 −195
Closed

8309390: [JVMCI] improve copying system properties into libgraal #14291

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a82c24
copy system properties into libgraal more efficiently
dougxc Jun 11, 2023
6c346d3
reduced complexity of SystemProperties based on it being unmodifiable
dougxc Jun 12, 2023
59e3dbf
fix reference in comments
dougxc Jun 12, 2023
cf8f03e
fix copyright dates
dougxc Jun 12, 2023
0918653
[skip-ci] remove debug code
dougxc Jun 12, 2023
15a07e9
[skip-ci] Merge remote-tracking branch 'openjdk-jdk/master' into JDK-…
dougxc Jun 12, 2023
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
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/arguments.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class PathString : public CHeapObj<mtArguments> {
PathString(const char* value);
~PathString();

// for JVMCIEnv::init_saved_properties
// for JVM_ReadSystemPropertiesInfo
static int value_offset_in_bytes() { return (int)offset_of(PathString, _value); }
};

Expand Down Expand Up @@ -140,7 +140,7 @@ class SystemProperty : public PathString {
// Constructor
SystemProperty(const char* key, const char* value, bool writeable, bool internal = false);

// for JVMCIEnv::init_saved_properties
// for JVM_ReadSystemPropertiesInfo
static int key_offset_in_bytes() { return (int)offset_of(SystemProperty, _key); }
static int next_offset_in_bytes() { return (int)offset_of(SystemProperty, _next); }
};
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/jdk/internal/vm/VMSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, 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
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/TargetDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2023, 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
Expand Down
6 changes: 1 addition & 5 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, 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
Expand Down Expand Up @@ -43,7 +43,6 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Formatter;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -340,9 +339,6 @@ public String getString() {
* @param out stream to print to
*/
public static void printProperties(PrintStream out) {
out.println("[Saved system properties]");
Comparator<Map.Entry<String, String>> c = Comparator.comparing(Map.Entry<String, String>::getKey);
Services.getSavedProperties().entrySet().stream().sorted(c).forEach(e -> System.out.println(e));
out.println("[JVMCI properties]");
Option[] values = values();
for (Option option : values) {
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2023, 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
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 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
Expand Down