Skip to content
Snippets Groups Projects
Commit c4796c78 authored by Florian Angerer's avatar Florian Angerer
Browse files

Introduced caching of srcfile objects.

parent 0721e94a
No related branches found
No related tags found
No related merge requests found
......@@ -81,14 +81,18 @@ public class RSrcref {
@TruffleBoundary
private static REnvironment createSrcfile(Path path) {
// A srcref is an environment
REnvironment env = RDataFactory.createNewEnv("");
env.safePut(SrcrefFields.Enc.name(), "unknown");
env.safePut(SrcrefFields.encoding.name(), "native.enc");
env.safePut(SrcrefFields.timestamp.name(), getTimestamp(path));
env.safePut(SrcrefFields.filename.name(), path.toString());
env.safePut(SrcrefFields.isFile.name(), RRuntime.LOGICAL_TRUE);
env.safePut(SrcrefFields.wd.name(), BaseRFFI.GetwdRootNode.create().getCallTarget().call());
env.setClassAttr(SRCFILE_ATTR);
REnvironment env = RContext.getInstance().srcfileEnvironments.get(path);
if (env == null) {
env = RDataFactory.createNewEnv("");
env.safePut(SrcrefFields.Enc.name(), "unknown");
env.safePut(SrcrefFields.encoding.name(), "native.enc");
env.safePut(SrcrefFields.timestamp.name(), getTimestamp(path));
env.safePut(SrcrefFields.filename.name(), path.toString());
env.safePut(SrcrefFields.isFile.name(), RRuntime.LOGICAL_TRUE);
env.safePut(SrcrefFields.wd.name(), BaseRFFI.GetwdRootNode.create().getCallTarget().call());
env.setClassAttr(SRCFILE_ATTR);
RContext.getInstance().srcfileEnvironments.put(path, env);
}
return env;
}
......
......@@ -24,6 +24,7 @@ package com.oracle.truffle.r.runtime.context;
import java.io.Closeable;
import java.lang.ref.WeakReference;
import java.nio.file.Path;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
......@@ -454,6 +455,7 @@ public final class RContext extends com.oracle.truffle.api.ExecutionContext impl
public final WeakHashMap<String, WeakReference<String>> stringMap = new WeakHashMap<>();
public final WeakHashMap<Source, REnvironment> sourceRefEnvironments = new WeakHashMap<>();
public final WeakHashMap<Path, REnvironment> srcfileEnvironments = new WeakHashMap<>();
private ContextState[] contextStates() {
return new ContextState[]{stateREnvVars, stateRProfile, stateTempPath, stateROptions, stateREnvironment, stateRErrorHandling, stateRConnection, stateStdConnections, stateRNG, stateRFFI,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment