From e1c172b4e8c2d4c5bb265096153af7ecb1a643c9 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 1 Feb 2017 14:11:41 -0800
Subject: [PATCH] rffi: refactor BaseRFFI into one node per function
---
.../truffle/r/library/tools/DirChmod.java | 8 +-
.../r/nodes/builtin/base/FileFunctions.java | 20 +-
.../truffle/r/nodes/builtin/base/Getwd.java | 8 +-
.../truffle/r/nodes/builtin/base/Setwd.java | 15 +-
.../r/nodes/builtin/base/SysFunctions.java | 30 +-
.../truffle/r/runtime/ffi/jni/JNI_Base.java | 208 ++++++++-----
.../oracle/truffle/r/runtime/REnvVars.java | 4 +-
.../oracle/truffle/r/runtime/RProfile.java | 6 +-
.../com/oracle/truffle/r/runtime/RSrcref.java | 3 +-
.../truffle/r/runtime/RVersionInfo.java | 4 +-
.../truffle/r/runtime/TempPathName.java | 4 +-
.../com/oracle/truffle/r/runtime/Utils.java | 3 +-
.../truffle/r/runtime/ffi/BaseRFFI.java | 279 +++++++++++++++---
.../oracle/truffle/r/runtime/rng/RRNG.java | 4 +-
14 files changed, 437 insertions(+), 159 deletions(-)
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/tools/DirChmod.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/tools/DirChmod.java
index 0bee29b13c..cf1869d34a 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/tools/DirChmod.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/tools/DirChmod.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.stream.Stream;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
@@ -32,7 +33,7 @@ import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
public abstract class DirChmod extends RExternalBuiltinNode.Arg2 {
@@ -49,7 +50,8 @@ public abstract class DirChmod extends RExternalBuiltinNode.Arg2 {
@Specialization
@TruffleBoundary
- protected RNull dirChmod(String pathName, boolean setGroupWrite) {
+ protected RNull dirChmod(String pathName, boolean setGroupWrite,
+ @Cached("create()") BaseRFFI.ChmodNode chmodNode) {
Path path = FileSystems.getDefault().getPath(pathName);
int fileMask = setGroupWrite ? GRPWRITE_FILE_MASK : FILE_MASK;
int dirMask = setGroupWrite ? GRPWRITE_DIR_MASK : DIR_MASK;
@@ -65,7 +67,7 @@ public abstract class DirChmod extends RExternalBuiltinNode.Arg2 {
int elementMode = Utils.intFilePermissions(pfa.permissions());
int newMode = Files.isDirectory(element) ? elementMode | dirMask : elementMode | fileMask;
// System.out.printf("path %s: old %o, new %o%n", element, elementMode, newMode);
- RFFIFactory.getRFFI().getBaseRFFI().chmod(element.toString(), newMode);
+ chmodNode.chmod(element.toString(), newMode);
}
} catch (IOException ex) {
// ignore
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
index 3dd5c7dd8d..47711c0552 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
@@ -56,6 +56,7 @@ import java.util.stream.Stream;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.SetClassAttributeNode;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
@@ -80,7 +81,7 @@ import com.oracle.truffle.r.runtime.data.RSymbol;
import com.oracle.truffle.r.runtime.data.RTypedValue;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
// Much of this code was influences/transcribed from GnuR src/main/platform.c
@@ -1184,7 +1185,8 @@ public class FileFunctions {
@Specialization
@TruffleBoundary
- protected byte dirCreate(String pathIn, boolean showWarnings, boolean recursive, int octMode) {
+ protected byte dirCreate(String pathIn, boolean showWarnings, boolean recursive, int octMode,
+ @Cached("create()") BaseRFFI.MkdirNode mkdirNode) {
boolean ok;
if (RRuntime.isNA(pathIn)) {
ok = false;
@@ -1192,32 +1194,32 @@ public class FileFunctions {
ok = true;
String path = Utils.tildeExpand(pathIn);
if (recursive) {
- ok = mkparentdirs(new File(path).getAbsoluteFile().getParentFile(), showWarnings, octMode);
+ ok = mkparentdirs(mkdirNode, new File(path).getAbsoluteFile().getParentFile(), showWarnings, octMode);
}
if (ok) {
- ok = mkdir(path, showWarnings, octMode);
+ ok = mkdir(mkdirNode, path, showWarnings, octMode);
}
}
return RRuntime.asLogical(ok);
}
- private boolean mkparentdirs(File file, boolean showWarnings, int mode) {
+ private boolean mkparentdirs(BaseRFFI.MkdirNode mkdirNode, File file, boolean showWarnings, int mode) {
if (file.isDirectory()) {
return true;
}
if (file.exists()) {
return false;
}
- if (mkparentdirs(file.getParentFile(), showWarnings, mode)) {
- return mkdir(file.getAbsolutePath(), showWarnings, mode);
+ if (mkparentdirs(mkdirNode, file.getParentFile(), showWarnings, mode)) {
+ return mkdir(mkdirNode, file.getAbsolutePath(), showWarnings, mode);
} else {
return false;
}
}
- private boolean mkdir(String path, boolean showWarnings, int mode) {
+ private boolean mkdir(BaseRFFI.MkdirNode mkdirNode, String path, boolean showWarnings, int mode) {
try {
- RFFIFactory.getRFFI().getBaseRFFI().mkdir(path, mode);
+ mkdirNode.mkdir(path, mode);
return true;
} catch (IOException ex) {
if (showWarnings) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Getwd.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Getwd.java
index d083355708..6476105494 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Getwd.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Getwd.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
@@ -30,15 +30,17 @@ import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.runtime.builtins.RBuiltin;
import com.oracle.truffle.r.runtime.data.RDataFactory;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
@RBuiltin(name = "getwd", kind = INTERNAL, parameterNames = {}, behavior = IO)
public abstract class Getwd extends RBuiltinNode {
+ @Child private BaseRFFI.GetwdNode getwdNode = BaseRFFI.GetwdNode.create();
+
@Specialization
@TruffleBoundary
protected Object getwd() {
- String result = RFFIFactory.getRFFI().getBaseRFFI().getwd();
+ String result = getwdNode.getwd();
return RDataFactory.createStringVector(result);
}
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Setwd.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Setwd.java
index 9180e76850..af7c7482e0 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Setwd.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Setwd.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
@@ -31,13 +31,14 @@ import static com.oracle.truffle.r.runtime.builtins.RBehavior.IO;
import static com.oracle.truffle.r.runtime.builtins.RBuiltinKind.INTERNAL;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.r.nodes.builtin.CastBuilder;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.builtins.RBuiltin;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
@RBuiltin(name = "setwd", visibility = OFF, kind = INTERNAL, parameterNames = "path", behavior = IO)
public abstract class Setwd extends RBuiltinNode {
@@ -49,14 +50,16 @@ public abstract class Setwd extends RBuiltinNode {
@Specialization
@TruffleBoundary
- protected Object setwd(String path) {
- String owd = RFFIFactory.getRFFI().getBaseRFFI().getwd();
+ protected Object setwd(String path,
+ @Cached("create()") BaseRFFI.GetwdNode getwdNode,
+ @Cached("create()") BaseRFFI.SetwdNode setwdNode) {
+ String owd = getwdNode.getwd();
String nwd = Utils.tildeExpand(path);
- int rc = RFFIFactory.getRFFI().getBaseRFFI().setwd(nwd);
+ int rc = setwdNode.setwd(nwd);
if (rc != 0) {
throw RError.error(this, RError.Message.CANNOT_CHANGE_DIRECTORY);
} else {
- String nwdAbs = RFFIFactory.getRFFI().getBaseRFFI().getwd();
+ String nwdAbs = getwdNode.getwd();
Utils.updateCurwd(nwdAbs);
return owd;
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/SysFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/SysFunctions.java
index e62c27d3e4..8796f70527 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/SysFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/SysFunctions.java
@@ -45,6 +45,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.Frame;
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
@@ -68,17 +69,19 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
import com.oracle.truffle.r.runtime.ffi.BaseRFFI.UtsName;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
public class SysFunctions {
@RBuiltin(name = "Sys.getpid", kind = INTERNAL, parameterNames = {}, behavior = READS_STATE)
public abstract static class SysGetpid extends RBuiltinNode {
+ @Child private BaseRFFI.GetpidNode getpidNode = BaseRFFI.GetpidNode.create();
+
@Specialization
@TruffleBoundary
protected Object sysGetPid() {
- int pid = RFFIFactory.getRFFI().getBaseRFFI().getpid();
+ int pid = getpidNode.getpid();
return RDataFactory.createIntVectorFromScalar(pid);
}
}
@@ -251,7 +254,8 @@ public class SysFunctions {
@Specialization
@TruffleBoundary
- protected Object sysReadlink(RAbstractStringVector vector) {
+ protected Object sysReadlink(RAbstractStringVector vector,
+ @Cached("create()") BaseRFFI.ReadlinkNode readlinkNode) {
String[] paths = new String[vector.getLength()];
boolean complete = RDataFactory.COMPLETE_VECTOR;
for (int i = 0; i < paths.length; i++) {
@@ -259,7 +263,7 @@ public class SysFunctions {
if (RRuntime.isNA(path)) {
paths[i] = path;
} else {
- paths[i] = doSysReadLink(path);
+ paths[i] = doSysReadLink(path, readlinkNode);
}
if (RRuntime.isNA(paths[i])) {
complete = RDataFactory.INCOMPLETE_VECTOR;
@@ -269,10 +273,10 @@ public class SysFunctions {
}
@TruffleBoundary
- private static String doSysReadLink(String path) {
+ private static String doSysReadLink(String path, BaseRFFI.ReadlinkNode readlinkNode) {
String s;
try {
- s = RFFIFactory.getRFFI().getBaseRFFI().readlink(path);
+ s = readlinkNode.readlink(path);
if (s == null) {
s = "";
}
@@ -294,14 +298,15 @@ public class SysFunctions {
@Specialization
@TruffleBoundary
- protected RLogicalVector sysChmod(RAbstractStringVector pathVec, RAbstractIntVector octmode, @SuppressWarnings("unused") boolean useUmask) {
+ protected RLogicalVector sysChmod(RAbstractStringVector pathVec, RAbstractIntVector octmode, @SuppressWarnings("unused") boolean useUmask,
+ @Cached("create()") BaseRFFI.ChmodNode chmodNode) {
byte[] data = new byte[pathVec.getLength()];
for (int i = 0; i < data.length; i++) {
String path = Utils.tildeExpand(pathVec.getDataAt(i));
if (path.length() == 0 || RRuntime.isNA(path)) {
continue;
}
- int result = RFFIFactory.getRFFI().getBaseRFFI().chmod(path, octmode.getDataAt(i % octmode.getLength()));
+ int result = chmodNode.chmod(path, octmode.getDataAt(i % octmode.getLength()));
data[i] = RRuntime.asLogical(result == 0);
}
return RDataFactory.createLogicalVector(data, RDataFactory.COMPLETE_VECTOR);
@@ -338,10 +343,12 @@ public class SysFunctions {
private static final String[] NAMES = new String[]{"sysname", "release", "version", "nodename", "machine", "login", "user", "effective_user"};
private static final RStringVector NAMES_ATTR = RDataFactory.createStringVector(NAMES, RDataFactory.COMPLETE_VECTOR);
+ @Child private BaseRFFI.UnameNode unameNode = BaseRFFI.UnameNode.create();
+
@Specialization
@TruffleBoundary
protected Object sysTime() {
- UtsName utsname = RFFIFactory.getRFFI().getBaseRFFI().uname();
+ UtsName utsname = unameNode.uname();
String[] data = new String[NAMES.length];
data[0] = utsname.sysname();
data[1] = utsname.release();
@@ -367,7 +374,8 @@ public class SysFunctions {
@Specialization
@TruffleBoundary
- protected Object sysGlob(RAbstractStringVector pathVec, @SuppressWarnings("unused") boolean dirMask) {
+ protected Object sysGlob(RAbstractStringVector pathVec, @SuppressWarnings("unused") boolean dirMask,
+ @Cached("create()") BaseRFFI.GlobNode globNode) {
ArrayList<String> matches = new ArrayList<>();
// Sys.glob closure already called path.expand
for (int i = 0; i < pathVec.getLength(); i++) {
@@ -375,7 +383,7 @@ public class SysFunctions {
if (pathPattern.length() == 0 || RRuntime.isNA(pathPattern)) {
continue;
}
- ArrayList<String> pathPatternMatches = RFFIFactory.getRFFI().getBaseRFFI().glob(pathPattern);
+ ArrayList<String> pathPatternMatches = globNode.glob(pathPattern);
matches.addAll(pathPatternMatches);
}
String[] data = new String[matches.size()];
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Base.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Base.java
index 08c7928e00..d96a06215a 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Base.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Base.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
@@ -28,98 +28,118 @@ import java.util.ArrayList;
import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
public class JNI_Base implements BaseRFFI {
- @Override
- public int getpid() {
- return native_getpid();
- }
-
- @Override
- public int setwd(String dir) {
- return native_setwd(dir);
+ public static class JNI_GetpidNode extends GetpidNode {
+ @Override
+ public int getpid() {
+ return native_getpid();
+ }
}
- @Override
- public String getwd() {
- byte[] buf = new byte[4096];
- int rc = native_getwd(buf, buf.length);
- if (rc == 0) {
- return null;
- } else {
- int i = 0;
- while (buf[i] != 0 && i < buf.length) {
- i++;
+ public static class JNI_GetwdNode extends GetwdNode {
+ @Override
+ public String getwd() {
+ byte[] buf = new byte[4096];
+ int rc = native_getwd(buf, buf.length);
+ if (rc == 0) {
+ return null;
+ } else {
+ int i = 0;
+ while (buf[i] != 0 && i < buf.length) {
+ i++;
+ }
+ return new String(buf, 0, i);
}
- return new String(buf, 0, i);
}
}
- private static final int EINVAL = 22;
+ public static class JNI_SetwdNode extends SetwdNode {
+ @Override
+ public int setwd(String dir) {
+ return native_setwd(dir);
+ }
+ }
- @Override
- public String readlink(String path) throws IOException {
- int[] errno = new int[]{0};
- String s = native_readlink(path, errno);
- if (s == null) {
- if (errno[0] == EINVAL) {
- // not a link
- } else {
- // some other error
- throw new IOException("readlink failed: " + errno[0]);
+ public static class JNI_ReadlinkNode extends ReadlinkNode {
+ private static final int EINVAL = 22;
+
+ @Override
+ public String readlink(String path) throws IOException {
+ int[] errno = new int[]{0};
+ String s = native_readlink(path, errno);
+ if (s == null) {
+ if (errno[0] == EINVAL) {
+ // not a link
+ } else {
+ // some other error
+ throw new IOException("readlink failed: " + errno[0]);
+ }
}
+ return s;
}
- return s;
}
- @Override
- public String mkdtemp(String template) {
- /*
- * Not only must the (C) string end in XXXXXX it must also be null-terminated. Since it is
- * modified by mkdtemp we must make a copy.
- */
- byte[] bytes = template.getBytes();
- byte[] ztbytes = new byte[bytes.length + 1];
- System.arraycopy(bytes, 0, ztbytes, 0, bytes.length);
- ztbytes[bytes.length] = 0;
- long result = native_mkdtemp(ztbytes);
- if (result == 0) {
- return null;
- } else {
- return new String(ztbytes, 0, bytes.length);
+ public static class JNI_MkdtempNode extends MkdtempNode {
+ @Override
+ public String mkdtemp(String template) {
+ /*
+ * Not only must the (C) string end in XXXXXX it must also be null-terminated. Since it
+ * is modified by mkdtemp we must make a copy.
+ */
+ byte[] bytes = template.getBytes();
+ byte[] ztbytes = new byte[bytes.length + 1];
+ System.arraycopy(bytes, 0, ztbytes, 0, bytes.length);
+ ztbytes[bytes.length] = 0;
+ long result = native_mkdtemp(ztbytes);
+ if (result == 0) {
+ return null;
+ } else {
+ return new String(ztbytes, 0, bytes.length);
+ }
}
}
- @Override
- public void mkdir(String dir, int mode) throws IOException {
- int rc = native_mkdir(dir, mode);
- if (rc != 0) {
- throw new IOException("mkdir " + dir + " failed");
+ public static class JNI_MkdirNode extends MkdirNode {
+ @Override
+ public void mkdir(String dir, int mode) throws IOException {
+ int rc = native_mkdir(dir, mode);
+ if (rc != 0) {
+ throw new IOException("mkdir " + dir + " failed");
+ }
}
}
- @Override
- public int chmod(String path, int mode) {
- return native_chmod(path, mode);
+ public static class JNI_ChmodNode extends ChmodNode {
+ @Override
+ public int chmod(String path, int mode) {
+ return native_chmod(path, mode);
+ }
}
- @Override
- public long strtol(String s, int base) throws IllegalArgumentException {
- int[] errno = new int[]{0};
- long result = native_strtol(s, base, errno);
- if (errno[0] != 0) {
- throw new IllegalArgumentException("strtol failure");
- } else {
- return result;
+ public static class JNI_StrolNode extends StrolNode {
+ @Override
+ public long strtol(String s, int base) throws IllegalArgumentException {
+ int[] errno = new int[]{0};
+ long result = native_strtol(s, base, errno);
+ if (errno[0] != 0) {
+ throw new IllegalArgumentException("strtol failure");
+ } else {
+ return result;
+ }
}
}
- @Override
- public UtsName uname() {
- return JNI_UtsName.get();
+ public static class JNI_UnameNode extends UnameNode {
+ @Override
+ public UtsName uname() {
+ return JNI_UtsName.get();
+ }
}
- @Override
- public ArrayList<String> glob(String pattern) {
- return JNI_Glob.glob(pattern);
+ public static class JNI_GlobNode extends GlobNode {
+ @Override
+ public ArrayList<String> glob(String pattern) {
+ return JNI_Glob.glob(pattern);
+ }
}
// Checkstyle: stop method name
@@ -139,4 +159,54 @@ public class JNI_Base implements BaseRFFI {
private static native long native_strtol(String s, int base, int[] errno);
private static native String native_readlink(String s, int[] errno);
+
+ @Override
+ public GetpidNode createGetpidNode() {
+ return new JNI_GetpidNode();
+ }
+
+ @Override
+ public GetwdNode createGetwdNode() {
+ return new JNI_GetwdNode();
+ }
+
+ @Override
+ public SetwdNode createSetwdNode() {
+ return new JNI_SetwdNode();
+ }
+
+ @Override
+ public MkdirNode createMkdirNode() {
+ return new JNI_MkdirNode();
+ }
+
+ @Override
+ public ReadlinkNode createReadlinkNode() {
+ return new JNI_ReadlinkNode();
+ }
+
+ @Override
+ public MkdtempNode createMkdtempNode() {
+ return new JNI_MkdtempNode();
+ }
+
+ @Override
+ public ChmodNode createChmodNode() {
+ return new JNI_ChmodNode();
+ }
+
+ @Override
+ public StrolNode createStrolNode() {
+ return new JNI_StrolNode();
+ }
+
+ @Override
+ public UnameNode createUnameNode() {
+ return new JNI_UnameNode();
+ }
+
+ @Override
+ public GlobNode createGlobNode() {
+ return new JNI_GlobNode();
+ }
}
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 d6045a767b..86e5fd3060 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
@@ -37,7 +37,7 @@ import java.util.Map;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.vm.PolyglotEngine;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
/**
* Repository for environment variables, including those set by FastR itself, e.g.
@@ -88,7 +88,7 @@ public final class REnvVars implements RContext.ContextState {
String userFile = envVars.get("R_ENVIRON_USER");
if (userFile == null) {
String dotRenviron = ".Renviron";
- userFile = fileSystem.getPath(RFFIFactory.getRFFI().getBaseRFFI().getwd(), dotRenviron).toString();
+ userFile = fileSystem.getPath((String) BaseRFFI.GetwdRootNode.create().getCallTarget().call(), dotRenviron).toString();
if (!new File(userFile).exists()) {
userFile = fileSystem.getPath(System.getProperty("user.home"), dotRenviron).toString();
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java
index 3af2daa50e..acd5193d57 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,7 @@ import java.nio.file.Path;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
/**
* Handles the setup of system, site and user profile code. N.B. this class only reads the files and
@@ -68,7 +68,7 @@ public final class RProfile implements RContext.ContextState {
String userProfilePath = envVars.get("R_PROFILE_USER");
if (userProfilePath == null) {
String dotRenviron = ".Rprofile";
- userProfilePath = fileSystem.getPath(RFFIFactory.getRFFI().getBaseRFFI().getwd(), dotRenviron).toString();
+ userProfilePath = fileSystem.getPath((String) BaseRFFI.GetwdRootNode.create().getCallTarget().call(), dotRenviron).toString();
if (!new File(userProfilePath).exists()) {
userProfilePath = fileSystem.getPath(System.getProperty("user.home"), dotRenviron).toString();
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSrcref.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSrcref.java
index 5de8f818ee..c2b9e89aa7 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSrcref.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSrcref.java
@@ -27,6 +27,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.env.REnvironment.PutException;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
@@ -79,7 +80,7 @@ public class RSrcref {
env.safePut(SrcrefFields.timestamp.name(), mtime);
env.safePut(SrcrefFields.filename.name(), path.toString());
env.safePut(SrcrefFields.isFile.name(), RRuntime.LOGICAL_TRUE);
- env.safePut(SrcrefFields.wd.name(), RFFIFactory.getRFFI().getBaseRFFI().getwd());
+ env.safePut(SrcrefFields.wd.name(), BaseRFFI.GetwdRootNode.create().getCallTarget().call());
env.setClassAttr(SRCFILE_ATTR);
return env;
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
index 8e64036349..6336fb8835 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionInfo.java
@@ -24,8 +24,8 @@ package com.oracle.truffle.r.runtime;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
import com.oracle.truffle.r.runtime.ffi.BaseRFFI.UtsName;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
public enum RVersionInfo {
// @formatter:off
@@ -82,7 +82,7 @@ public enum RVersionInfo {
CompilerDirectives.transferToInterpreterAndInvalidate();
ListValues = new String[VALUES.length];
ListNames = new String[VALUES.length];
- UtsName utsname = RFFIFactory.getRFFI().getBaseRFFI().uname();
+ UtsName utsname = (UtsName) BaseRFFI.UnameRootNode.create().getCallTarget().call();
String osName = toFirstLower(utsname.sysname());
String vendor = osName.equals("darwin") ? "apple" : "unknown";
OS.value = osName + utsname.release();
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 f829eb438a..d0783f13cf 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
@@ -29,7 +29,7 @@ import java.util.Random;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
/**
*
@@ -63,7 +63,7 @@ public class TempPathName implements RContext.ContextState {
if (!startingTempDirPath.isAbsolute()) {
startingTempDirPath = startingTempDirPath.toAbsolutePath();
}
- String t = RFFIFactory.getRFFI().getBaseRFFI().mkdtemp(startingTempDirPath.toString() + "XXXXXX");
+ String t = (String) BaseRFFI.MkdtempRootNode.create().getCallTarget().call(startingTempDirPath.toString() + "XXXXXX");
if (t != null) {
tempDirPath = t;
} else {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
index 639ece39b6..19bb59be13 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
@@ -60,6 +60,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RPairList;
import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
@@ -284,7 +285,7 @@ public final class Utils {
*/
public static Path getLogPath(String fileName) {
String root = RContext.isEmbedded() ? "/tmp" : REnvVars.rHome();
- int pid = RFFIFactory.getRFFI().getBaseRFFI().getpid();
+ int pid = (int) BaseRFFI.GetpidRootNode.create().getCallTarget().call();
String baseName = RContext.isEmbedded() ? fileName + "-" + Integer.toString(pid) : fileName;
return FileSystems.getDefault().getPath(root, baseName);
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/BaseRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/BaseRFFI.java
index fe950fa2a4..d3124d1a93 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/BaseRFFI.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/BaseRFFI.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
@@ -25,55 +25,110 @@ package com.oracle.truffle.r.runtime.ffi;
import java.io.IOException;
import java.util.ArrayList;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.r.runtime.context.RContext;
+
/**
* A statically typed interface to exactly those native functions required by the R {@code base}
* package, because the functionality is not provided by the JDK. These methods do not necessarily
* map 1-1 to a native function, they may involve the invocation of several native functions.
*/
public interface BaseRFFI {
- int getpid();
+ abstract class GetpidNode extends Node {
+ public abstract int getpid();
- /**
- * Returns the current working directory, in the face of calls to {@link #setwd}.
- */
- String getwd();
+ public static GetpidNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createGetpidNode();
+ }
+ }
- /**
- * Sets the current working directory to {@code dir}. (cf. Unix {@code chdir}).
- *
- * @return 0 if successful.
- */
- int setwd(String dir);
+ abstract class GetwdNode extends Node {
+ /**
+ * Returns the current working directory, in the face of calls to {@code setwd}.
+ */
+ public abstract String getwd();
- /**
- * Create directory with given mode. Exception is thrown omn error.
- */
- void mkdir(String dir, int mode) throws IOException;
-
- /**
- * Try to convert a symbolic link to it's target.
- *
- * @param path the link path
- * @return the target if {@code path} is a link else {@code null}
- * @throws IOException for any other error except "not a link"
- */
- String readlink(String path) throws IOException;
+ public static GetwdNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createGetwdNode();
+ }
+ }
- /**
- * Creates a temporary directory using {@code template} and return the resulting path or
- * {@code null} if error.
- */
- String mkdtemp(String template);
+ abstract class SetwdNode extends Node {
+ /**
+ * Sets the current working directory to {@code dir}. (cf. Unix {@code chdir}).
+ *
+ * @return 0 if successful.
+ */
+ public abstract int setwd(String dir);
- /**
- * Change the file mode of {@code path}.
- */
- int chmod(String path, int mode);
+ public static SetwdNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createSetwdNode();
+ }
+ }
- /**
- * Convert string to long.
- */
- long strtol(String s, int base) throws IllegalArgumentException;
+ abstract class MkdirNode extends Node {
+ /**
+ * Create directory with given mode. Exception is thrown omn error.
+ */
+ public abstract void mkdir(String dir, int mode) throws IOException;
+
+ public static MkdirNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createMkdirNode();
+ }
+ }
+
+ abstract class ReadlinkNode extends Node {
+ /**
+ * Try to convert a symbolic link to it's target.
+ *
+ * @param path the link path
+ * @return the target if {@code path} is a link else {@code null}
+ * @throws IOException for any other error except "not a link"
+ */
+ public abstract String readlink(String path) throws IOException;
+
+ public static ReadlinkNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createReadlinkNode();
+ }
+ }
+
+ abstract class MkdtempNode extends Node {
+ /**
+ * Creates a temporary directory using {@code template} and return the resulting path or
+ * {@code null} if error.
+ */
+ public abstract String mkdtemp(String template);
+
+ public static MkdtempNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createMkdtempNode();
+ }
+ }
+
+ abstract class ChmodNode extends Node {
+ /**
+ * Change the file mode of {@code path}.
+ */
+ public abstract int chmod(String path, int mode);
+
+ public static ChmodNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createChmodNode();
+ }
+ }
+
+ abstract class StrolNode extends Node {
+ /**
+ * Convert string to long.
+ */
+ public abstract long strtol(String s, int base) throws IllegalArgumentException;
+
+ public static StrolNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createStrolNode();
+ }
+ }
public interface UtsName {
String sysname();
@@ -87,14 +142,148 @@ public interface BaseRFFI {
String nodename();
}
- /**
- * Return {@code utsname} info.
+ abstract class UnameNode extends Node {
+ /**
+ * Return {@code utsname} info.
+ */
+ public abstract UtsName uname();
+
+ public static UnameNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createUnameNode();
+ }
+ }
+
+ abstract class GlobNode extends Node {
+ /**
+ * Returns an array of pathnames that match {@code pattern} using the OS glob function. This
+ * is done in native code because it is very hard to write in Java in the face of
+ * {@code setwd}.
+ */
+ public abstract ArrayList<String> glob(String pattern);
+
+ public static GlobNode create() {
+ return RFFIFactory.getRFFI().getBaseRFFI().createGlobNode();
+ }
+ }
+
+ /*
+ * The RFFI implementation influences exactly what subclass of the above nodes is created. Each
+ * implementation must therefore, implement these methods that are called by the associated
+ * "public static create()" methods above.
*/
- UtsName uname();
- /**
- * Returns an array of pathnames that match {@code pattern} using the OS glob function. This is
- * done in native code because it is very hard to write in Java in the face of {@link #setwd}.
+ GetpidNode createGetpidNode();
+
+ GetwdNode createGetwdNode();
+
+ SetwdNode createSetwdNode();
+
+ MkdirNode createMkdirNode();
+
+ ReadlinkNode createReadlinkNode();
+
+ MkdtempNode createMkdtempNode();
+
+ ChmodNode createChmodNode();
+
+ StrolNode createStrolNode();
+
+ UnameNode createUnameNode();
+
+ GlobNode createGlobNode();
+
+ /*
+ * Some functions are called from non-Truffle contexts, which requires a RootNode
*/
- ArrayList<String> glob(String pattern);
+
+ abstract class BaseRFFIRootNode<T extends Node> extends RootNode {
+ @Child T baseRFFINode;
+
+ private BaseRFFIRootNode(T baseRFFINode) {
+ super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), null, new FrameDescriptor());
+ this.baseRFFINode = baseRFFINode;
+ Truffle.getRuntime().createCallTarget(this);
+ }
+ }
+
+ final class GetpidRootNode extends BaseRFFIRootNode<GetpidNode> {
+ private static GetpidRootNode getpidRootNode;
+
+ private GetpidRootNode() {
+ super(RFFIFactory.getRFFI().getBaseRFFI().createGetpidNode());
+ }
+
+ @Override
+ public Object execute(VirtualFrame frame) {
+ return baseRFFINode.getpid();
+ }
+
+ public static GetpidRootNode create() {
+ if (getpidRootNode == null) {
+ getpidRootNode = new GetpidRootNode();
+ }
+ return getpidRootNode;
+ }
+ }
+
+ final class GetwdRootNode extends BaseRFFIRootNode<GetwdNode> {
+ private static GetwdRootNode getwdRootNode;
+
+ private GetwdRootNode() {
+ super(RFFIFactory.getRFFI().getBaseRFFI().createGetwdNode());
+ }
+
+ @Override
+ public Object execute(VirtualFrame frame) {
+ return baseRFFINode.getwd();
+ }
+
+ public static GetwdRootNode create() {
+ if (getwdRootNode == null) {
+ getwdRootNode = new GetwdRootNode();
+ }
+ return getwdRootNode;
+ }
+ }
+
+ final class MkdtempRootNode extends BaseRFFIRootNode<MkdtempNode> {
+ private static MkdtempRootNode mkdtempRootNode;
+
+ private MkdtempRootNode() {
+ super(RFFIFactory.getRFFI().getBaseRFFI().createMkdtempNode());
+ }
+
+ @Override
+ public Object execute(VirtualFrame frame) {
+ Object[] args = frame.getArguments();
+ return baseRFFINode.mkdtemp((String) args[0]);
+ }
+
+ public static MkdtempRootNode create() {
+ if (mkdtempRootNode == null) {
+ mkdtempRootNode = new MkdtempRootNode();
+ }
+ return mkdtempRootNode;
+ }
+ }
+
+ final class UnameRootNode extends BaseRFFIRootNode<UnameNode> {
+ private static UnameRootNode unameRootNode;
+
+ private UnameRootNode() {
+ super(RFFIFactory.getRFFI().getBaseRFFI().createUnameNode());
+ }
+
+ @Override
+ public Object execute(VirtualFrame frame) {
+ return baseRFFINode.uname();
+ }
+
+ public static UnameRootNode create() {
+ if (unameRootNode == null) {
+ unameRootNode = new UnameRootNode();
+ }
+ return unameRootNode;
+ }
+ }
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/rng/RRNG.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/rng/RRNG.java
index 7ab4c8007b..db3f531e93 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/rng/RRNG.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/rng/RRNG.java
@@ -25,7 +25,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.RPromise;
import com.oracle.truffle.r.runtime.data.RTypedValue;
import com.oracle.truffle.r.runtime.env.REnvironment;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
+import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
import com.oracle.truffle.r.runtime.rng.mm.MarsagliaMulticarry;
import com.oracle.truffle.r.runtime.rng.mt.MersenneTwister;
import com.oracle.truffle.r.runtime.rng.user.UserRNG;
@@ -294,7 +294,7 @@ public class RRNG {
* Create a random integer.
*/
public static Integer timeToSeed() {
- int pid = RFFIFactory.getRFFI().getBaseRFFI().getpid();
+ int pid = (int) BaseRFFI.GetpidRootNode.create().getCallTarget().call();
int millis = (int) (System.currentTimeMillis() & 0xFFFFFFFFL);
return (millis << 16) ^ pid;
}
--
GitLab