From 81ee0a4ebed7f2a8d324e11a142d2f0d066bb46c Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Wed, 21 Feb 2018 18:05:21 +0100
Subject: [PATCH] R Embedded API: intialize RFFI to be used in embedding code
outside any down-call context
---
.../com/oracle/truffle/r/engine/shell/REmbedded.java | 9 ++++++---
.../truffle/r/ffi/impl/nfi/TruffleNFI_Context.java | 5 +++++
.../oracle/truffle/r/runtime/ffi/RFFIContext.java | 12 ++++++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
index a207d8247f..952f2069c8 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
@@ -89,8 +89,9 @@ public class REmbedded {
if (initMainLoop) {
context.enter();
- RContext.getInstance().completeEmbeddedInitialization();
- // TODO: push callbacks
+ RContext ctx = RContext.getInstance();
+ ctx.completeEmbeddedInitialization();
+ ctx.getRFFI().initializeEmbedded(ctx);
// stay in the context TODO should we?
}
}
@@ -129,7 +130,9 @@ public class REmbedded {
*/
private static void runRmainloop() {
context.enter();
- RContext.getInstance().completeEmbeddedInitialization();
+ RContext ctx = RContext.getInstance();
+ ctx.completeEmbeddedInitialization();
+ ctx.getRFFI().initializeEmbedded(ctx);
int status = RCommand.readEvalPrint(context, consoleHandler);
context.leave();
context.close();
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java
index 7b4c1ecec2..b83771cec9 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java
@@ -196,6 +196,11 @@ final class TruffleNFI_Context extends RFFIContext {
}
}
+ @Override
+ public void initializeEmbedded(RContext context) {
+ pushCallbacks();
+ }
+
@TruffleBoundary
private long initCallbacksAddress() {
// get the address of the native thread local
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIContext.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIContext.java
index 848300a58a..67fa9e178a 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIContext.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/RFFIContext.java
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.data.RObject;
@@ -101,6 +102,17 @@ public abstract class RFFIContext extends RFFI {
public void initializeVariables(RContext context) {
}
+ /**
+ * Invoked as part of the R embedded initialization just before returning back to the C user
+ * code. Should do any set-up necessary for the RFFI to be fully functional even outside the
+ * context of a down-call. At the moment the assumption is that embedded code is always single
+ * threaded and always creates exactly one context. This method shall be invoked after
+ * {@link #initialize(RContext)} and {@link #initializeVariables(RContext)}.
+ */
+ public void initializeEmbedded(RContext context) {
+ throw RInternalError.unimplemented("R Embedding not supported with " + this.getClass().getSimpleName() + " RFFI backend.");
+ }
+
public long beforeDowncall() {
callDepth++;
return 0;
--
GitLab