Skip to content

Commit

Permalink
Move loadedLibraries back into context
Browse files Browse the repository at this point in the history 
[ci skip]
  • Loading branch information
@fniephaus
fniephaus committed Feb 9, 2024
1 parent 79e1ded commit 381e07c
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 53 deletions.
8 changes: 3 additions & 5 deletions src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;

import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
Expand Down Expand Up @@ -168,6 +169,7 @@ public final class SqueakImageContext {

/* Plugins */
@CompilationFinal private InterpreterProxy interpreterProxy;
public final Map<String, Object> loadedLibraries = new HashMap<>();
public final B2D b2d = new B2D(this);
public final BitBlt bitblt = new BitBlt(this);
public String[] dropPluginFileList = new String[0];
Expand Down Expand Up @@ -624,15 +626,11 @@ public boolean supportsNFI() {
return env.getInternalLanguages().containsKey("nfi");
}

public InterpreterProxy getOrCreateInterpreterProxy() {
public InterpreterProxy getInterpreterProxy(final MaterializedFrame frame, final int numReceiverAndArguments) {
if (interpreterProxy == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
interpreterProxy = new InterpreterProxy(this);
}
return interpreterProxy;
}

public InterpreterProxy getInterpreterProxy(final MaterializedFrame frame, final int numReceiverAndArguments) {
return interpreterProxy.instanceFor(frame, numReceiverAndArguments);
}

Expand Down
48 changes: 1 addition & 47 deletions ...pi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/ffi/InterpreterProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.exception.AbstractTruffleException;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.interop.ArityException;
import com.oracle.truffle.api.interop.InteropLibrary;
Expand Down Expand Up @@ -53,7 +50,6 @@ public final class InterpreterProxy {
// since this class is a singleton, a private instance variable will suffice
@SuppressWarnings("FieldCanBeLocal") private final TruffleClosure[] closures;
private final Object interpreterProxyPointer;
private final Map<String, Object> loadedLibraries = new HashMap<>();

///////////////////////////
// INTERPRETER VARIABLES //
Expand Down Expand Up @@ -175,53 +171,11 @@ public InterpreterProxy instanceFor(final MaterializedFrame currentFrame, final
return this;
}

public Object lookupModuleLibrary(final String moduleName) {
final Object moduleLibrary = loadedLibraries.computeIfAbsent(moduleName, (String s) -> {
if (loadedLibraries.containsKey(moduleName)) {
// if moduleName was associated with null
return null;
}
final Object library;
try {
library = NFIUtils.loadLibrary(context, moduleName, "{ setInterpreter(POINTER):SINT64; }");
} catch (AbstractTruffleException e) {
if (e.getMessage().equals("Unknown identifier: setInterpreter")) {
// module has no setInterpreter, cannot be loaded
return null;
}
throw e;
}
if (library == null) {
return null;
}
try {
// TODO: also call shutdownModule():SINT64 at some point
final Object initialiseModuleSymbol = NFIUtils.loadMember(context, library, "initialiseModule", "():SINT64");
final InteropLibrary initialiseModuleInteropLibrary = NFIUtils.getInteropLibrary(initialiseModuleSymbol);
initialiseModuleInteropLibrary.execute(initialiseModuleSymbol);
} catch (UnknownIdentifierException e) {
// module has no initializer, ignore
} catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
throw CompilerDirectives.shouldNotReachHere(e);
}
try {
final InteropLibrary moduleInteropLibrary = NFIUtils.getInteropLibrary(library);
moduleInteropLibrary.invokeMember(library, "setInterpreter", getPointer());
} catch (UnsupportedMessageException | ArityException | UnsupportedTypeException | UnknownIdentifierException e) {
throw CompilerDirectives.shouldNotReachHere(e);
}
return library;
});
// computeIfAbsent would not put null value
loadedLibraries.putIfAbsent(moduleName, moduleLibrary);
return moduleLibrary;
}

///////////////////
// MISCELLANEOUS //
///////////////////

private Object getPointer() {
public Object getPointer() {
return interpreterProxyPointer;
}

Expand Down
45 changes: 44 additions & 1 deletion ...wa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/ffi/PrimExternalCallNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.exception.AbstractTruffleException;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.interop.ArityException;
Expand Down Expand Up @@ -35,7 +36,7 @@ public PrimExternalCallNode(final Object functionSymbol, final InteropLibrary fu

public static PrimExternalCallNode load(final String moduleName, final String functionName, final int numReceiverAndArguments) {
final SqueakImageContext context = SqueakImageContext.getSlow();
final Object moduleLibrary = context.getOrCreateInterpreterProxy().lookupModuleLibrary(moduleName);
final Object moduleLibrary = lookupModuleLibrary(context, moduleName);
if (moduleLibrary == null) {
return null; // module not found
}
Expand All @@ -48,6 +49,48 @@ public static PrimExternalCallNode load(final String moduleName, final String fu
}
}

private static Object lookupModuleLibrary(final SqueakImageContext context, final String moduleName) {
final Object moduleLibrary = context.loadedLibraries.computeIfAbsent(moduleName, (String s) -> {
if (context.loadedLibraries.containsKey(moduleName)) {
// if moduleName was associated with null
return null;
}
final Object library;
try {
library = NFIUtils.loadLibrary(context, moduleName, "{ setInterpreter(POINTER):SINT64; }");
} catch (AbstractTruffleException e) {
if (e.getMessage().equals("Unknown identifier: setInterpreter")) {
// module has no setInterpreter, cannot be loaded
return null;
}
throw e;
}
if (library == null) {
return null;
}
try {
// TODO: also call shutdownModule():SINT64 at some point
final Object initialiseModuleSymbol = NFIUtils.loadMember(context, library, "initialiseModule", "():SINT64");
final InteropLibrary initialiseModuleInteropLibrary = NFIUtils.getInteropLibrary(initialiseModuleSymbol);
initialiseModuleInteropLibrary.execute(initialiseModuleSymbol);
} catch (UnknownIdentifierException e) {
// module has no initializer, ignore
} catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
throw CompilerDirectives.shouldNotReachHere(e);
}
try {
final InteropLibrary moduleInteropLibrary = NFIUtils.getInteropLibrary(library);
moduleInteropLibrary.invokeMember(library, "setInterpreter", context.getInterpreterProxy(null, 0).getPointer());
} catch (UnsupportedMessageException | ArityException | UnsupportedTypeException | UnknownIdentifierException e) {
throw CompilerDirectives.shouldNotReachHere(e);
}
return library;
});
// computeIfAbsent would not put null value
context.loadedLibraries.putIfAbsent(moduleName, moduleLibrary);
return moduleLibrary;
}

@Override
public Object execute(final VirtualFrame frame) {
return doExternalCall(frame.materialize());
Expand Down

0 comments on commit 381e07c

Please sign in to comment.