diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
index 73a6b694cafcbee45b0295d66896961bf279aff9..391ae348f8fadf20069d6bc89c488c99751a8c3f 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
@@ -162,7 +162,7 @@ final class REngine implements Engine, Engine.Timings {
REnvironment.baseInitialize(baseFrame, globalFrame);
RBuiltinPackages.loadBase(baseFrame);
RGraphics.initialize();
- if (FastROptions.LoadBase.getBooleanValue()) {
+ if (FastROptions.LoadProfiles.getBooleanValue()) {
/*
* eval the system/site/user profiles. Experimentally GnuR does not report warnings
* during system profile evaluation, but does for the site/user profiles.
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
index ad2140fbde30d8124c97a6bd92399ebb52ae46cb..a5d042faf374d097999e16727ca2c7b1cb009846 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
@@ -561,16 +561,19 @@ class RRuntimeASTAccessImpl implements RRuntimeASTAccess {
}
@Override
+ @TruffleBoundary
public boolean enableDebug(RFunction func, boolean once) {
return DebugHandling.enableDebug(func, "", RNull.instance, once, false);
}
@Override
+ @TruffleBoundary
public boolean isDebugged(RFunction func) {
return DebugHandling.isDebugged(func);
}
@Override
+ @TruffleBoundary
public boolean disableDebug(RFunction func) {
return DebugHandling.undebug(func);
}
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridContext.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridContext.java
index 54a33fec0bd819934a2e5df6bb0017d0f1a3b45f..a2c92c4c538b61773a56f0198121a8525c4b4606 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridContext.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridContext.java
@@ -22,6 +22,8 @@
*/
package com.oracle.truffle.r.library.fastrGrid;
+import static com.oracle.truffle.r.library.fastrGrid.WindowDevice.awtNotSupported;
+
import java.util.ArrayList;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -29,6 +31,7 @@ import com.oracle.truffle.r.library.fastrGrid.GridState.GridDeviceState;
import com.oracle.truffle.r.library.fastrGrid.device.GridDevice;
import com.oracle.truffle.r.library.fastrGrid.device.GridDevice.DeviceCloseException;
import com.oracle.truffle.r.library.fastrGrid.graphics.RGridGraphicsAdapter;
+import com.oracle.truffle.r.runtime.FastRConfig;
import com.oracle.truffle.r.runtime.RCaller;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RError.Message;
@@ -89,7 +92,11 @@ public final class GridContext {
public void openDefaultDevice() {
String defaultDev = RGridGraphicsAdapter.getDefaultDevice();
if (defaultDev.equals("awt") || defaultDev.startsWith("X11")) {
- setCurrentDevice(defaultDev, WindowDevice.createWindowDevice());
+ if (!FastRConfig.InternalGridAwtSupport) {
+ throw awtNotSupported();
+ } else {
+ setCurrentDevice(defaultDev, WindowDevice.createWindowDevice());
+ }
} else {
throw RError.error(RError.NO_CALLER, Message.GENERIC, "FastR does not support device '" + defaultDev + "'.");
}
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/WindowDevice.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/WindowDevice.java
index 4ae0265a3882cab15161dd01c7b65f6f654af53c..6183981d4674054bba34f14d412bd12aca328e2a 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/WindowDevice.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/WindowDevice.java
@@ -25,6 +25,8 @@ package com.oracle.truffle.r.library.fastrGrid;
import com.oracle.truffle.r.library.fastrGrid.device.GridDevice;
import com.oracle.truffle.r.library.fastrGrid.device.awt.BufferedJFrameDevice;
import com.oracle.truffle.r.library.fastrGrid.device.awt.JFrameDevice;
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RError.Message;
/**
* Contains code specific to FastR device that shows the graphical output interactively in a window.
@@ -42,4 +44,8 @@ public final class WindowDevice {
JFrameDevice frameDevice = JFrameDevice.create(width, height);
return new BufferedJFrameDevice(frameDevice);
}
+
+ public static RError awtNotSupported() {
+ throw RError.error(RError.NO_CALLER, Message.GENERIC, "AWT based grid devices are not supported.");
+ }
}
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
index 1fdc13be7449408ce369ebfabe6fc5dcd90aadbd..9825b273c127b2caef56c0d77c931e95285ec364 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
@@ -22,6 +22,8 @@
*/
package com.oracle.truffle.r.library.fastrGrid.grDevices;
+import static com.oracle.truffle.r.library.fastrGrid.WindowDevice.awtNotSupported;
+
import java.awt.Graphics2D;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -34,6 +36,7 @@ import com.oracle.truffle.r.library.fastrGrid.device.awt.BufferedImageDevice;
import com.oracle.truffle.r.library.fastrGrid.device.awt.BufferedImageDevice.NotSupportedImageFormatException;
import com.oracle.truffle.r.library.fastrGrid.device.awt.Graphics2DDevice;
import com.oracle.truffle.r.nodes.builtin.RExternalBuiltinNode;
+import com.oracle.truffle.r.runtime.FastRConfig;
import com.oracle.truffle.r.runtime.RError.Message;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
@@ -54,6 +57,10 @@ public final class InitWindowedDevice extends RExternalBuiltinNode {
@Override
@TruffleBoundary
protected Object call(RArgsValuesAndNames args) {
+ if (!FastRConfig.InternalGridAwtSupport) {
+ throw awtNotSupported();
+ }
+
int width = getIntOrDefault(args, 1, GridDevice.DEFAULT_WIDTH);
int height = getIntOrDefault(args, 2, GridDevice.DEFAULT_HEIGHT);
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
index 4f635579bcc5a88d161eeff065624e3de4486c37..657822c2172dfb24bbcb85fb8878d78a248b957b 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
@@ -34,7 +34,7 @@ public class RGraphics {
if (initialized.compareAndSet(false, true)) {
if (FastROptions.UseInternalGridGraphics.getBooleanValue()) {
RGridGraphicsAdapter.initialize();
- } else {
+ } else if (FastROptions.LoadPackagesNativeCode.getBooleanValue()) {
DLL.DLLInfo dllInfo = DLL.findLibraryContainingSymbol("InitGraphics");
DLL.SymbolHandle symbolHandle = DLL.findSymbol("InitGraphics", dllInfo);
assert symbolHandle != DLL.SYMBOL_NOT_FOUND;
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java
index b3405af7d8d62a9f45801af056ba90f57f7568df..bf6252a67e445eef2011f3e1ef1e760625f3a1cd 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java
@@ -65,6 +65,7 @@ public abstract class CountFields extends RExternalBuiltinNode.Arg6 {
}
@Specialization
+ @TruffleBoundary
protected Object count(int conn, Object sep, Object quote, int nskipArg, boolean blskip, String commentCharArg) {
char comChar;
if (!(commentCharArg != null && commentCharArg.length() == 1)) {
@@ -104,7 +105,6 @@ public abstract class CountFields extends RExternalBuiltinNode.Arg6 {
}
}
- @TruffleBoundary
private static Object countFields(RConnection file, char sepChar, String quoteSet, @SuppressWarnings("unused") int nskip, boolean blskip, char comChar) throws IOException {
LocalData data = new LocalData();
data.sepchar = sepChar;
diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile
index fae4e6796901a7fbf588934d70bb4f482f1b8deb..69ba9ce1860aaf7d021ada51424d36dc30cad552 100644
--- a/com.oracle.truffle.r.native/Makefile
+++ b/com.oracle.truffle.r.native/Makefile
@@ -31,8 +31,12 @@ export R_VERSION = $(subst R-,,$(notdir $(basename $(basename $(wildcard $(FASTR
export GNUR_HOME = $(TOPDIR)/gnur/R-$(R_VERSION)
ifndef FASTR_RFFI
+ifeq ($(FASTR_MANAGED),true)
+export FASTR_RFFI = managed
+else
export FASTR_RFFI = jni
endif
+endif
# Completely accurate dependency analysis is very difficult for this project, so use a version number
# to force a clean build, and elsewhere use sentinels to avoid rebuilding when we can't compute the
diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 47d879c4c0feb507b0af4a78460fb6b52177dfdb..68f128ec2b78f4fc076992505b5961a2562c2ce9 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -56,6 +56,9 @@ all: $(R_LIB)
# to remove the sentinels
$(R_LIB): fficall.done
+ifeq ($(FASTR_RFFI),managed)
+ # nop
+else
ifeq ($(OS_NAME),Darwin)
$(DYLIB_LD) $(DYLIB_LDFLAGS) -Wl,-rpath,@loader_path/ -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz $(VERSION_FLAGS)
install_name_tool -change libRblas.dylib @rpath/libRblas.dylib $(R_LIB)
@@ -66,7 +69,12 @@ ifeq ($(OS_NAME),Darwin)
else
$(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz
endif
+endif # managed
+ifeq ($(FASTR_RFFI),managed)
+fficall.done: common.done
+ touch fficall.done
+else
ifeq ($(FASTR_RFFI),nfi)
fficall.done: common.done
$(MAKE) -C src/truffle_nfi all
@@ -96,6 +104,7 @@ endif
touch fficall.done
endif
endif
+endif
common.done:
$(MAKE) -C src/common all
diff --git a/com.oracle.truffle.r.native/library/base/Makefile b/com.oracle.truffle.r.native/library/base/Makefile
index 6e57a6d5877a4affae10e63f2aeb15c2e9445403..f4077b8f239328841b08e9e9abae3b733c3d619d 100644
--- a/com.oracle.truffle.r.native/library/base/Makefile
+++ b/com.oracle.truffle.r.native/library/base/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -21,4 +21,25 @@
# questions.
#
+ifeq ($(FASTR_RFFI),managed)
+BASE_UNCOMPRESSED = $(addprefix $(FASTR_LIBRARY_DIR)/base/R/, base.rdb)
+BASE_SCRIPT = $(addprefix $(FASTR_LIBRARY_DIR)/base/R/, base)
+LIB_PKG_POST = $(BASE_UNCOMPRESSED) $(BASE_SCRIPT)
+endif
+
include ../lib.mk
+
+ifeq ($(FASTR_RFFI),managed)
+# original base assumes that "base" DLL is loaded, we change it to check for that first
+$(BASE_SCRIPT): $(GNUR_HOME)/library/base/R/base
+ sed -i '/## populate C\/Fortran symbols/a if (length(getLoadedDLLs()) > 0)' $(FASTR_LIBRARY_DIR)/base/R/base
+# The following changes GnuR's build script makebasedb.R so that it does not
+# compress the lazy load database, then it builds GnuR and copies the
+# uncompressed base package database to FastR library location
+$(BASE_UNCOMPRESSED): $(GNUR_HOME)/src/library/base/all.R
+ sed -i 's|compress = TRUE|compress = FALSE|g' $(GNUR_HOME)/src/library/base/makebasedb.R
+ (cd $(GNUR_HOME); $(MAKE))
+ cp $(GNUR_HOME)/library/$(PKG)/R/base.rd* $(FASTR_LIBRARY_DIR)/base/R/
+ sed -i 's|compress = FALSE|compress = TRUE|g' $(GNUR_HOME)/src/library/base/makebasedb.R
+ (cd $(GNUR_HOME); $(MAKE))
+endif
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/EagerResourceHandlerFactory.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/EagerResourceHandlerFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..701bc12f35e8be31b0a6024361e7558becdebd2e
--- /dev/null
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/EagerResourceHandlerFactory.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.nodes.builtin;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.CodeSource;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.ResourceHandlerFactory;
+import com.oracle.truffle.r.runtime.ResourceHandlerFactory.Handler;
+
+/**
+ * Implementation of {@link ResourceHandlerFactory} that pre-loads all the resources in its static
+ * constructor.
+ */
+public class EagerResourceHandlerFactory extends ResourceHandlerFactory implements Handler {
+ private static class FileInfo {
+ private final String name;
+ private final URL url;
+ private byte[] data;
+
+ FileInfo(String name, URL url, byte[] data) {
+ this.name = name;
+ this.url = url;
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "name: " + name + ", url: " + url.toString();
+ }
+ }
+
+ private static HashMap<String, FileInfo> files = new HashMap<>();
+
+ static {
+ gatherResources();
+ }
+
+ @Override
+ public URL getResource(Class<?> accessor, String name) {
+ return files.get(name).url;
+ }
+
+ @Override
+ public InputStream getResourceAsStream(Class<?> accessor, String name) {
+ // actual resource
+ String fileName = Paths.get(name).getFileName().toString();
+ FileInfo fileInfo = files.get(fileName);
+ if (fileInfo == null || fileInfo.data == null) {
+ RInternalError.shouldNotReachHere("getResourceAsStream: failed to find resource: " + name);
+ return null;
+ } else {
+ return new ByteArrayInputStream(fileInfo.data);
+ }
+ }
+
+ @Override
+ protected Handler newHandler() {
+ return this;
+ }
+
+ public static boolean addResource(@SuppressWarnings("unused") Class<?> accessor, String name, String path, boolean capture) {
+ byte[] bytes = null;
+ if (capture) {
+ try {
+ bytes = Files.readAllBytes(Paths.get(path));
+ } catch (IOException ex) {
+ return false;
+ }
+ }
+ try {
+ files.put(name, new FileInfo(name, new URL("file://" + path), bytes));
+ } catch (MalformedURLException ex) {
+ RInternalError.shouldNotReachHere("addResource " + ex.getMessage());
+ }
+ return true;
+ }
+
+ private static void gatherResources() {
+ CodeSource source = RBuiltinPackage.class.getProtectionDomain().getCodeSource();
+ try {
+ URL jarURL = source.getLocation();
+ JarFile fastrJar = new JarFile(new File(jarURL.toURI()));
+ Enumeration<JarEntry> iter = fastrJar.entries();
+ while (iter.hasMoreElements()) {
+ JarEntry entry = iter.nextElement();
+ String name = entry.getName();
+ if (name.endsWith(".R") || name.endsWith("CONTRIBUTORS")) {
+ int size = (int) entry.getSize();
+ byte[] buf = new byte[size];
+ InputStream is = fastrJar.getInputStream(entry);
+ int totalRead = 0;
+ int n;
+ while ((n = is.read(buf, totalRead, buf.length - totalRead)) > 0) {
+ totalRead += n;
+ }
+ // using a proper jar URL causes build image problems
+ // and no-one really cares what the URL is - we have the data already
+ String fileName = Paths.get(name).getFileName().toString();
+ files.put(fileName, new FileInfo(fileName, new URL("file://" + name), buf));
+ }
+ }
+ } catch (Exception ex) {
+ RInternalError.shouldNotReachHere("error locating resources: " + ex.getMessage());
+ }
+ }
+
+ @Override
+ public String[] getRFiles(Class<?> accessor, String pkgName) {
+ ArrayList<String> list = new ArrayList<>();
+ for (Map.Entry<String, FileInfo> entry : files.entrySet()) {
+ if (entry.getValue().url.toString().contains(pkgName + "/R")) {
+ String content = new String(entry.getValue().data);
+ list.add(content);
+ }
+ }
+ String[] result = new String[list.size()];
+ list.toArray(result);
+ return result;
+ }
+
+}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
index 68b4977bee06b554c5949f43247f92c5dbfeafbb..aac98e96fe31cdff43ad564b9b6b09520fd8b701 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
@@ -37,6 +37,7 @@ import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.r.nodes.builtin.base.BasePackage;
import com.oracle.truffle.r.nodes.builtin.base.BaseVariables;
+import com.oracle.truffle.r.runtime.FastROptions;
import com.oracle.truffle.r.runtime.RDeparse;
import com.oracle.truffle.r.runtime.REnvVars;
import com.oracle.truffle.r.runtime.RInternalError;
@@ -97,12 +98,14 @@ public final class RBuiltinPackages implements RBuiltinLookup {
try {
baseSource = RSource.fromFileName(basePathbase.toString(), true);
} catch (IOException ex) {
- Utils.rSuicide(String.format("unable to open the base package %s", basePathbase));
+ throw Utils.rSuicide(String.format("unable to open the base package %s", basePathbase));
}
// Load the (stub) DLL for base
- String path = baseDirPath.resolve("libs").resolve("base.so").toString();
- Source loadSource = RSource.fromTextInternal(".Internal(dyn.load(" + RRuntime.escapeString(path, false, true) + ", TRUE, TRUE, \"\"))", RSource.Internal.R_IMPL);
- RContext.getEngine().parseAndEval(loadSource, baseFrame, false);
+ if (FastROptions.LoadPackagesNativeCode.getBooleanValue()) {
+ String path = baseDirPath.resolve("libs").resolve("base.so").toString();
+ Source loadSource = RSource.fromTextInternal(".Internal(dyn.load(" + RRuntime.escapeString(path, false, true) + ", TRUE, TRUE, \"\"))", RSource.Internal.R_IMPL);
+ RContext.getEngine().parseAndEval(loadSource, baseFrame, false);
+ }
// Any RBuiltinKind.SUBSTITUTE functions installed above should not be overridden
try {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
index 170c7bb52a245cf1faabf53ff337e1079a441f8a..241fd56c01eca4051308d409096072619f128d9f 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
@@ -724,6 +724,10 @@ public class BasePackage extends RBuiltinPackage {
add(WhileBuiltin.class, WhileBuiltinNodeGen::create);
// grid intrinsics
+ addGridIntrinsics();
+ }
+
+ private void addGridIntrinsics() {
add(DoSetViewPortBuiltin.class, DoSetViewPortBuiltin::create);
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..6aef3d709ecc220de7b17f08f4e58e58cb5ab9e1
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime;
+
+public final class FastRConfig {
+ /**
+ * Whether the internal grid emulation should use AWT backed graphical devices.
+ */
+ public static final boolean InternalGridAwtSupport;
+
+ /**
+ * Umbrella option, which changes default values of other options in a way that FastR will not
+ * invoke any native code directly and other potentially security sensitive operations are
+ * restricted. Can be configured via environment variable {@code FASTR_MANAGED}.
+ */
+ public static final boolean ManagedMode;
+
+ static {
+ String managedModeVal = System.getenv("FASTR_MANAGED");
+ ManagedMode = managedModeVal != null && managedModeVal.equals("true");
+ InternalGridAwtSupport = !ManagedMode;
+ }
+
+ private FastRConfig() {
+ // only static fields
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastROptions.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastROptions.java
index ad8d5d62991725bda18dea55e9e646a9abd96384..8c99eacf36a525b2824780f99de4f8bb3092e927 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastROptions.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastROptions.java
@@ -46,7 +46,7 @@ public enum FastROptions {
TraceNativeCalls("Trace all native function calls (performed via .Call, .External, etc.)", false),
Rdebug("Rdebug=f1,f2.,,,; list of R function to call debug on (implies +Instrument)", null, true),
PerformanceWarnings("Print FastR performance warning", false),
- LoadBase("Load base package", true),
+ LoadProfiles("Load the system, site and user profile scripts.", !FastRConfig.ManagedMode),
PrintComplexLookups("Print a message for each non-trivial variable lookup", false),
FullPrecisionSum("Use 128 bit arithmetic in sum builtin", false),
InvisibleArgs("Argument writes do not trigger state transitions", true),
@@ -56,6 +56,7 @@ public enum FastROptions {
ForceSources("Generate source sections for unserialized code", false),
SharedContexts("Whether all child contexts are to be shared contexts", true),
SearchPathForcePromises("Whether all promises for frames on shared path are forced in presence of shared contexts", false),
+ LoadPackagesNativeCode("Load native code of packages, including builtin packages.", !FastRConfig.ManagedMode),
// Promises optimizations
EagerEval("If enabled, overrides all other EagerEval switches (see EagerEvalHelper)", false),
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/DefaultResourceHandlerFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/LazyResourceHandlerFactory.java
similarity index 98%
rename from com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/DefaultResourceHandlerFactory.java
rename to com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/LazyResourceHandlerFactory.java
index 618db886292158291c7492907638055b3bd57215..1befec1946704fddf99e8ecaf103d574c95feff0 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/DefaultResourceHandlerFactory.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/LazyResourceHandlerFactory.java
@@ -40,7 +40,7 @@ import com.oracle.truffle.r.runtime.ResourceHandlerFactory.Handler;
/**
* Default implementation uses the default mechanism in {@code java.lang.Class}.
*/
-class DefaultResourceHandlerFactory extends ResourceHandlerFactory implements Handler {
+class LazyResourceHandlerFactory extends ResourceHandlerFactory implements Handler {
@Override
public URL getResource(Class<?> accessor, String name) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java
index 639f77c174855e25577459a17e0b45ad17e1af1e..e0a2d61e8320f0e2edd8676e9a34562c13e26c4c 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java
@@ -33,6 +33,7 @@ import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.security.CodeSource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -190,6 +191,8 @@ public final class REnvVars implements RContext.ContextState {
return rHome;
}
+ private static CodeSource codeSource = REnvVars.class.getProtectionDomain().getCodeSource();
+
/**
* In the case where {@code R_HOME} is not set, which should only occur when FastR is invoked
* from a {@link PolyglotEngine} created by another language, we try to locate the
@@ -200,7 +203,7 @@ public final class REnvVars implements RContext.ContextState {
* @return either a valid {@code R_HOME} or {@code null}
*/
private static Path getRHomePath() {
- Path path = Paths.get(REnvVars.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent();
+ Path path = Paths.get(codeSource.getLocation().getPath()).getParent();
String markerFile = markerFile();
while (path != null) {
if (validateRHome(path, markerFile)) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RError.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RError.java
index bfa0177952d504c0fac8610c4a53f56d1bb03489..0824d30cddff34978f08716f598c5d124f0f61df 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RError.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RError.java
@@ -875,6 +875,7 @@ public final class RError extends RuntimeException {
CANNOT_CHANGE_LOCKED_ACTIVE_BINDING("cannot change active binding if binding is locked"),
NO_BINDING_FOR("no binding for \"%s\""),
INVALID_SUBSTRING_ARGS("invalid substring arguments"),
+ OBJECT_SIZE_ESTIMATE("The object size is only estimated."),
REPLACING_IN_NON_CHAR_OBJ("replacing substrings in a non-character object");
public final String message;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ResourceHandlerFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ResourceHandlerFactory.java
index b20589fd8459804332cbe644af1209bdca750a7c..f785535b8eb13581f3a81a38210827688cb6819e 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ResourceHandlerFactory.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ResourceHandlerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,14 @@ public abstract class ResourceHandlerFactory {
}
static {
- final String prop = System.getProperty("fastr.resource.factory.class", "com.oracle.truffle.r.runtime.DefaultResourceHandlerFactory");
+ String prop = System.getProperty("fastr.resource.factory.class");
+ if (prop == null) {
+ if (FastRConfig.ManagedMode) {
+ prop = "com.oracle.truffle.r.nodes.builtin.EagerResourceHandlerFactory";
+ } else {
+ prop = LazyResourceHandlerFactory.class.getName();
+ }
+ }
try {
theInstance = (ResourceHandlerFactory) Class.forName(prop).newInstance();
} catch (Exception ex) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/TempPathName.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/TempPathName.java
index 0975c771c18d9fd6085a2e197804ee10f32e6d27..7ce064541effea53262b7a2e9ea482a18bc51b26 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/TempPathName.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/TempPathName.java
@@ -84,6 +84,7 @@ public class TempPathName implements RContext.ContextState {
}
@Override
+ @TruffleBoundary
public void beforeDestroy(RContext context) {
if (context.getKind() == RContext.ContextKind.SHARE_PARENT_RW) {
return;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FifoConnections.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FifoConnections.java
index df63d1fc42ab27e999a08ff4488191dfb5be44f9..ed9b67884e082b0043be6c6457567737bc1aeb92 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FifoConnections.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FifoConnections.java
@@ -35,6 +35,7 @@ import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.ProcessOutputManager;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.conn.ConnectionSupport.AbstractOpenMode;
@@ -54,6 +55,7 @@ public class FifoConnections {
}
@Override
+ @TruffleBoundary
protected void createDelegateConnection() throws IOException {
final DelegateRConnection delegate;
if (isBlocking()) {
@@ -267,6 +269,7 @@ public class FifoConnections {
* @param path The path to the named pipe.
* @throws IOException
*/
+ @TruffleBoundary
private static void createNamedPipe(String path) throws IOException {
String[] command = new String[]{"mkfifo", path};
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FileConnections.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FileConnections.java
index 7aa052f92001c6f9bd2e2f64fa322bd8dbb91600..51e1782e0d2ec485d2cef0bfbb4bf36f89d93963 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FileConnections.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/FileConnections.java
@@ -46,6 +46,7 @@ import org.tukaani.xz.XZ;
import org.tukaani.xz.XZInputStream;
import org.tukaani.xz.XZOutputStream;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.RCompression;
import com.oracle.truffle.r.runtime.RCompression.Type;
import com.oracle.truffle.r.runtime.RError;
@@ -87,6 +88,7 @@ public class FileConnections {
}
@Override
+ @TruffleBoundary
protected void createDelegateConnection() throws IOException {
DelegateRConnection delegate = FileConnections.createDelegateConnection(this, RCompression.Type.NONE, raw);
@@ -111,6 +113,7 @@ public class FileConnections {
}
@Override
+ @TruffleBoundary
protected void createDelegateConnection() throws IOException {
setDelegate(FileConnections.createDelegateConnection(this, cType, false));
@@ -215,6 +218,7 @@ public class FileConnections {
}
}
+ @TruffleBoundary
private static DelegateRConnection createDelegateConnection(BasePathRConnection base, RCompression.Type cType, boolean raw) throws IOException {
AbstractOpenMode openMode = base.getOpenMode().abstractOpenMode;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/SocketConnections.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/SocketConnections.java
index a4ea565e9ed3f72c8a7451470a38b94a1bcf78f5..ae41e53ce740f8924db0cc2d87bc7e1fec5c64cd 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/SocketConnections.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/conn/SocketConnections.java
@@ -29,6 +29,7 @@ import java.nio.channels.ByteChannel;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.conn.ConnectionSupport.AbstractOpenMode;
import com.oracle.truffle.r.runtime.conn.ConnectionSupport.BaseRConnection;
import com.oracle.truffle.r.runtime.conn.ConnectionSupport.ConnectionClass;
@@ -56,6 +57,7 @@ public class SocketConnections {
}
@Override
+ @TruffleBoundary
protected void createDelegateConnection() throws IOException {
DelegateRConnection delegate;
if (server) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/ObjectSizeFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/ObjectSizeFactory.java
index 18a0cb472db916172c7386ab5e62fb9334a0552f..dc5b6529b927da17c556388083bd25322e654b8d 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/ObjectSizeFactory.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/ObjectSizeFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,21 @@
*/
package com.oracle.truffle.r.runtime.data;
+import com.oracle.truffle.r.runtime.FastRConfig;
import com.oracle.truffle.r.runtime.data.RObjectSize.IgnoreObjectHandler;
import com.oracle.truffle.r.runtime.data.RObjectSize.TypeCustomizer;
public abstract class ObjectSizeFactory {
static {
- final String prop = System.getProperty("fastr.objectsize.factory.class", "com.oracle.truffle.r.runtime.data.AgentObjectSizeFactory");
+ String prop = System.getProperty("fastr.objectsize.factory.class");
+ if (prop == null) {
+ if (FastRConfig.ManagedMode) {
+ prop = SimpleObjectSizeFactory.class.getName();
+ } else {
+ prop = AgentObjectSizeFactory.class.getName();
+ }
+ }
try {
theInstance = (ObjectSizeFactory) Class.forName(prop).newInstance();
} catch (Exception ex) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/SimpleObjectSizeFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/SimpleObjectSizeFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..6f5d17a46638257c775d94e706d334cadf5426f5
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/SimpleObjectSizeFactory.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.data;
+
+import java.util.HashMap;
+
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RError.Message;
+import com.oracle.truffle.r.runtime.data.RObjectSize.IgnoreObjectHandler;
+import com.oracle.truffle.r.runtime.data.RObjectSize.TypeCustomizer;
+import com.oracle.truffle.r.runtime.data.model.RAbstractAtomicVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractRawVector;
+import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
+
+/**
+ * Very simple object size calculation that does not need an instrumentation agent.
+ */
+public class SimpleObjectSizeFactory extends ObjectSizeFactory {
+ private HashMap<Class<?>, TypeCustomizer> typeCustomizers;
+
+ @Override
+ public long getObjectSize(Object obj, IgnoreObjectHandler ignoreObjectHandler) {
+ RError.warning(RError.NO_CALLER, Message.OBJECT_SIZE_ESTIMATE);
+ // Customizers
+ for (Class<?> klass : typeCustomizers.keySet()) {
+ if (obj.getClass().equals(klass)) {
+ return typeCustomizers.get(klass).getObjectSize(obj);
+ }
+ }
+ // Well known vector types
+ if (obj instanceof RAbstractDoubleVector) {
+ return Double.BYTES * ((RAbstractDoubleVector) obj).getLength();
+ } else if (obj instanceof RAbstractIntVector) {
+ return Integer.BYTES * ((RAbstractIntVector) obj).getLength();
+ } else if (obj instanceof RAbstractStringVector) {
+ int length = 0;
+ RAbstractStringVector strVec = (RAbstractStringVector) obj;
+ for (int i = 0; i < strVec.getLength(); i++) {
+ length += strVec.getDataAt(i).length();
+ }
+ return length * 2;
+ } else if (obj instanceof RAbstractLogicalVector || obj instanceof RAbstractRawVector) {
+ return Byte.BYTES * ((RAbstractAtomicVector) obj).getLength();
+ } else if (obj instanceof RAbstractListVector) {
+ int total = 0;
+ RAbstractListVector list = (RAbstractListVector) obj;
+ for (int i = 0; i < list.getLength(); i++) {
+ // Note: RLists should not be cyclic
+ total += getObjectSize(list.getDataAt(i), ignoreObjectHandler);
+ }
+ return total;
+ }
+ return 4;
+ }
+
+ @Override
+ public void registerTypeCustomizer(Class<?> klass, TypeCustomizer typeCustomizer) {
+ if (typeCustomizers == null) {
+ typeCustomizers = new HashMap<>();
+ }
+ typeCustomizers.put(klass, typeCustomizer);
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIFactory.java
index 27d418847b77266753bb988cc7fe437ce38cea01..60d3811bdbcefdcc5734b1e99cc5d6defc588114 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIFactory.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIFactory.java
@@ -23,6 +23,7 @@
package com.oracle.truffle.r.runtime.ffi;
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.r.runtime.FastRConfig;
import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.context.RContext.ContextState;
@@ -40,6 +41,7 @@ public abstract class RFFIFactory {
private enum Factory {
JNI("com.oracle.truffle.r.runtime.ffi.jni.JNI_RFFIFactory"),
LLVM("com.oracle.truffle.r.engine.interop.ffi.llvm.TruffleLLVM_RFFIFactory"),
+ MANAGED("com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory"),
NFI("com.oracle.truffle.r.engine.interop.ffi.nfi.TruffleNFI_RFFIFactory");
private final String klassName;
@@ -86,6 +88,9 @@ public abstract class RFFIFactory {
if (prop != null) {
return checkFactoryName(prop);
}
+ if (FastRConfig.ManagedMode) {
+ return Factory.MANAGED.klassName;
+ }
return DEFAULT_FACTORY.klassName;
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/FilesystemUtils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/FilesystemUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..ea6d2db107390757d02ebe5e82e258cab7a487f0
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/FilesystemUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Set;
+
+class FilesystemUtils {
+ private static PosixFilePermission[] permissionValues = PosixFilePermission.values();
+
+ static Set<PosixFilePermission> permissionsFromMode(int mode) {
+ Set<PosixFilePermission> permissions = EnumSet.noneOf(PosixFilePermission.class);
+ for (int i = 0; i < permissionValues.length; i++) {
+ if ((mode & (1 << (permissionValues.length - i - 1))) != 0) {
+ permissions.add(permissionValues[i]);
+ }
+ }
+ return permissions;
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_Base.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_Base.java
new file mode 100644
index 0000000000000000000000000000000000000000..988632777ab42c6b239cdbc8abcaa70a1c96119f
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_Base.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import static com.oracle.truffle.r.runtime.ffi.managed.FilesystemUtils.permissionsFromMode;
+import static com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory.unsupported;
+
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RError.Message;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
+
+public class Managed_Base implements BaseRFFI {
+ /**
+ * Process id is used as seed for random number generator. We return another "random" number.
+ */
+ @Override
+ public GetpidNode createGetpidNode() {
+ return new GetpidNode() {
+ private int fakePid = (int) System.currentTimeMillis();
+
+ @Override
+ public int execute() {
+ return fakePid;
+ }
+ };
+ }
+
+ @Override
+ public GetwdNode createGetwdNode() {
+ return new GetwdNode() {
+ @Override
+ @TruffleBoundary
+ public String execute() {
+ return Paths.get(".").toAbsolutePath().normalize().toString();
+ }
+ };
+ }
+
+ @Override
+ public SetwdNode createSetwdNode() {
+ return new SetwdNode() {
+ @Override
+ public int execute(String dir) {
+ throw unsupported("setwd");
+ }
+ };
+ }
+
+ @Override
+ public MkdirNode createMkdirNode() {
+ return new MkdirNode() {
+ @Override
+ @TruffleBoundary
+ public void execute(String dir, int mode) throws IOException {
+ Set<PosixFilePermission> permissions = permissionsFromMode(mode);
+ Files.createDirectories(Paths.get(dir), PosixFilePermissions.asFileAttribute(permissions));
+ }
+ };
+ }
+
+ @Override
+ public ReadlinkNode createReadlinkNode() {
+ return new ReadlinkNode() {
+ @Override
+ public String execute(String path) throws IOException {
+ throw unsupported("linknode");
+ }
+ };
+ }
+
+ @Override
+ public MkdtempNode createMkdtempNode() {
+ return new MkdtempNode() {
+ @Override
+ @TruffleBoundary
+ public String execute(String template) {
+ Path path = null;
+ boolean done = false;
+ while (!done) {
+ try {
+ path = Paths.get(template);
+ Files.createDirectories(path);
+ done = true;
+ } catch (FileAlreadyExistsException e) {
+ // nop
+ } catch (IOException e) {
+ throw RError.error(RError.NO_CALLER, Message.GENERIC, "Cannot create temp directories.");
+ }
+ }
+ return path.toString();
+ }
+ };
+ }
+
+ @Override
+ public ChmodNode createChmodNode() {
+ return new ChmodNode() {
+ @Override
+ @TruffleBoundary
+ public int execute(String path, int mode) {
+ try {
+ Files.setPosixFilePermissions(Paths.get(path), permissionsFromMode(mode));
+ return mode;
+ } catch (IOException e) {
+ throw RError.error(RError.NO_CALLER, Message.GENERIC, "Cannot change file permissions.");
+ }
+ }
+ };
+ }
+
+ @Override
+ public StrolNode createStrolNode() {
+ return null;
+ }
+
+ @Override
+ public UnameNode createUnameNode() {
+ return new UnameNode() {
+ @Override
+ public UtsName execute() {
+ return new UtsName() {
+ @Override
+ public String sysname() {
+ return System.getProperty("os.name");
+ }
+
+ @Override
+ public String release() {
+ return "";
+ }
+
+ @Override
+ public String version() {
+ return System.getProperty("os.version");
+ }
+
+ @Override
+ public String machine() {
+ return System.getProperty("os.arch");
+ }
+
+ @Override
+ public String nodename() {
+ return "";
+ }
+ };
+ }
+ };
+ }
+
+ @Override
+ public GlobNode createGlobNode() {
+ return null;
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_LapackRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_LapackRFFI.java
new file mode 100644
index 0000000000000000000000000000000000000000..2b532244fe888586a9194c3d15a61281f6b4c56c
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_LapackRFFI.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import static com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory.unsupported;
+
+import com.oracle.truffle.r.runtime.ffi.LapackRFFI;
+
+public class Managed_LapackRFFI implements LapackRFFI {
+ @Override
+ public IlaverNode createIlaverNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DgeevNode createDgeevNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public Dgeqp3Node createDgeqp3Node() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DormqrNode createDormqrNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DtrtrsNode createDtrtrsNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DgetrfNode createDgetrfNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DpotrfNode createDpotrfNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DpotriNode createDpotriNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DpstrfNode createDpstrfNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DgesvNode createDgesvNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DlangeNode createDlangeNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DgeconNode createDgeconNode() {
+ throw unsupported("lapack");
+ }
+
+ @Override
+ public DsyevrNode createDsyevrNode() {
+ throw unsupported("lapack");
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_PCRERFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_PCRERFFI.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0603452265439e902e0c86e105dcd067c85df87
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_PCRERFFI.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import static com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory.unsupported;
+
+import com.oracle.truffle.r.runtime.ffi.PCRERFFI;
+
+public class Managed_PCRERFFI implements PCRERFFI {
+ @Override
+ public MaketablesNode createMaketablesNode() {
+ throw unsupported("PCRER");
+ }
+
+ @Override
+ public CompileNode createCompileNode() {
+ throw unsupported("PCRER");
+ }
+
+ @Override
+ public GetCaptureCountNode createGetCaptureCountNode() {
+ throw unsupported("PCRER");
+ }
+
+ @Override
+ public GetCaptureNamesNode createGetCaptureNamesNode() {
+ throw unsupported("PCRER");
+ }
+
+ @Override
+ public StudyNode createStudyNode() {
+ throw unsupported("PCRER");
+ }
+
+ @Override
+ public ExecNode createExecNode() {
+ throw unsupported("PCRER");
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_REmbedRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_REmbedRFFI.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d0a0a079fe7efb08d4405daf6eb71fa88c85f7a
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_REmbedRFFI.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import static com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory.unsupported;
+
+import com.oracle.truffle.r.runtime.ffi.REmbedRFFI;
+
+public class Managed_REmbedRFFI implements REmbedRFFI {
+ @Override
+ public void suicide(String x) {
+ throw unsupported("REmbed");
+ }
+
+ @Override
+ public void cleanUp(int type, int x, int y) {
+ throw unsupported("REmbed");
+ }
+
+ @Override
+ public String readConsole(String prompt) {
+ throw unsupported("REmbed");
+ }
+
+ @Override
+ public void writeConsole(String x) {
+ throw unsupported("REmbed");
+ }
+
+ @Override
+ public void writeErrConsole(String x) {
+ throw unsupported("REmbed");
+ }
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_RFFIFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_RFFIFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..f5ec38834985636d503caed2f2000a62e1eccd55
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/managed/Managed_RFFIFactory.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.ffi.managed;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RError.Message;
+import com.oracle.truffle.r.runtime.context.RContext;
+import com.oracle.truffle.r.runtime.context.RContext.ContextState;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
+import com.oracle.truffle.r.runtime.ffi.CRFFI;
+import com.oracle.truffle.r.runtime.ffi.CallRFFI;
+import com.oracle.truffle.r.runtime.ffi.DLLRFFI;
+import com.oracle.truffle.r.runtime.ffi.GridRFFI;
+import com.oracle.truffle.r.runtime.ffi.LapackRFFI;
+import com.oracle.truffle.r.runtime.ffi.MiscRFFI;
+import com.oracle.truffle.r.runtime.ffi.PCRERFFI;
+import com.oracle.truffle.r.runtime.ffi.RApplRFFI;
+import com.oracle.truffle.r.runtime.ffi.REmbedRFFI;
+import com.oracle.truffle.r.runtime.ffi.RFFI;
+import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.StatsRFFI;
+import com.oracle.truffle.r.runtime.ffi.ToolsRFFI;
+import com.oracle.truffle.r.runtime.ffi.UserRngRFFI;
+import com.oracle.truffle.r.runtime.ffi.ZipRFFI;
+
+/**
+ * Operations that can be, at least partially, implemented in Java are implemented, other operations
+ * throw {@link RError}.
+ */
+public class Managed_RFFIFactory extends RFFIFactory implements RFFI {
+ @Override
+ protected RFFI createRFFI() {
+ return this;
+ }
+
+ @Override
+ public BaseRFFI getBaseRFFI() {
+ return new Managed_Base();
+ }
+
+ @Override
+ public LapackRFFI getLapackRFFI() {
+ return new Managed_LapackRFFI();
+ }
+
+ @Override
+ public RApplRFFI getRApplRFFI() {
+ return new RApplRFFI() {
+ @Override
+ public Dqrdc2Node createDqrdc2Node() {
+ throw unsupported("dqrdc");
+ }
+
+ @Override
+ public DqrcfNode createDqrcfNode() {
+ throw unsupported("dqrcf");
+ }
+
+ @Override
+ public DqrlsNode createDqrlsNode() {
+ throw unsupported("dqrls");
+ }
+ };
+ }
+
+ @Override
+ public StatsRFFI getStatsRFFI() {
+ return new StatsRFFI() {
+ @Override
+ public FactorNode createFactorNode() {
+ throw unsupported("factor");
+ }
+
+ @Override
+ public WorkNode createWorkNode() {
+ throw unsupported("work");
+ }
+ };
+ }
+
+ @Override
+ public ToolsRFFI getToolsRFFI() {
+ return new ToolsRFFI() {
+ @Override
+ public ParseRdNode createParseRdNode() {
+ throw unsupported("parseRD");
+ }
+ };
+ }
+
+ // TODO: will be removed anyway
+ @Override
+ public GridRFFI getGridRFFI() {
+ return new GridRFFI() {
+ @Override
+ public InitGridNode createInitGridNode() {
+ return null;
+ }
+
+ @Override
+ public KillGridNode createKillGridNode() {
+ return null;
+ }
+ };
+ }
+
+ @Override
+ public CRFFI getCRFFI() {
+ return new CRFFI() {
+ @Override
+ public InvokeCNode createInvokeCNode() {
+ throw unsupported("invoke");
+ }
+ };
+ }
+
+ @Override
+ public CallRFFI getCallRFFI() {
+ return new CallRFFI() {
+ @Override
+ public InvokeCallNode createInvokeCallNode() {
+ throw unsupported("native code invocation");
+ }
+
+ @Override
+ public InvokeVoidCallNode createInvokeVoidCallNode() {
+ throw unsupported("native code invocation");
+ }
+ };
+ }
+
+ @Override
+ public UserRngRFFI getUserRngRFFI() {
+ return new UserRngRFFI() {
+ @Override
+ public UserRngRFFINode createUserRngRFFINode() {
+ throw unsupported("user defined RNG");
+ }
+ };
+ }
+
+ @Override
+ public PCRERFFI getPCRERFFI() {
+ return new Managed_PCRERFFI();
+ }
+
+ @Override
+ public ZipRFFI getZipRFFI() {
+ return new ZipRFFI() {
+ @Override
+ public CompressNode createCompressNode() {
+ throw unsupported("zip compression");
+ }
+
+ @Override
+ public UncompressNode createUncompressNode() {
+ throw unsupported("zip decompression");
+ }
+ };
+ }
+
+ @Override
+ public DLLRFFI getDLLRFFI() {
+ return new DLLRFFI() {
+ @Override
+ public DLOpenNode createDLOpenNode() {
+ throw unsupported("DLL open");
+ }
+
+ @Override
+ public DLSymNode createDLSymNode() {
+ throw unsupported("createDLSym");
+ }
+
+ @Override
+ public DLCloseNode createDLCloseNode() {
+ throw unsupported("createDLClose");
+ }
+ };
+ }
+
+ @Override
+ public REmbedRFFI getREmbedRFFI() {
+ return new Managed_REmbedRFFI();
+ }
+
+ @Override
+ public MiscRFFI getMiscRFFI() {
+ return new MiscRFFI() {
+ @Override
+ public ExactSumNode createExactSumNode() {
+ throw unsupported("exactsum");
+ }
+ };
+ }
+
+ @Override
+ public ContextState newContextState() {
+ return new ContextState() {
+ @Override
+ public ContextState initialize(RContext context) {
+ return this;
+ }
+ };
+ }
+
+ @TruffleBoundary
+ static RError unsupported(String name) {
+ throw RError.error(RError.NO_CALLER, Message.GENERIC, String.format("Feature '%s' is not supported by managed FFI, i.e. it requires running native code.", name));
+ }
+}
diff --git a/documentation/dev/ffi.md b/documentation/dev/ffi.md
index 69fb145d11300f9028ac7b867b56ab5a9eaf5d46..0a35d7f1ef0c54804ad51eba9824c44c8c63d6e6 100644
--- a/documentation/dev/ffi.md
+++ b/documentation/dev/ffi.md
@@ -1,10 +1,13 @@
# The R FFI Implementation
# Introduction
-FastR interfaces to native C and Fortran code in a number of ways, for example, access to C library APIs not supported by the Java JDK, access to LaPack functions, and the `.Call`, `.Fortran`, `.C` builtins. Each of these are defined by a Java interface,e.g. `CallRFFI` for the `.Call` builtin. To facilitate experimentation and different implementations, the implementation of these interfaces is defined by a factory class, `RFFIFactory`, that is chosen at run time via the `fastr.ffi.factory.class` system property, or the `FASTR_RFFI` environment variable.
+FastR can interface to native C and Fortran code in a number of ways, for example, access to C library APIs not supported by the Java JDK, access to LaPack functions, and the `.Call`, `.Fortran`, `.C` builtins. Each of these are defined by a Java interface,e.g. `CallRFFI` for the `.Call` builtin. To facilitate experimentation and different implementations, the implementation of these interfaces is defined by a factory class, `RFFIFactory`, that is chosen at run time via the `fastr.ffi.factory.class` system property, or the `FASTR_RFFI` environment variable.
The factory is responsible for creating an instance of the `RFFI` interface that in turn provides access to implementations of the underlying interfaces such as `CallRFFI`. This structure allows
for each of the individual interfaces to be implemented by a different mechanism. Currently the default factory class is `JNI_RFFIFactory` which uses the Java JNI system to implement the transition to native code.
+# No native code mode
+FastR can be configured to avoid running any unmanaged code coming from GNU R or packages. It is described in more detail [here](managed_ffi.md).
+
# Native Implementation
The native implementation of the [R FFI](https://cran.r-project.org/doc/manuals/r-release/R-exts.html) is contained in the `fficall` directory of
the `com.oracle/truffle.r.native` project`. It's actually a bit more than that as it also contains code copied from GNU R, for example that supports graphics or is sufficiently
@@ -58,7 +61,7 @@ The implementation is currently incomplete.
# RFFI Initialization
Not all of the individual interfaces need to be instantiated on startup. The `getXXXRFFI()` method of `RFFI` is responsible for instantiating the `XXX` interface (e.e.g `Call`).
-However, the factory can choose to instantiate the interfqces eagerly if desired. The choice of factory class is made by `RFFIFactory.initialize()` which is called when the
+However, the factory can choose to instantiate the interfaces eagerly if desired. The choice of factory class is made by `RFFIFactory.initialize()` which is called when the
initial `RContext` is being created by `PolyglotEngine`. Note that at this stage, very little code can be executed as the initial context has not yet been fully created and registered with `PolyglotEngine`.
In general, state maintained by the `RFFI` implementation classes is `RContext` specific and to facilitate this `RFFIFactory` defines a `newContextState` method that is called by `RContext`. Again, at the point this is called the context is not active and so any execution that requires an active context must be delayed until the `initialize` method is called on the `ContextState` instance. Typically special initialization may be required on the initialization of the initial context, such as loading native libraries, and also on the initialization of a `SHARED_PARENT_RW` context kind.
diff --git a/documentation/dev/managed_ffi.md b/documentation/dev/managed_ffi.md
new file mode 100644
index 0000000000000000000000000000000000000000..4e07641430cc13487e861d24c288b7e112db7a2a
--- /dev/null
+++ b/documentation/dev/managed_ffi.md
@@ -0,0 +1,25 @@
+
+# Quick start
+FastR supports a 'managed' mode, in which it does not execute any native code directly, especially code coming from GNU R and packages,
+and tries to avoid other potentially security sensitive code, e.g. instrumentation agents. To enable this mode, clean build and run
+FastR with environment variable `FASTR_MANAGED` set to *true*.
+
+# Details
+FastR has an 'implementation' of RFFI that does not use any native code directly (e.g. through JNI) and implements only small subset of the API.
+Any usage of the unimplemented parts will cause error at runtime. To enable this RFFI implementation clean build FastR with environment variable
+`FASTR_RFFI` set to *managed* and when running FastR set java property named *fastr.rffi.factory.class* to
+`com.oracle.truffle.r.runtime.ffi.managed.Managed_RFFIFactory`.
+
+There are additional options that can restrict other usages of native code in FastR:
+
+* When FastR option `LoadPackagesNativeCode=false`, then FastR does not load builtin packages (graphics and base) native code.
+Note that loading of their native code is going to fail with *managed* RFFI implementation.
+* When FastR option `LoadProfiles=false`, then FastR does not load user profile, machine profile etc. Those scripts typically use
+some R code that ends up trying to call native code, which is again going to fail with *managed* RFFI implementation.
+* Set `FastRConfig#InternalGridAwtSupport` to `false` before building FastR. This should remove usages of AWT from FastR's
+bytecode and thus reduce the amount of native code that can be invoked by running arbitrary R code in FastR.
+
+Following option can be useful for improving security when running FastR:
+
+* Set java property *fastr.objectsize.factory.class* to `com.oracle.truffle.r.runtime.data.SimpleObjectSizeFactory` to avoid
+usage of otherwise more precise `AgentObjectSizeFactory`, which uses instrumentation agent.