Works (without sighandler) on Windows

Author: JaroslavTulach

lib/java/os-environment/src/main/java/org/enso/os/environment/jni/JNIBoot.java

@@ -1,7 +1,6 @@
 package org.enso.os.environment.jni;
 
 import org.graalvm.nativeimage.c.CContext;
-import org.graalvm.nativeimage.c.function.CFunction;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
 import org.graalvm.nativeimage.c.struct.CField;
@@ -13,10 +12,7 @@
 /** Java virtual machine initialization API. */
 @CContext(JNIDirectives.class)
 final class JNIBoot {
-  @CFunction
-  static native int JNI_GetDefaultJavaVMInitArgs(Args vmargs);
-
-  public interface JNICreateJavaVMPointer extends CFunctionPointer {
+  interface JNICreateJavaVMPointer extends CFunctionPointer {
     @InvokeCFunctionPointer
     int call(JNI.JavaVMPointer jvmptr, JNI.JNIEnvPointer env, Args args);
   }
@@ -49,7 +45,7 @@ interface Args extends PointerBase {
   }
 
   @CStruct(value = "JavaVMOption")
-  public interface Option extends PointerBase {
+  interface Option extends PointerBase {
 
     @CField("optionString")
     CCharPointer getOptionString();

lib/java/os-environment/src/main/java/org/enso/os/environment/jni/JNIDirectives.java

@@ -9,8 +9,13 @@ final class JNIDirectives implements CContext.Directives {
   @Override
   public List<String> getLibraryPaths() {
     var javaHome = new File(System.getProperty("java.home"));
+    var binServer = new File(new File(javaHome, "bin"), "server");
     var libServer = new File(new File(javaHome, "lib"), "server");
-    return List.of(libServer.getPath());
+    if (binServer.isDirectory()) {
+      return List.of(binServer.getPath());
+    } else {
+      return List.of(libServer.getPath());
+    }
   }
 
   @Override
@@ -28,7 +33,6 @@ public List<String> getOptions() {
     for (var subDir : include.listFiles()) {
       var md = new File(subDir, "jni_md.h");
       if (md.canRead()) {
-        var q = "\"";
         var includes = List.of("-I", jni.getParent(), "-I", md.getParent());
         return includes;
       }

lib/java/os-environment/src/main/java/org/enso/os/environment/jni/JVM.java

@@ -1,22 +1,57 @@
 package org.enso.os.environment.jni;
 
 import org.enso.common.Platform;
+import org.graalvm.nativeimage.StackValue;
+import org.graalvm.word.WordFactory;
 
 public final class JVM {
-  private final JNI.JNIEnv env;
+  private final JNIBoot.JNICreateJavaVMPointer createJvmFn;
+  private JNI.JNIEnv env = WordFactory.nullPointer();
 
-  JVM(JNI.JNIEnv env) {
-    this.env = env;
+  JVM(JNIBoot.JNICreateJavaVMPointer factory) {
+    this.createJvmFn = factory;
   }
 
+  /**
+   * Create new JVM. Use {@link #env()} to obtain reference to JNI interface and make calls into the
+   * JVM.
+   *
+   * @param javaHome path where the JDK is installed
+   * @return new instance of the JVM
+   */
   public static JVM create(String javaHome) {
     return switch (Platform.getOperatingSystem()) {
       case WINDOWS -> WindowsJVM.createImpl(javaHome);
       case LINUX, MACOS -> PosixJVM.createImpl(javaHome);
     };
   }
 
-  public JNI.JNIEnv env() {
+  /**
+   * Initialize or just obtain environment associated with this JVM.
+   *
+   * @return JNI environment to make calls into the JVM
+   */
+  public final JNI.JNIEnv env() {
+    if (env.isNull()) {
+      env = initializeEnv();
+    }
     return env;
   }
+
+  private synchronized JNI.JNIEnv initializeEnv() {
+    var jvmArgs = StackValue.get(JNIBoot.Args.class);
+    jvmArgs.nOptions(0);
+    var options = StackValue.get(1, JNIBoot.Option.class);
+    jvmArgs.options(options);
+    jvmArgs.version(JNI.JNI_VERSION_10());
+    jvmArgs.nOptions(0);
+    jvmArgs.ignoreUnrecognized(false);
+
+    var jvmPtr = StackValue.get(JNI.JavaVMPointer.class);
+    var envPtr = StackValue.get(JNI.JNIEnvPointer.class);
+
+    int res = createJvmFn.call(jvmPtr, envPtr, jvmArgs);
+    assert res == 0;
+    return envPtr.readJNIEnv();
+  }
 }

lib/java/os-environment/src/main/java/org/enso/os/environment/jni/PosixJVM.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.List;
 import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.CContext;
 import org.graalvm.nativeimage.c.constant.CConstant;
 import org.graalvm.nativeimage.c.function.CFunction;
@@ -15,26 +14,11 @@
 final class PosixJVM {
 
   static JVM createImpl(String javaHome) {
-    var jvmArgs = StackValue.get(JNIBoot.Args.class);
-    jvmArgs.nOptions(0);
-    var options = StackValue.get(1, JNIBoot.Option.class);
-    jvmArgs.options(options);
-    System.err.println("empty: " + jvmArgs.version());
-    jvmArgs.version(JNI.JNI_VERSION_1_1());
-    System.err.println("version is " + jvmArgs.version());
-
-    int resInitArgs = JNIBoot.JNI_GetDefaultJavaVMInitArgs(jvmArgs);
-    if (resInitArgs != 0) {
-      System.err.println("result: " + resInitArgs);
-      System.err.println("JVM wants to support version " + jvmArgs.version());
-    }
-
-    jvmArgs.nOptions(0);
-    jvmArgs.ignoreUnrecognized(false);
-
-    var jvmPtr = StackValue.get(JNI.JavaVMPointer.class);
-    var envPtr = StackValue.get(JNI.JNIEnvPointer.class);
+    var createJvmFn = findCreateJavaSymbol(javaHome);
+    return new JVM(createJvmFn);
+  }
 
+  private static JNIBoot.JNICreateJavaVMPointer findCreateJavaSymbol(String javaHome) {
     var libJvmPath = findDynamicLibrary(javaHome).getPath();
     try (var libPath = CTypeConversion.toCString(libJvmPath);
         var createJvm = CTypeConversion.toCString("JNI_CreateJavaVM")) {
@@ -44,10 +28,7 @@ static JVM createImpl(String javaHome) {
               + libJvmPath
               + " error: "
               + CTypeConversion.toJavaString(dlerror());
-      JNIBoot.JNICreateJavaVMPointer createJvmFn = dlsym(jvmSo, createJvm.get());
-      int res = createJvmFn.call(jvmPtr, envPtr, jvmArgs);
-      assert res == 0;
-      return new JVM(envPtr.readJNIEnv());
+      return dlsym(jvmSo, createJvm.get());
     }
   }
 

lib/java/os-environment/src/main/java/org/enso/os/environment/jni/WindowsJVM.java

@@ -1,7 +1,57 @@
 package org.enso.os.environment.jni;
 
+import static org.graalvm.nativeimage.c.function.CFunction.Transition.NO_TRANSITION;
+
+import java.io.File;
+import java.util.List;
+import org.enso.os.environment.jni.JNIBoot.JNICreateJavaVMPointer;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.c.CContext;
+import org.graalvm.nativeimage.c.function.CFunction;
+import org.graalvm.nativeimage.c.type.CCharPointer;
+import org.graalvm.nativeimage.c.type.CTypeConversion;
+import org.graalvm.word.PointerBase;
+
+@CContext(WindowsJVM.Direct.class)
 final class WindowsJVM {
   static JVM createImpl(String javaHome) {
-    return null;
+    var dllPath = findDynamicLibrary(javaHome).getPath();
+
+    try (var libPath = CTypeConversion.toCString(dllPath);
+        var createJvm = CTypeConversion.toCString("JNI_CreateJavaVM")) {
+      var dll = LoadLibraryA(libPath.get());
+      assert dll.isNonNull();
+      JNICreateJavaVMPointer cStringCreateJvm = GetProcAddress(dll, createJvm.get());
+
+      return new JVM(cStringCreateJvm);
+    }
+  }
+
+  private static File findDynamicLibrary(String javaHome) {
+    return new File(new File(new File(new File(javaHome), "bin"), "server"), "jvm.dll");
+  }
+
+  /** Loads the specified module into the address space of the calling process. */
+  @CFunction(transition = NO_TRANSITION)
+  static native HMODULE LoadLibraryA(CCharPointer lpLibFileName);
+
+  @CFunction(transition = NO_TRANSITION)
+  static native <T extends PointerBase> T GetProcAddress(HMODULE hModule, CCharPointer lpProcName);
+
+  /** Windows Module Handle type */
+  interface HMODULE extends PointerBase {}
+
+  @Platforms(Platform.WINDOWS.class)
+  static final class Direct implements CContext.Directives {
+    @Override
+    public final boolean isInConfiguration() {
+      return Platform.includedIn(Platform.WINDOWS.class);
+    }
+
+    @Override
+    public final List<String> getHeaderFiles() {
+      return List.of("<windows.h>");
+    }
   }
 }