starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-05-16 20:07:00 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Make Truffle use fallback runtime in Gradle plugin (#995)

Browse Source 
Using native libraries in Gradle plugins is problematic; this adds some flags that causes Truffle to use a fallback runtime that avoids loading native libraries.
This commit is contained in:
Daniel Chao
2025-02-27 12:54:49 -08:00
committed by Dan Chao
parent 393d939a2c
commit a225258ebf
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkl-gradle/src/main/java/org/pkl/gradle/task/BasePklTask.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved. * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -49,6 +49,11 @@ import org.pkl.core.util.Nullable;
import org.pkl.gradle.utils.PluginUtils; import org.pkl.gradle.utils.PluginUtils;
public abstract class BasePklTask extends DefaultTask { public abstract class BasePklTask extends DefaultTask {
private static final String TRUFFLE_USE_FALLBACK_RUNTIME_FLAG = "truffle.UseFallbackRuntime";
private static final String POLYGLOT_WARN_INTERPRETER_ONLY_FLAG =
"polyglot.engine.WarnInterpreterOnly";
@Input @Input
public abstract ListProperty<String> getAllowedModules(); public abstract ListProperty<String> getAllowedModules();
@@ -137,9 +142,26 @@ public abstract class BasePklTask extends DefaultTask {
@Optional @Optional
public abstract ListProperty<String> getHttpNoProxy(); public abstract ListProperty<String> getHttpNoProxy();
/**
* There are issues with using native libraries in Gradle plugins. As a workaround for now, make
* Truffle use an un-optimized runtime.
*
* @see <a
* href="https://discuss.gradle.org/t/loading-a-native-library-in-a-gradle-plugin/44854">https://discuss.gradle.org/t/loading-a-native-library-in-a-gradle-plugin/44854</a>
* @see <a
* href="https://github.com/apple/pkl/issues/988">https://github.com/apple/pkl/issues/988</a>
*/
// TODO: Remove this workaround when ugprading to Truffle 24.2+ (Truffle automatically falls back
// in this scenario).
protected void withFallbackTruffleRuntime(Runnable task) {
System.setProperty(TRUFFLE_USE_FALLBACK_RUNTIME_FLAG, "true");
System.setProperty(POLYGLOT_WARN_INTERPRETER_ONLY_FLAG, "false");
task.run();
}
@TaskAction @TaskAction
public void runTask() { public void runTask() {
doRunTask(); withFallbackTruffleRuntime(this::doRunTask);
} }
protected abstract void doRunTask(); protected abstract void doRunTask();

4
pkl-gradle/src/main/java/org/pkl/gradle/task/ModulesTask.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved. * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -133,7 +133,7 @@ public abstract class ModulesTask extends BasePklTask {
if (getCliBaseOptions().getNormalizedSourceModules().isEmpty()) { if (getCliBaseOptions().getNormalizedSourceModules().isEmpty()) {
throw new InvalidUserDataException("No source modules specified."); throw new InvalidUserDataException("No source modules specified.");
} }
doRunTask(); withFallbackTruffleRuntime(this::doRunTask);
} }
@Internal @Internal