Skip to content

Commit

Permalink
Add support for GraalVM
Browse files Browse the repository at this point in the history
Adds a JAR publication at `jna-graalvm.jar`, with accompanying
build infrastructure, which provides support for JNA within the
context of the Substrate Virtual Machine (SVM).

GraalVM Native Image targets use SVM instead of JVM at runtime.
JNA's current strategy of unpacking libraries at runtime works
under SVM, but is suboptimal; the binary is native, so it can
simply include JNA object code for the current platform directly.

To accomplish this, several GraalVM "feature" implementations are
provided in this new publication. By default, regular JNA access
is enabled through the `JavaNativeAccess` feature; this class
enables reflection and runtime JNI configurations for downstream
projects which use JNA.

Another feature, `SubstrateStaticJNA`, is experimental because it
relies on unstable GraalVM APIs, but instead of loading JNA at
runtime from a dynamic library, it builds JNA into the final
native image with a static object.

These features are enabled through a resource within `META-INF`,
called `native-image.properties`, which is picked up by the native
image compiler at build time. The new artifact only needs to be
present for GraalVM native targets at build time; otherwise, the
classes and libraries in `jna-graalvm.jar` are inert.

Includes tested support for:
- macOS aarch64
- Linux amd64

- feat: add `jna-graalvm.jar` publication
- feat: add base `JavaNativeAccess` feature for auto-config of JNA
- feat: add initial implementation of `SubstrateStaticJNA` feature
- test: sample/test gradle build for native image
- chore: ci config to run native sample

Signed-off-by: Sam Gammon <[email protected]>
  • Loading branch information
sgammon committed Jun 11, 2024
1 parent 4f94c57 commit 8978b9b
Show file tree
Hide file tree
Showing 21 changed files with 1,402 additions and 5 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/graalvm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# GraalVM build and native test.
name: GraalVM CI

on:
workflow_dispatch:
workflow_call:
pull_request:
push:
branches:
- master

permissions:
contents: read

env:
ANT_OPTS: -Djava.security.manager=allow

jobs:
build:
runs-on: ubuntu-latest
name: Test GVM 22, ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
java-version: '22'
distribution: 'graalvm-community'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Linux requirements
run: sudo apt-get -y install texinfo
- uses: gradle/actions/setup-gradle@v3
- name: "Build: Native Image"
run: ant dist && ant install && ant nativeImage && ant nativeRun
217 changes: 213 additions & 4 deletions build.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</or>
</condition>
<property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}${version.suffix}"/>
<property name="graalvm.version" value="24.0.1" />
<property name="osgi.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
<!-- jnidispatch library release version -->
<property name="jni.major" value="7"/>
Expand Down
202 changes: 202 additions & 0 deletions lib/gvm/AbstractJNAFeature.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
/* Copyright (c) 2015 Adam Marcionek, All Rights Reserved
*
* The contents of this file is dual-licensed under 2
* alternative Open Source/Free licenses: LGPL 2.1 or later and
* Apache License 2.0. (starting with JNA version 4.0.0).
*
* You can freely decide which license you want to apply to
* the project.
*
* You may obtain a copy of the LGPL License at:
*
* http://www.gnu.org/licenses/licenses.html
*
* A copy is also included in the downloadable source code package
* containing JNA, in file "LGPL2.1".
*
* You may obtain a copy of the Apache License at:
*
* http://www.apache.org/licenses/
*
* A copy is also included in the downloadable source code package
* containing JNA, in file "AL2.0".
*/
package com.sun.jna;

import org.graalvm.nativeimage.hosted.Feature;
import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
import org.graalvm.nativeimage.hosted.RuntimeProxyCreation;
import org.graalvm.nativeimage.hosted.RuntimeReflection;
import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;

