Preload core-rust lib on Linux

radixdlt · Mar 10, 2023 · d452924 · d452924
1 parent 3781910
commit d452924
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -182,11 +182,13 @@ allprojects {
     tasks.withType(Test) {
         systemProperty "file.encoding", "UTF-8"
         jvmArgs("--enable-preview")
+        environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
         systemProperty "java.library.path", "${project(':core-rust').projectDir}/target/debug"
     }
 
     tasks.withType(JavaExec) {
         jvmArgs("--enable-preview")
+        environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
         systemProperty "java.library.path", "${project(':core-rust').projectDir}/target/debug"
     }
 }

diff --git a/cli-tools/build.gradle b/cli-tools/build.gradle
@@ -157,6 +157,7 @@ task generateNodeKey(type: Exec) {
 
     group = "Execution"
     description = "Generate Node key"
+    environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(),
             "-Djava.library.path=${project(':core-rust').projectDir}/target/debug/",
             "com.radixdlt.cloud.AWSSecrets",
@@ -178,6 +179,7 @@ task generateDevUniverse(type: Exec) {
     dependsOn ':olympia-engine:jar'
     group = "Execution"
     description = "Generate development universe"
+    environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(),
             "-Djava.library.path=${project(':core-rust').projectDir}/target/debug/",
             "-Dlog4j.configurationFile=${projectDir.path + "/src/main/resources/generateuniverses.log4j2.properties"}",
@@ -194,6 +196,7 @@ task generateGenesisFile(type: Exec) {
     dependsOn ':olympia-engine:jar'
     group = "Execution"
     description = "Generate development universe"
+    environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(),
             "-Djava.library.path=${project(':core-rust').projectDir}/target/debug/",
             "-Dlog4j.configurationFile=${projectDir.path + "/src/main/resources/generateuniverses.log4j2.properties"}",
@@ -251,13 +254,15 @@ task runTargetedIntegrationTests(type: Test) {
 
 task runAllIntegrationTests(type: Test) {
     environment "RADIX_NODE_KEYSTORE_PASSWORD", "supersecret"
+    environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     systemProperty "java.library.path", "${project(':core-rust').projectDir}/target/debug/"
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath
 }
 
 task runP2pTests(type: JavaExec) {
     classpath = sourceSets.p2pTest.runtimeClasspath
+    environment "LD_PRELOAD", "${project(':core-rust').projectDir}/target/debug/libcorerust.so"
     systemProperty "java.library.path", "${project(':core-rust').projectDir}/target/debug/"
     main = "com.radixdlt.p2ptest.LargeMessageTest"
 

diff --git a/shell/radix-shell.sh b/shell/radix-shell.sh
@@ -1 +1 @@
-RADIX_NODE_KEYSTORE_PASSWORD=supersecret RADIXDLT_CONSOLE_APPENDER_THRESHOLD=OFF jshell -R -Djava.library.path=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell) --enable-preview --class-path $(./gradlew -q cli-tools:getClassPathForRadixShell) ./shell/shell-init.java -R -Djava.net.preferIPv4Stack=true
+RADIX_NODE_KEYSTORE_PASSWORD=supersecret RADIXDLT_CONSOLE_APPENDER_THRESHOLD=OFF LD_PRELOAD=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell)/libcorerust.so:$LD_PRELOAD jshell -R -Djava.library.path=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell) --enable-preview --class-path $(./gradlew -q cli-tools:getClassPathForRadixShell) ./shell/shell-init.java -R -Djava.net.preferIPv4Stack=true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		RADIX_NODE_KEYSTORE_PASSWORD=supersecret RADIXDLT_CONSOLE_APPENDER_THRESHOLD=OFF jshell -R -Djava.library.path=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell) --enable-preview --class-path $(./gradlew -q cli-tools:getClassPathForRadixShell) ./shell/shell-init.java -R -Djava.net.preferIPv4Stack=true
		RADIX_NODE_KEYSTORE_PASSWORD=supersecret RADIXDLT_CONSOLE_APPENDER_THRESHOLD=OFF LD_PRELOAD=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell)/libcorerust.so:$LD_PRELOAD jshell -R -Djava.library.path=$(./gradlew -q cli-tools:getNativeLibPathForRadixShell) --enable-preview --class-path $(./gradlew -q cli-tools:getClassPathForRadixShell) ./shell/shell-init.java -R -Djava.net.preferIPv4Stack=true