From 481d5c60b8f26d3e67eb291e3b1ad31d3218e7d1 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sat, 21 Dec 2024 14:48:57 +0100 Subject: [PATCH] IJPL-164301 try to use pooled allocator GitOrigin-RevId: 96f967183c11ea2778a4687549bfd66131011cf4 --- jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java | 1 + .../src/org/jetbrains/intellij/build/dev/BuildServer.kt | 1 + .../src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt | 1 + platform/built-in-server/src/org/jetbrains/io/BuiltInServer.kt | 1 + 4 files changed, 4 insertions(+) diff --git a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java index 3ee4b3aa5878..5a5f5106d58b 100644 --- a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java +++ b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java @@ -35,6 +35,7 @@ public final class Launcher { System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e"); System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535))); System.setProperty("io.netty.serviceThreadPrefix", "Netty"); + System.setProperty("io.netty.allocator.type", "pooled"); //} final Class mainClass = jpsLoader.loadClass(mainClassName); diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/dev/BuildServer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/dev/BuildServer.kt index bc72722f3d36..34306db85160 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/dev/BuildServer.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/dev/BuildServer.kt @@ -52,6 +52,7 @@ fun getIdeSystemProperties(runDir: Path): VmProperties { "jna.noclasspath" to "true", "jb.vmOptionsFile" to "${Files.newDirectoryStream(runDir.resolve("bin"), "*.vmoptions").use { it.single() }}", "compose.swing.render.on.graphics" to "true", + "io.netty.allocator.type" to "pooled", ) ) return VmProperties(result) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt index 4666363628a9..c1f0c347671f 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt @@ -339,6 +339,7 @@ class BuildContextImpl internal constructor( // require bundled JNA dispatcher lib jvmArgs.add("-Djna.nosys=true") jvmArgs.add("-Djna.noclasspath=true") + jvmArgs.add("-Dio.netty.allocator.type=pooled") if (useModularLoader || generateRuntimeModuleRepository) { jvmArgs.add("-Dintellij.platform.runtime.repository.path=${macroName}/${MODULE_DESCRIPTORS_JAR_PATH}".let { if (isScript) '"' + it + '"' else it }) diff --git a/platform/built-in-server/src/org/jetbrains/io/BuiltInServer.kt b/platform/built-in-server/src/org/jetbrains/io/BuiltInServer.kt index 17a6d21f47f5..3a17cb0bc8fb 100644 --- a/platform/built-in-server/src/org/jetbrains/io/BuiltInServer.kt +++ b/platform/built-in-server/src/org/jetbrains/io/BuiltInServer.kt @@ -50,6 +50,7 @@ class BuiltInServer private constructor( if (java.lang.Boolean.parseBoolean(System.getProperty("io.netty.random.id", "true"))) { System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e") System.setProperty("io.netty.processId", Random.nextInt(65535).toString()) + System.setProperty("io.netty.allocator.type", "pooled") } System.setProperty("io.netty.serviceThreadPrefix", "Netty ")