// Provides common logic for JNA-related GraalVM feature classes. These classes should only be included
// at build time for a `native-image` target.
abstract class AbstractJNAFeature implements Feature {
/**
* Obtain a reference to a method on a class, in order to register it for reflective access
*
* @param clazz Class to obtain method reference from
* @param methodName Name of the method to obtain a reference to
* @param args Method arguments
* @return Method reference
*/
protected static Method method(Class<?> clazz, String methodName, Class<?>... args) {
try {
return clazz.getDeclaredMethod(methodName, args);
} catch (NoSuchMethodException e) {
throw new IllegalStateException(e);
}
}

/**
* Obtain a reference to one or more fields on a class, in order to register them for reflective access
*
* @param clazz Class to obtain field references from
* @param fieldNames Names of the fields to obtain references to
* @return Field references
*/
protected static Field[] fields(Class<?> clazz, String... fieldNames) {
try {
Field[] fields = new Field[fieldNames.length];
for (int i = 0; i < fieldNames.length; i++) {
fields[i] = clazz.getDeclaredField(fieldNames[i]);
}
return fields;
} catch (NoSuchFieldException e) {
throw new IllegalStateException(e);
}
}

/**
* Register a class for reflective access at runtime
*
* @param clazz Class to register
*/
protected static void reflectiveClass(Class<?>... clazz) {
RuntimeReflection.register(clazz);
}

/**
* Register a resource for use in the final image
*
* @param module Module which owns the resource
* @param resource Path to the resource to register
*/
protected static void registerResource(Module module, String resource) {
RuntimeResourceAccess.addResource(module, resource);
}

/**
* Register a resource for use in the final image
*
* @param resource Path to the resource to register
*/
protected static void registerResource(String resource) {
registerResource(AbstractJNAFeature.class.getModule(), resource);
}

/**
* Register a class for JNI access at runtime
*
* @param clazz Class to register
*/
protected static void registerJniClass(Class<?> clazz) {
RuntimeJNIAccess.register(clazz);
Arrays.stream(clazz.getConstructors()).forEach(RuntimeJNIAccess::register);
Arrays.stream(clazz.getMethods()).forEach(RuntimeJNIAccess::register);
}

/**
* Register a class for JNI access at runtime, potentially with reflective access as well
*
* @param clazz Class to register
* @param reflective Whether to register the class and constructors for reflective access
*/
protected static void registerJniClass(Class<?> clazz, Boolean reflective) {
registerJniClass(clazz);
if (reflective) {
RuntimeReflection.register(clazz);
RuntimeReflection.registerAllConstructors(clazz);
}
}

/**
* Register a suite of JNA methods for use at runtime
*
* @param reflective Whether to register the methods for reflective access
* @param methods Methods to register
*/
protected static void registerJniMethods(Boolean reflective, Method... methods) {
RuntimeJNIAccess.register(methods);
if (reflective) {
RuntimeReflection.register(methods);
}
}

/**
* Register a suite of JNA methods for use at runtime
*
* @param methods Methods to register
*/
protected static void registerJniMethods(Method... methods) {
registerJniMethods(false, methods);
}

/**
* Register a suite of JNA fields for use at runtime
*
* @param reflective Whether to register the fields for reflective access
* @param fields Fields to register
*/
protected static void registerJniFields(Boolean reflective, Field[] fields) {
RuntimeJNIAccess.register(fields);
if (reflective) {
RuntimeReflection.register(fields);
}
}

/**
* Register a suite of JNA fields for use at runtime
*
* @param fields Fields to register
*/
protected static void registerJniFields(Field[] fields) {
registerJniFields(false, fields);
}

/**
* Register a combination of interfaces used at runtime as a dynamic proxy object
*
* @param classes Combination of interface classes; order matters
*/
protected static void registerProxyInterfaces(Class<?>... classes) {
RuntimeProxyCreation.register(classes);
}

/**
* Assign the specified class or classes to initialize at image build time
*
* @param clazz Classes to register for build-time initialization
*/
protected static void initializeAtBuildTime(Class<?>... clazz) {
for (Class<?> c : clazz) {
RuntimeClassInitialization.initializeAtBuildTime(c);
}
}

/**
* Assign the specified class or classes to initialize at image run-time
*
* @param clazz Classes to register for run-time initialization
*/
protected static void initializeAtRunTime(Class<?>... clazz) {
for (Class<?> c : clazz) {
RuntimeClassInitialization.initializeAtRunTime(c);
}
}
}
Loading

0 comments on commit 8978b9b

Please sign in to comment.