From 0b7d06d330f99c95fb503a1f2d1efb9fb64cb878 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Fri, 4 Nov 2022 10:15:23 -0700 Subject: [PATCH] Add options to py embedded server --- py/embedded-server/deephaven_server/start_jvm.py | 4 ++++ py/embedded-server/java-runtime/build.gradle | 1 + 2 files changed, 5 insertions(+) diff --git a/py/embedded-server/deephaven_server/start_jvm.py b/py/embedded-server/deephaven_server/start_jvm.py index db96ced174c..a67717939fc 100644 --- a/py/embedded-server/deephaven_server/start_jvm.py +++ b/py/embedded-server/deephaven_server/start_jvm.py @@ -17,6 +17,9 @@ def _jars_path(): def _compiler_directives(): return _jars_path() / 'dh-compiler-directives.txt' +def _default_vmoptions(): + return _jars_path() / 'dh-default.vmoptions' + def _jars(): return _jars_path().glob('*.jar') @@ -42,6 +45,7 @@ def _jars(): f"-XX:CompilerDirectivesFile={_compiler_directives()}", # (deephaven-core#2500): Remove DisableIntrinsic for currentThread '-XX:DisableIntrinsic=_currentThread', + f"-XX:VMOptionsFile={_default_vmoptions()}", ] # Provide a util func to start the JVM, will use its own defaults if none are offered diff --git a/py/embedded-server/java-runtime/build.gradle b/py/embedded-server/java-runtime/build.gradle index 3f373d6f28f..5f84cd4ec10 100644 --- a/py/embedded-server/java-runtime/build.gradle +++ b/py/embedded-server/java-runtime/build.gradle @@ -33,6 +33,7 @@ def serverClasspath = tasks.register('serverClasspath', Sync) { from configurations.runtimeClasspath from jar from tasks.named('createCompilerDirectives') + from tasks.named('createVmOptions') into layout.buildDirectory.dir('classpath') }