MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] launcher: looking for RAM percentage when filtering VM options (IJPL-157077)

Browse Source 
GitOrigin-RevId: f081f4c5e7fc13603a1ccab736ab061d4f7fa605
This commit is contained in:
Roman Shevchenko
2024-06-26 14:58:01 +02:00
committed by intellij-monorepo-bot
parent 99fbe25af3
commit 2b7ec923f5
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
native/XPlatLauncher/src/default.rs
View File

@@ -293,7 +293,7 @@ impl DefaultLaunchConfiguration {
///
/// Distribution options come first, so users can override default options with their own ones.
/// This works because JVM processes arguments first-to-last, so the last one wins.
/// The only exception is setting a garbage collector, so when a user sets one,
/// Exceptions: garbage collector and RAM percentage options, so when a user sets one,
/// the corresponding distribution option must be omitted.
fn collect_vm_options_from_files(&self, vm_options: &mut Vec<String>) -> Result<()> {
debug!("[1] Reading main VM options file: {:?}", self.vm_options_path);
@@ -311,13 +311,19 @@ impl DefaultLaunchConfiguration {
}
};
let has_user_gc = user_vm_options.iter().any(|l| is_gc_vm_option(l));
if has_user_gc {
vm_options.extend(dist_vm_options.into_iter().filter(|l| !is_gc_vm_option(l)))
} else {
vm_options.extend(dist_vm_options);
let mut filters: Vec<fn(&str) -> bool> = vec![];
for line in &user_vm_options {
if line.starts_with("-XX:+") && line.ends_with("GC") {
filters.push(|l| l.starts_with("-XX:+") && l.ends_with("GC"));
}
if line.starts_with("-XX:InitialRAMPercentage=") {
filters.push(|l| l.starts_with("-Xms"));
}
if line.starts_with("-XX:MinRAMPercentage=") || line.starts_with("-XX:MaxRAMPercentage=") {
filters.push(|l| l.starts_with("-Xmx"));
}
}
vm_options.extend(dist_vm_options.into_iter().filter(|l| !filters.iter().any(|filter| filter(l))));
vm_options.extend(user_vm_options);
vm_options.push(jvm_property!("jb.vmOptionsFile", vm_options_path.to_string_checked()?));
@@ -378,10 +384,6 @@ fn read_vm_options(path: &Path) -> Result<Vec<String>> {
Ok(vm_options)
}
fn is_gc_vm_option(s: &str) -> bool {
s.starts_with("-XX:+") && s.ends_with("GC")
}
pub fn read_product_info(product_info_path: &Path) -> Result<ProductInfo> {
let file = File::open(product_info_path)?;
let product_info: ProductInfo = serde_json::from_reader(BufReader::new(file))?;

12
native/XPlatLauncher/tests/default_tests.rs
View File

@@ -181,7 +181,7 @@ mod tests {
}
#[test]
fn vm_options_overriding_test() {
fn vm_options_gc_overriding_test() {
let mut test = prepare_test_env(LauncherLocation::Standard);
test.create_toolbox_vm_options("-Xmx512m\n-XX:+UseZGC\n-Dsun.io.useCanonCaches=true\n");
@@ -192,6 +192,16 @@ mod tests {
assert_eq!(dump.systemProperties["sun.io.useCanonCaches"], "true");
}
#[test]
fn vm_options_mx_overriding_test() {
let mut test = prepare_test_env(LauncherLocation::Standard);
test.create_toolbox_vm_options("-XX:MaxRAMPercentage=50\n");
let dump = run_launcher_ext(&test, LauncherRunSpec::standard().with_dump().assert_status()).dump();
assert_ne!(dump.systemProperties["__MAX_HEAP"], "256");
}
#[test]
fn corrupted_vm_options_test() {
let mut test = prepare_test_env(LauncherLocation::Standard);