From c0a2be8a8595f4625be9d91b78e197a6dd593225 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Sat, 28 Jan 2017 18:51:14 -0800
Subject: [PATCH] RFFI: refactor upcalls into separate interfaces; fix
R_Home/R_Interactive rewrites; make tempdir context sensitive, clean up
CallRFFI
---
.../interop/ffi/llvm/TruffleLLVM_Call.java | 13 +-
.../fficall/src/include/Defn.h | 8 +-
.../fficall/src/jni/Rembedded.c | 5 +-
.../fficall/src/jni/Rinternals.c | 6 +-
.../fficall/src/jni/call_rffi.c | 10 +-
.../fficall/src/jni/variables.c | 17 +-
.../fficall/src/variable_defs/variable_defs.h | 3 +-
com.oracle.truffle.r.native/include/Makefile | 7 +-
...ce_interactive => ed_Rinterface_variables} | 4 +-
.../r/nodes/ffi/TraceUpCallsAdapter.java | 4 +-
.../truffle/r/nodes/ffi/UpCallsIndex.java | 2 +-
.../truffle/r/nodes/ffi/UpCallsRFFIImpl.java | 9 +-
.../truffle/r/runtime/ffi/RFFIVariables.java | 14 +-
.../truffle/r/runtime/ffi/jni/JNI_Call.java | 34 +--
.../truffle/r/runtime/TempPathName.java | 64 ++---
.../truffle/r/runtime/context/RContext.java | 6 +-
.../truffle/r/runtime/ffi/CallRFFI.java | 13 +-
.../truffle/r/runtime/ffi/IDEUpCallsRFFI.java | 51 ++++
.../r/runtime/ffi/RContextUpCallsRFFI.java | 44 +++
.../truffle/r/runtime/ffi/StdUpCallsRFFI.java | 239 ++++++++++++++++
.../truffle/r/runtime/ffi/UpCallsRFFI.java | 255 +-----------------
21 files changed, 425 insertions(+), 383 deletions(-)
rename com.oracle.truffle.r.native/include/{ed_Rinterface_interactive => ed_Rinterface_variables} (72%)
create mode 100644 com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/IDEUpCallsRFFI.java
create mode 100644 com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RContextUpCallsRFFI.java
create mode 100644 com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/StdUpCallsRFFI.java
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ffi/llvm/TruffleLLVM_Call.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ffi/llvm/TruffleLLVM_Call.java
index 55ebfc3efd..5b70553584 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ffi/llvm/TruffleLLVM_Call.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ffi/llvm/TruffleLLVM_Call.java
@@ -101,7 +101,7 @@ class TruffleLLVM_Call implements CallRFFI {
}
VirtualFrame frame = TruffleRFFIFrameHelper.create();
Node executeNode = Message.createExecute(2).createNode();
- RFFIVariables[] variables = RFFIVariables.values();
+ RFFIVariables[] variables = RFFIVariables.initialize();
for (int i = 0; i < variables.length; i++) {
RFFIVariables var = variables[i];
Object value = var.getValue();
@@ -230,17 +230,6 @@ class TruffleLLVM_Call implements CallRFFI {
splitTruffleCallRFFINode.execute(nativeCallInfo, args, true);
}
- @Override
- public void setTempDir(String tempDir) {
- // TODO Truffleize
- new JNI_CallRFFINode().setTempDir(tempDir);
- }
-
- @Override
- public void setInteractive(boolean interactive) {
- // TODO Truffleize
- new JNI_CallRFFINode().setInteractive(interactive);
- }
}
/**
diff --git a/com.oracle.truffle.r.native/fficall/src/include/Defn.h b/com.oracle.truffle.r.native/fficall/src/include/Defn.h
index 2b4d813d23..c210dc30c1 100644
--- a/com.oracle.truffle.r.native/fficall/src/include/Defn.h
+++ b/com.oracle.truffle.r.native/fficall/src/include/Defn.h
@@ -6,7 +6,7 @@
* Copyright (c) 1995, 1996, 1997 Robert Gentleman and Ross Ihaka
* Copyright (c) 1995-2014, The R Core Team
* Copyright (c) 2002-2008, The R Foundation
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -48,10 +48,12 @@ void Rf_checkArityCall(SEXP, SEXP, SEXP);
extern SEXP R_DeviceSymbol;
extern SEXP R_DevicesSymbol;
-extern Rboolean R_Interactive;
+extern Rboolean FASTR_Interactive();
+#define R_Interactive FASTR_Interactive()
extern Rboolean R_Visible;
int R_ReadConsole(const char *, unsigned char *, int, int);
-extern const char *R_Home;
+extern const char *FASTR_R_Home();
+#define R_Home FASTR_R_Home()
extern const char *R_TempDir;
//#define HAVE_MBSTATE_T 1 // actually from config.h
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
index 22ad74dcdf..c9b70d1372 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1995-2015, The R Core Team
* Copyright (c) 2003, The R Foundation
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -190,6 +190,7 @@ void R_SaveGlobalEnvToFile(const char *f) {
void R_Suicide(const char *s) { ptr_R_Suicide(s); }
+#undef R_Interactive
void R_DefParams(Rstart rs) {
// These are the GnuR defaults and correspond to the settings in RStartParams
@@ -235,7 +236,7 @@ void R_set_command_line_arguments(int argc, char **argv) {
int Rf_initEmbeddedR(int argc, char *argv[]) {
Rf_initialize_R(argc, argv);
- R_Interactive = TRUE;
+// R_Interactive = TRUE;
setup_Rmainloop();
return 1;
}
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c b/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
index bfa6afc525..5d57760780 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
@@ -101,7 +101,7 @@ static jmethodID SET_TYPEOF_FASTR_MethodID;
static jmethodID TYPEOF_MethodID;
static jmethodID OBJECT_MethodID;
static jmethodID DUPLICATE_ATTRIB_MethodID;
-static jmethodID isS4ObjectMethodID;
+static jmethodID IS_S4_OBJECTMethodID;
static jmethodID logNotCharSXPWrapperMethodID;
static jmethodID R_tryEvalMethodID;
static jmethodID RDEBUGMethodID;
@@ -205,7 +205,7 @@ void init_internals(JNIEnv *env) {
TYPEOF_MethodID = checkGetMethodID(env, UpCallsRFFIClass, "TYPEOF", "(Ljava/lang/Object;)I", 0);
OBJECT_MethodID = checkGetMethodID(env, UpCallsRFFIClass, "OBJECT", "(Ljava/lang/Object;)I", 0);
DUPLICATE_ATTRIB_MethodID = checkGetMethodID(env, UpCallsRFFIClass, "DUPLICATE_ATTRIB", "(Ljava/lang/Object;Ljava/lang/Object;)V", 0);
- isS4ObjectMethodID = checkGetMethodID(env, UpCallsRFFIClass, "isS4Object", "(Ljava/lang/Object;)I", 0);
+ IS_S4_OBJECTMethodID = checkGetMethodID(env, UpCallsRFFIClass, "IS_S4_OBJECT", "(Ljava/lang/Object;)I", 0);
logNotCharSXPWrapperMethodID = checkGetMethodID(env, UpCallsRFFIClass, "logNotCharSXPWrapper", "(Ljava/lang/Object;)V", 0);
R_tryEvalMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_tryEval", "(Ljava/lang/Object;Ljava/lang/Object;Z)Ljava/lang/Object;", 0);
RDEBUGMethodID = checkGetMethodID(env, UpCallsRFFIClass, "RDEBUG", "(Ljava/lang/Object;)I", 0);
@@ -1367,7 +1367,7 @@ R_len_t R_BadLongVector(SEXP x, const char *y, int z) {
int IS_S4_OBJECT(SEXP x) {
JNIEnv *env = getEnv();
- return (*env)->CallIntMethod(env, UpCallsRFFIObject, isS4ObjectMethodID, x);
+ return (*env)->CallIntMethod(env, UpCallsRFFIObject, IS_S4_OBJECTMethodID, x);
}
void SET_S4_OBJECT(SEXP x) {
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/call_rffi.c b/com.oracle.truffle.r.native/fficall/src/jni/call_rffi.c
index eb81606672..4ec83f1392 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/call_rffi.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/call_rffi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -1249,13 +1249,5 @@ Java_com_oracle_truffle_r_runtime_ffi_jni_JNI_1Call_callVoid0(JNIEnv *env, jclas
callExit(env);
}
-#include <Rinterface.h>
-
-JNIEXPORT void JNICALL
-Java_com_oracle_truffle_r_runtime_ffi_jni_JNI_1Call_nativeSetInteractive(JNIEnv *env, jclass c, jboolean interactive) {
- R_Interactive = interactive;
-}
-
-
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/variables.c b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
index 10fb96f8e8..54ed8a8fa7 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -35,7 +35,7 @@ jmethodID R_GlobalEnvMethodID;
jmethodID R_BaseEnvMethodID;
jmethodID R_BaseNamespaceMethodID;
jmethodID R_NamespaceRegistryMethodID;
-jmethodID isInteractiveMethodID;
+jmethodID R_InteractiveMethodID;
jmethodID R_GlobalContextMethodID;
// R_GlobalEnv et al are not a variables in FASTR as they are RContext specific
@@ -73,6 +73,11 @@ char *FASTR_R_Home() {
return (char *)R_Home_local;
}
+Rboolean FASTR_Interactive() {
+ JNIEnv *env = getEnv();
+ CTXT res = (*env)->CallObjectMethod(env, UpCallsRFFIObject, R_InteractiveMethodID);
+}
+
SEXP FASTR_R_NilValue() {
return R_NilValue_local;
}
@@ -98,7 +103,7 @@ void init_variables(JNIEnv *env, jobjectArray initialValues) {
R_BaseEnvMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_BaseEnv", "()Ljava/lang/Object;", 0);
R_BaseNamespaceMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_BaseNamespace", "()Ljava/lang/Object;", 0);
R_NamespaceRegistryMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_NamespaceRegistry", "()Ljava/lang/Object;", 0);
- isInteractiveMethodID = checkGetMethodID(env, UpCallsRFFIClass, "isInteractive", "()I", 0);
+ R_InteractiveMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_Interactive", "()I", 0);
R_GlobalContextMethodID = checkGetMethodID(env, UpCallsRFFIClass, "R_GlobalContext", "()Ljava/lang/Object;", 0);
int length = (*env)->GetArrayLength(env, initialValues);
@@ -121,6 +126,8 @@ void init_variables(JNIEnv *env, jobjectArray initialValues) {
R_NaReal = (*env)->CallDoubleMethod(env, value, doubleValueMethodID);
} else if (strcmp(nameChars, "R_NaInt") == 0) {
R_NaInt = (*env)->CallIntMethod(env, value, intValueMethodID);
+ } else if (strcmp(nameChars, "R_TempDir") == 0) {
+ R_TempDir = (*env)->GetStringUTFChars(env, value, NULL);
} else {
SEXP ref = createGlobalRef(env, value, 1);
if (strcmp(nameChars, "R_EmptyEnv") == 0) {
@@ -212,7 +219,3 @@ void init_variables(JNIEnv *env, jobjectArray initialValues) {
}
}
-void setTempDir(JNIEnv *env, jstring tempDir) {
- R_TempDir = (*env)->GetStringUTFChars(env, tempDir, NULL);
-}
-
diff --git a/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h b/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h
index b3c3831a5a..b206fd4556 100644
--- a/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h
+++ b/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1995-2015, The R Core Team
* Copyright (c) 2003, The R Foundation
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -152,3 +152,4 @@ InputHandler *R_InputHandlers = &BasicInputHandler;
#define R_TrueValue_x 46
#define R_FalseValue_x 47
#define R_LogicalNAValue_x 48
+#define R_Interactive_x 49
diff --git a/com.oracle.truffle.r.native/include/Makefile b/com.oracle.truffle.r.native/include/Makefile
index 5acbc6b49d..0325032547 100644
--- a/com.oracle.truffle.r.native/include/Makefile
+++ b/com.oracle.truffle.r.native/include/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
@@ -44,13 +44,14 @@ R_HEADERS_TO_LINK := $(filter-out $(notdir $(R_HEADERS_LOCAL)),$(R_HEADERS_FILEN
all: linked
-linked: ed_Rinternals ed_Rinterface_gcntx ed_Rinterface_interactive ed_GraphicsEngine
+linked: ed_Rinternals ed_Rinterface_gcntx ed_Rinterface_variables ed_GraphicsEngine
mkdir -p R_ext
$(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);)
ln -sf src/libintl.h
ed $(GNUR_HOME)/include/Rinternals.h < ed_Rinternals
ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface_gcntx
-# ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface_interactive
+# previous ed wrote to local file
+ ed Rinterface.h < ed_Rinterface_variables
ed $(GNUR_HOME)/include/R_ext/GraphicsEngine.h < ed_GraphicsEngine
$(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);)
# cp $(R_EXT_HEADERS_LOCAL) R_ext
diff --git a/com.oracle.truffle.r.native/include/ed_Rinterface_interactive b/com.oracle.truffle.r.native/include/ed_Rinterface_variables
similarity index 72%
rename from com.oracle.truffle.r.native/include/ed_Rinterface_interactive
rename to com.oracle.truffle.r.native/include/ed_Rinterface_variables
index d226ba2107..60a72be296 100644
--- a/com.oracle.truffle.r.native/include/ed_Rinterface_interactive
+++ b/com.oracle.truffle.r.native/include/ed_Rinterface_variables
@@ -1,7 +1,7 @@
/R_Interactive/
i
#ifdef FASTR
-LibExtern Rboolean FASTR_Interactive();
+extern Rboolean FASTR_Interactive();
#define R_Interactive FASTR_Interactive()
#else
.
@@ -12,7 +12,7 @@ a
/R_Home;/
i
#ifdef FASTR
-LibExtern char* FASTR_R_Home();
+extern char* FASTR_R_Home();
#define R_Home FASTR_R_Home()
#else
.
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/TraceUpCallsAdapter.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/TraceUpCallsAdapter.java
index 4dea6ab018..2ba610c7b3 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/TraceUpCallsAdapter.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/TraceUpCallsAdapter.java
@@ -705,7 +705,7 @@ public class TraceUpCallsAdapter implements UpCallsRFFI {
}
@Override
- public int isInteractive() {
+ public int R_Interactive() {
if (RFFIUtils.traceEnabled()) {
RFFIUtils.traceUpCall("isInteractive");
}
@@ -713,7 +713,7 @@ public class TraceUpCallsAdapter implements UpCallsRFFI {
}
@Override
- public int isS4Object(Object x) {
+ public int IS_S4_OBJECT(Object x) {
if (RFFIUtils.traceEnabled()) {
RFFIUtils.traceUpCall("isS4Object");
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsIndex.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsIndex.java
index fa9f03d430..21915f4454 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsIndex.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsIndex.java
@@ -146,7 +146,7 @@ final class UpCallsIndex {
static final int TAG = 104;
static final int TYPEOF = 105;
static final int VECTOR_ELT = 106;
- static final int isInteractive = 107;
+ static final int R_Interactive = 107;
static final int isS4Object = 108;
static final int unif_rand = 109;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsRFFIImpl.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsRFFIImpl.java
index cc0883388b..7668581c10 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsRFFIImpl.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/ffi/UpCallsRFFIImpl.java
@@ -1208,17 +1208,17 @@ public class UpCallsRFFIImpl implements UpCallsRFFI {
}
@Override
- public int isInteractive() {
+ public int R_Interactive() {
if (tracer != null) {
- tracer.isInteractive();
+ tracer.R_Interactive();
}
return RContext.getInstance().isInteractive() ? 1 : 0;
}
@Override
- public int isS4Object(Object x) {
+ public int IS_S4_OBJECT(Object x) {
if (tracer != null) {
- tracer.isS4Object(x);
+ tracer.IS_S4_OBJECT(x);
}
return x instanceof RS4Object ? 1 : 0;
}
@@ -1510,4 +1510,5 @@ public class UpCallsRFFIImpl implements UpCallsRFFI {
System.out.println("object " + x);
System.out.println("class " + x.getClass());
}
+
}
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java
index 77628a0b8d..dc5591473a 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/RFFIVariables.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
@@ -24,6 +24,7 @@ package com.oracle.truffle.r.runtime.ffi;
import com.oracle.truffle.r.runtime.REnvVars;
import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.TempPathName;
import com.oracle.truffle.r.runtime.data.RDataFactory;
import com.oracle.truffle.r.runtime.data.RMissing;
import com.oracle.truffle.r.runtime.data.RNull;
@@ -79,7 +80,7 @@ public enum RFFIVariables {
R_BlankString(RDataFactory.createStringVectorFromScalar("")),
R_TrueValue(RRuntime.LOGICAL_TRUE),
R_FalseValue(RRuntime.LOGICAL_FALSE),
- R_LogicalNAValue(RRuntime.LOGICAL_NA);
+ R_LogicalNAValue(RRuntime.LOGICAL_NA); // updated with setInteractive
private Object value;
@@ -91,7 +92,12 @@ public enum RFFIVariables {
return value;
}
- public static void setTempDir(String tempDir) {
- R_TempDir.value = tempDir;
+ /**
+ * Sets {@link #R_TempDir} for the initial context.
+ */
+ public static RFFIVariables[] initialize() {
+ R_TempDir.value = TempPathName.tempDirPath();
+ return values();
+
}
}
diff --git a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java
index 4977f72019..b2153137e4 100644
--- a/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java
+++ b/com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jni/JNI_Call.java
@@ -31,9 +31,6 @@ import com.oracle.truffle.r.nodes.ffi.UpCallsRFFIImpl;
import com.oracle.truffle.r.nodes.ffi.RFFIUtils;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.ffi.CallRFFI;
-import com.oracle.truffle.r.runtime.ffi.DLL;
-import com.oracle.truffle.r.runtime.ffi.DLLRFFI;
-import com.oracle.truffle.r.runtime.ffi.LibPaths;
import com.oracle.truffle.r.runtime.ffi.NativeCallInfo;
import com.oracle.truffle.r.runtime.ffi.RFFIVariables;
import com.oracle.truffle.r.runtime.ffi.UpCallsRFFI;
@@ -114,36 +111,8 @@ public class JNI_Call implements CallRFFI {
}
}
- @Override
- public void setTempDir(String tempDir) {
- synchronized (JNI_CallRFFINode.class) {
- if (traceEnabled()) {
- traceDownCall("setTempDir", tempDir);
- }
- RFFIVariables.setTempDir(tempDir);
- nativeSetTempDir(tempDir);
- if (traceEnabled()) {
- traceDownCallReturn("setTempDir", null);
- }
- }
- }
-
- @Override
- public void setInteractive(boolean interactive) {
- synchronized (JNI_CallRFFINode.class) {
- if (traceEnabled()) {
- traceDownCall("setInteractive", interactive);
- }
- nativeSetInteractive(interactive);
- if (traceEnabled()) {
- traceDownCallReturn("setInteractive", null);
- }
- }
- }
}
- private static final boolean ForceRTLDGlobal = false;
-
public JNI_Call() {
initialize();
}
@@ -151,11 +120,12 @@ public class JNI_Call implements CallRFFI {
@TruffleBoundary
private static void initialize() {
RFFIUtils.initialize();
+
if (traceEnabled()) {
traceDownCall("initialize");
}
try {
- initialize(new UpCallsRFFIImpl(), RFFIVariables.values());
+ initialize(new UpCallsRFFIImpl(), RFFIVariables.initialize());
} finally {
if (traceEnabled()) {
traceDownCallReturn("initialize", null);
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 0fdf84d6e2..f829eb438a 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
@@ -27,8 +27,8 @@ import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.util.Random;
-import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
/**
@@ -37,41 +37,39 @@ import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
* initialized before the first RFFI call as the value is available in the R FFI.
*
*/
-public class TempPathName {
+public class TempPathName implements RContext.ContextState {
private static final String RANDOM_CHARACTERS = "0123456789abcdefghijklmnopqrstuvwxyz";
private static final int RANDOM_CHARACTERS_LENGTH = RANDOM_CHARACTERS.length();
private static final int RANDOM_LENGTH = 12; // as per GnuR
-
- private static String tempDirPath;
private static final Random rand = new Random();
- private static void initialize() {
- if (tempDirPath == null) {
- CompilerDirectives.transferToInterpreterAndInvalidate();
- final String[] envVars = new String[]{"TMPDIR", "TMP", "TEMP"};
- String startingTempDir = null;
- for (String envVar : envVars) {
- String value = System.getenv(envVar);
- if (value != null && isWriteableDirectory(value)) {
- startingTempDir = value;
- }
- }
- if (startingTempDir == null) {
- startingTempDir = "/tmp";
- }
- Path startingTempDirPath = FileSystems.getDefault().getPath(startingTempDir, "Rtmp");
- // ensure absolute, to avoid problems with R code does a setwd
- if (!startingTempDirPath.isAbsolute()) {
- startingTempDirPath = startingTempDirPath.toAbsolutePath();
- }
- String t = RFFIFactory.getRFFI().getBaseRFFI().mkdtemp(startingTempDirPath.toString() + "XXXXXX");
- if (t != null) {
- tempDirPath = t;
- } else {
- Utils.rSuicide("cannot create 'R_TempDir'");
+ private String tempDirPath;
+
+ @Override
+ public RContext.ContextState initialize(RContext context) {
+ final String[] envVars = new String[]{"TMPDIR", "TMP", "TEMP"};
+ String startingTempDir = null;
+ for (String envVar : envVars) {
+ String value = System.getenv(envVar);
+ if (value != null && isWriteableDirectory(value)) {
+ startingTempDir = value;
}
- RFFIFactory.getRFFI().getCallRFFI().createCallRFFINode().setTempDir(tempDirPath);
}
+ if (startingTempDir == null) {
+ startingTempDir = "/tmp";
+ }
+ Path startingTempDirPath = FileSystems.getDefault().getPath(startingTempDir, "Rtmp");
+ // ensure absolute, to avoid problems with R code does a setwd
+ if (!startingTempDirPath.isAbsolute()) {
+ startingTempDirPath = startingTempDirPath.toAbsolutePath();
+ }
+ String t = RFFIFactory.getRFFI().getBaseRFFI().mkdtemp(startingTempDirPath.toString() + "XXXXXX");
+ if (t != null) {
+ tempDirPath = t;
+ } else {
+ Utils.rSuicide("cannot create 'R_TempDir'");
+ }
+ return this;
}
private static boolean isWriteableDirectory(String path) {
@@ -80,13 +78,15 @@ public class TempPathName {
}
public static String tempDirPath() {
- initialize();
- return tempDirPath;
+ return RContext.getInstance().stateTempPath.tempDirPath;
+ }
+
+ public static TempPathName newContextState() {
+ return new TempPathName();
}
@TruffleBoundary
public static String createNonExistingFilePath(String pattern, String tempDir, String fileExt) {
- initialize();
while (true) {
StringBuilder sb = new StringBuilder(tempDir);
sb.append(File.separatorChar);
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java
index 949b7f20e1..96aa10c847 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java
@@ -60,6 +60,7 @@ import com.oracle.truffle.r.runtime.RRuntimeASTAccess;
import com.oracle.truffle.r.runtime.RSerialize;
import com.oracle.truffle.r.runtime.RSource;
import com.oracle.truffle.r.runtime.RStartParams;
+import com.oracle.truffle.r.runtime.TempPathName;
import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.builtins.RBuiltinDescriptor;
import com.oracle.truffle.r.runtime.builtins.RBuiltinKind;
@@ -74,7 +75,6 @@ import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.env.REnvironment;
import com.oracle.truffle.r.runtime.ffi.DLL;
import com.oracle.truffle.r.runtime.ffi.RFFIContextStateFactory;
-import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
import com.oracle.truffle.r.runtime.instrument.InstrumentationState;
import com.oracle.truffle.r.runtime.nodes.RCodeBuilder;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
@@ -401,6 +401,7 @@ public final class RContext extends ExecutionContext implements TruffleObject {
* processor, but the set is relatively small, so we just enumerate them here.
*/
public final REnvVars stateREnvVars;
+ public final TempPathName stateTempPath;
public final RProfile stateRProfile;
public final StdConnections.ContextStateImpl stateStdConnections;
public final ROptions.ContextStateImpl stateROptions;
@@ -457,6 +458,7 @@ public final class RContext extends ExecutionContext implements TruffleObject {
this.initial = isInitial;
this.env = env;
this.stateREnvVars = REnvVars.newContextState();
+ this.stateTempPath = TempPathName.newContextState();
this.stateROptions = ROptions.ContextStateImpl.newContextState(stateREnvVars);
this.stateRProfile = RProfile.newContextState(stateREnvVars);
this.stateStdConnections = StdConnections.ContextStateImpl.newContextState();
@@ -553,7 +555,6 @@ public final class RContext extends ExecutionContext implements TruffleObject {
this.methodTableDispatchOn = info.getParent().methodTableDispatchOn;
}
if (initial && !embedded) {
- RFFIFactory.getRFFI().getCallRFFI().createCallRFFINode().setInteractive(isInteractive());
initialContextInitialized = true;
}
return this;
@@ -565,6 +566,7 @@ public final class RContext extends ExecutionContext implements TruffleObject {
*/
private void doEnvOptionsProfileInitialization() {
stateREnvVars.initialize(this);
+ stateTempPath.initialize(this);
stateROptions.initialize(this);
stateRProfile.initialize(this);
}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/CallRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/CallRFFI.java
index 8620608493..08472c79a9 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/CallRFFI.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/CallRFFI.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
@@ -41,17 +41,6 @@ public interface CallRFFI {
*/
public abstract void invokeVoidCall(NativeCallInfo nativeCallInfo, Object[] args);
- /**
- * This interface is instantiated very early and sets the FFI global variables as part of
- * that process. However, at that stage {@code tempDir} is not established so this call
- * exists to set the value later.
- */
- public abstract void setTempDir(String tempDir);
-
- /**
- * Sets the {@code R_Interactive} FFI variable. Similar rationale to {#link setTmpDir}.
- */
- public abstract void setInteractive(boolean interactive);
}
CallRFFINode createCallRFFINode();
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/IDEUpCallsRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/IDEUpCallsRFFI.java
new file mode 100644
index 0000000000..4ba0c703c7
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/IDEUpCallsRFFI.java
@@ -0,0 +1,51 @@
+/*
+ * 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
+ * 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;
+
+import com.oracle.truffle.api.frame.Frame;
+
+/**
+ * Additional upcalls created for supporting FastR in RStudio. These mainly relate to the GNU R
+ * notion of a "context", which corresponds somewhat to a Truffle {@link Frame}.
+ */
+public interface IDEUpCallsRFFI {
+ // Checkstyle: stop method name check
+ Object R_getGlobalFunctionContext();
+
+ Object R_getParentFunctionContext(Object c);
+
+ Object R_getContextEnv(Object c);
+
+ Object R_getContextFun(Object c);
+
+ Object R_getContextCall(Object c);
+
+ Object R_getContextSrcRef(Object c);
+
+ int R_insideBrowser();
+
+ int R_isGlobal(Object c);
+
+ int R_isEqual(Object x, Object y);
+
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RContextUpCallsRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RContextUpCallsRFFI.java
new file mode 100644
index 0000000000..ab6621014f
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RContextUpCallsRFFI.java
@@ -0,0 +1,44 @@
+/*
+ * 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
+ * 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;
+
+/**
+ * The following functions are global variables in the standard R FFI. However, owing to the support
+ * for virtual R sessions (see .fastr.context) in FastR they are remapped as functions.
+ */
+
+public interface RContextUpCallsRFFI {
+ // Checkstyle: stop method name check
+ Object R_GlobalContext();
+
+ Object R_GlobalEnv();
+
+ Object R_BaseEnv();
+
+ Object R_BaseNamespace();
+
+ Object R_NamespaceRegistry();
+
+ int R_Interactive();
+
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/StdUpCallsRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/StdUpCallsRFFI.java
new file mode 100644
index 0000000000..057cfaaba7
--- /dev/null
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/StdUpCallsRFFI.java
@@ -0,0 +1,239 @@
+/*
+ * 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
+ * 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;
+
+import com.oracle.truffle.r.runtime.data.RDoubleVector;
+import com.oracle.truffle.r.runtime.data.RExternalPtr;
+import com.oracle.truffle.r.runtime.data.RIntVector;
+import com.oracle.truffle.r.runtime.data.RLogicalVector;
+import com.oracle.truffle.r.runtime.data.RStringVector;
+import com.oracle.truffle.r.runtime.env.REnvironment;
+
+/**
+ * This class defines methods that match the functionality of the macro/function definitions in the
+ * R header files, e.g. {@code Rinternals.h} that are used by C/C++ code to call into the R
+ * implementation. For ease of identification, we use method names that match the names in the R
+ * header files. These methods should never be called from normal FastR code.
+ *
+ * The set is incomplete; these are the functions that have been found to be used to at this time of
+ * writing. From the GNU R perspective all {@code Object} parameters are {@code SEXP} instances.
+ * Some of the functions are typed with a specific return type but, again, this is a {@code SEXP} in
+ * GNU R terms. The native side does not require a specific Java type.
+ */
+public interface StdUpCallsRFFI {
+ // Checkstyle: stop method name check
+
+ RIntVector Rf_ScalarInteger(int value);
+
+ RLogicalVector Rf_ScalarLogical(int value);
+
+ RDoubleVector Rf_ScalarDouble(double value);
+
+ RStringVector Rf_ScalarString(Object value);
+
+ int Rf_asInteger(Object x);
+
+ double Rf_asReal(Object x);
+
+ int Rf_asLogical(Object x);
+
+ Object Rf_asChar(Object x);
+
+ Object Rf_mkCharLenCE(byte[] bytes, int encoding);
+
+ Object Rf_cons(Object car, Object cdr);
+
+ void Rf_defineVar(Object symbolArg, Object value, Object envArg);
+
+ Object R_do_MAKE_CLASS(String clazz);
+
+ /**
+ * WARNING: argument order reversed from Rf_findVarInFrame!
+ */
+ Object Rf_findVar(Object symbolArg, Object envArg);
+
+ Object Rf_findVarInFrame(Object envArg, Object symbolArg);
+
+ Object Rf_findVarInFrame3(Object envArg, Object symbolArg, int doGet);
+
+ Object Rf_getAttrib(Object obj, Object name);
+
+ void Rf_setAttrib(Object obj, Object name, Object val);
+
+ int Rf_inherits(Object x, String clazz);
+
+ Object Rf_install(String name);
+
+ Object Rf_lengthgets(Object x, int newSize);
+
+ int Rf_isString(Object x);
+
+ int Rf_isNull(Object x);
+
+ Object Rf_PairToVectorList(Object x);
+
+ void Rf_error(String msg);
+
+ void Rf_warning(String msg);
+
+ void Rf_warningcall(Object call, String msg);
+
+ Object Rf_allocateVector(int mode, int n);
+
+ Object Rf_allocateArray(int mode, Object dimsObj);
+
+ Object Rf_allocateMatrix(int mode, int nrow, int ncol);
+
+ int Rf_nrows(Object x);
+
+ int Rf_ncols(Object x);
+
+ int LENGTH(Object x);
+
+ void SET_STRING_ELT(Object x, int i, Object v);
+
+ void SET_VECTOR_ELT(Object x, int i, Object v);
+
+ Object RAW(Object x);
+
+ Object LOGICAL(Object x);
+
+ Object INTEGER(Object x);
+
+ Object REAL(Object x);
+
+ Object STRING_ELT(Object x, int i);
+
+ Object VECTOR_ELT(Object x, int i);
+
+ int NAMED(Object x);
+
+ Object SET_TYPEOF_FASTR(Object x, int v);
+
+ int TYPEOF(Object x);
+
+ int OBJECT(Object x);
+
+ Object Rf_duplicate(Object x, int deep);
+
+ int Rf_anyDuplicated(Object x, int fromLast);
+
+ Object PRINTNAME(Object x);
+
+ Object TAG(Object e);
+
+ Object CAR(Object e);
+
+ Object CDR(Object e);
+
+ Object CADR(Object e);
+
+ Object CADDR(Object e);
+
+ Object CDDR(Object e);
+
+ Object SET_TAG(Object x, Object y);
+
+ Object SETCAR(Object x, Object y);
+
+ Object SETCDR(Object x, Object y);
+
+ Object SETCADR(Object x, Object y);
+
+ Object SYMVALUE(Object x);
+
+ void SET_SYMVALUE(Object x, Object v);
+
+ int R_BindingIsLocked(Object sym, Object env);
+
+ Object R_FindNamespace(Object name);
+
+ Object Rf_eval(Object expr, Object env);
+
+ Object Rf_findfun(Object symbolObj, Object envObj);
+
+ Object Rf_GetOption1(Object tag);
+
+ void Rf_gsetVar(Object symbol, Object value, Object rho);
+
+ void DUPLICATE_ATTRIB(Object to, Object from);
+
+ int R_computeIdentical(Object x, Object y, int flags);
+
+ void Rf_copyListMatrix(Object s, Object t, int byrow);
+
+ void Rf_copyMatrix(Object s, Object t, int byrow);
+
+ Object R_tryEval(Object expr, Object env, boolean silent);
+
+ Object R_ToplevelExec();
+
+ int RDEBUG(Object x);
+
+ void SET_RDEBUG(Object x, int v);
+
+ int RSTEP(Object x);
+
+ void SET_RSTEP(Object x, int v);
+
+ Object ENCLOS(Object x);
+
+ Object PRVALUE(Object x);
+
+ Object R_ParseVector(Object text, int n, Object srcFile);
+
+ Object R_lsInternal3(Object envArg, int allArg, int sortedArg);
+
+ String R_HomeDir();
+
+ int IS_S4_OBJECT(Object x);
+
+ void Rprintf(String message);
+
+ void GetRNGstate();
+
+ void PutRNGstate();
+
+ double unif_rand();
+
+ Object Rf_classgets(Object x, Object y);
+
+ RExternalPtr R_MakeExternalPtr(long addr, Object tag, Object prot);
+
+ long R_ExternalPtrAddr(Object x);
+
+ Object R_ExternalPtrTag(Object x);
+
+ Object R_ExternalPtrProt(Object x);
+
+ void R_SetExternalPtrAddr(Object x, long addr);
+
+ void R_SetExternalPtrTag(Object x, Object tag);
+
+ void R_SetExternalPtrProt(Object x, Object prot);
+
+ void R_CleanUp(int sa, int status, int runlast);
+
+ REnvironment R_NewHashedEnv(REnvironment parent, String name, boolean hashed, int initialSize);
+
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/UpCallsRFFI.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/UpCallsRFFI.java
index ccfb5fa901..563e8ca60f 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/UpCallsRFFI.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/UpCallsRFFI.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
@@ -22,258 +22,9 @@
*/
package com.oracle.truffle.r.runtime.ffi;
-import com.oracle.truffle.r.runtime.data.RDoubleVector;
-import com.oracle.truffle.r.runtime.data.RExternalPtr;
-import com.oracle.truffle.r.runtime.data.RIntVector;
-import com.oracle.truffle.r.runtime.data.RLogicalVector;
-import com.oracle.truffle.r.runtime.data.RStringVector;
-import com.oracle.truffle.r.runtime.env.REnvironment;
-
/**
- * This class defines methods that match the functionality of the macro/function definitions in the
- * R header files, e.g. {@code Rinternals.h} that are used by C/C++ code to call into the R
- * implementation. For ease of identification, we use method names that match the names in the R
- * header files. These methods should never be called from normal FastR code.
- *
- * The set is incomplete; these are the functions that have been found to be used to at this time of
- * writing. From the GNU R perspective all {@code Object} parameters are {@code SEXP} instances.
- * Some of the functions are typed with a specific return type but, again, this is a {@code SEXP} in
- * GNU R terms. The native side does not require a specific Java type.
- *
+ * Aggregation of all the FFI upcall interfaces.
*/
-public interface UpCallsRFFI {
-
- // Checkstyle: stop method name check
-
- RIntVector Rf_ScalarInteger(int value);
-
- RLogicalVector Rf_ScalarLogical(int value);
-
- RDoubleVector Rf_ScalarDouble(double value);
-
- RStringVector Rf_ScalarString(Object value);
-
- int Rf_asInteger(Object x);
-
- double Rf_asReal(Object x);
-
- int Rf_asLogical(Object x);
-
- Object Rf_asChar(Object x);
-
- Object Rf_mkCharLenCE(byte[] bytes, int encoding);
-
- Object Rf_cons(Object car, Object cdr);
-
- void Rf_defineVar(Object symbolArg, Object value, Object envArg);
-
- Object R_do_MAKE_CLASS(String clazz);
-
- /**
- * WARNING: argument order reversed from Rf_findVarInFrame!
- */
- Object Rf_findVar(Object symbolArg, Object envArg);
-
- Object Rf_findVarInFrame(Object envArg, Object symbolArg);
-
- Object Rf_findVarInFrame3(Object envArg, Object symbolArg, int doGet);
-
- Object Rf_getAttrib(Object obj, Object name);
-
- void Rf_setAttrib(Object obj, Object name, Object val);
-
- int Rf_inherits(Object x, String clazz);
-
- Object Rf_install(String name);
-
- Object Rf_lengthgets(Object x, int newSize);
-
- int Rf_isString(Object x);
-
- int Rf_isNull(Object x);
-
- Object Rf_PairToVectorList(Object x);
-
- void Rf_error(String msg);
-
- void Rf_warning(String msg);
-
- void Rf_warningcall(Object call, String msg);
-
- Object Rf_allocateVector(int mode, int n);
-
- Object Rf_allocateArray(int mode, Object dimsObj);
-
- Object Rf_allocateMatrix(int mode, int nrow, int ncol);
-
- int Rf_nrows(Object x);
-
- int Rf_ncols(Object x);
-
- int LENGTH(Object x);
-
- void SET_STRING_ELT(Object x, int i, Object v);
-
- void SET_VECTOR_ELT(Object x, int i, Object v);
-
- Object RAW(Object x);
-
- Object LOGICAL(Object x);
-
- Object INTEGER(Object x);
-
- Object REAL(Object x);
-
- Object STRING_ELT(Object x, int i);
-
- Object VECTOR_ELT(Object x, int i);
-
- int NAMED(Object x);
-
- Object SET_TYPEOF_FASTR(Object x, int v);
-
- int TYPEOF(Object x);
-
- int OBJECT(Object x);
-
- Object Rf_duplicate(Object x, int deep);
-
- int Rf_anyDuplicated(Object x, int fromLast);
-
- Object PRINTNAME(Object x);
-
- Object TAG(Object e);
-
- Object CAR(Object e);
-
- Object CDR(Object e);
-
- Object CADR(Object e);
-
- Object CADDR(Object e);
-
- Object CDDR(Object e);
-
- Object SET_TAG(Object x, Object y);
-
- Object SETCAR(Object x, Object y);
-
- Object SETCDR(Object x, Object y);
-
- Object SETCADR(Object x, Object y);
-
- Object SYMVALUE(Object x);
-
- void SET_SYMVALUE(Object x, Object v);
-
- int R_BindingIsLocked(Object sym, Object env);
-
- Object R_FindNamespace(Object name);
-
- Object Rf_eval(Object expr, Object env);
-
- Object Rf_findfun(Object symbolObj, Object envObj);
-
- Object Rf_GetOption1(Object tag);
-
- void Rf_gsetVar(Object symbol, Object value, Object rho);
-
- void DUPLICATE_ATTRIB(Object to, Object from);
-
- int R_computeIdentical(Object x, Object y, int flags);
-
- void Rf_copyListMatrix(Object s, Object t, int byrow);
-
- void Rf_copyMatrix(Object s, Object t, int byrow);
-
- Object R_tryEval(Object expr, Object env, boolean silent);
-
- Object R_ToplevelExec();
-
- int RDEBUG(Object x);
-
- void SET_RDEBUG(Object x, int v);
-
- int RSTEP(Object x);
-
- void SET_RSTEP(Object x, int v);
-
- Object ENCLOS(Object x);
-
- Object PRVALUE(Object x);
-
- Object R_ParseVector(Object text, int n, Object srcFile);
-
- Object R_lsInternal3(Object envArg, int allArg, int sortedArg);
-
- String R_HomeDir();
-
- int isInteractive();
-
- int isS4Object(Object x);
-
- void Rprintf(String message);
-
- void GetRNGstate();
-
- void PutRNGstate();
-
- double unif_rand();
-
- Object Rf_classgets(Object x, Object y);
-
- RExternalPtr R_MakeExternalPtr(long addr, Object tag, Object prot);
-
- long R_ExternalPtrAddr(Object x);
-
- Object R_ExternalPtrTag(Object x);
-
- Object R_ExternalPtrProt(Object x);
-
- void R_SetExternalPtrAddr(Object x, long addr);
-
- void R_SetExternalPtrTag(Object x, Object tag);
-
- void R_SetExternalPtrProt(Object x, Object prot);
-
- void R_CleanUp(int sa, int status, int runlast);
-
- REnvironment R_NewHashedEnv(REnvironment parent, String name, boolean hashed, int initialSize);
-
- /*
- * The following functions are global variables in the standard R FFI. However, owing to the
- * support for virtual R sessions (see .fastr.context) in FastR they are remapped as functions.
- */
- Object R_GlobalContext();
-
- Object R_GlobalEnv();
-
- Object R_BaseEnv();
-
- Object R_BaseNamespace();
-
- Object R_NamespaceRegistry();
-
- /*
- * The following functions are FastR extensions to support RStudio
- */
-
- Object R_getGlobalFunctionContext();
-
- Object R_getParentFunctionContext(Object c);
-
- Object R_getContextEnv(Object c);
-
- Object R_getContextFun(Object c);
-
- Object R_getContextCall(Object c);
-
- Object R_getContextSrcRef(Object c);
-
- int R_insideBrowser();
-
- int R_isGlobal(Object c);
-
- int R_isEqual(Object x, Object y);
+public interface UpCallsRFFI extends StdUpCallsRFFI, RContextUpCallsRFFI, IDEUpCallsRFFI {
}
--
GitLab