removed IsolateSupport.getIsolateID

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LibGraalSupport.java

@@ -108,8 +108,6 @@ public interface LibGraalSupport {
     /**
      * Gets an identifier for the current isolate that is guaranteed to be unique for the first
      * {@code 2^64 - 1} isolates in the process.
-     *
-     * @return a non-zero value
      */
     long getIsolateID();
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GlobalMetrics.java

@@ -88,9 +88,9 @@ private static PrintStream openPrintStream(String metricsFile, Path[] outPath) t
     }
 
     static Path generateFileName(String metricsFile) {
-        long isolateID = IsolateUtil.getIsolateID();
         Path path;
-        if (isolateID != 0L) {
+        if (IsolateUtil.getIsolateAddress() != 0L) {
+            long isolateID = IsolateUtil.getIsolateID();
             int lastDot = metricsFile.lastIndexOf('.');
             if (lastDot != -1) {
                 path = Paths.get(metricsFile.substring(0, lastDot) + '@' + isolateID + metricsFile.substring(lastDot));

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/IsolateUtil.java

@@ -43,9 +43,9 @@ public static long getIsolateAddress() {
     }
 
     /**
-     * Gets a non-zero identifier for the current isolate or 0 if this not an isolate-aware runtime.
-     * The returned value is guaranteed to be unique for the first {@code 2^64 - 1} isolates in the
-     * process.
+     * Gets an identifier for the current isolate. This will return 0 if
+     * {@link #getIsolateAddress()} returns 0. The returned value is guaranteed to be unique for the
+     * first {@code 2^64 - 1} isolates in the process.
      */
     public static long getIsolateID() {
         LibGraalSupport libgraal = LibGraalSupport.INSTANCE;
@@ -58,7 +58,8 @@ public static long getIsolateID() {
     /**
      * Gets a string identifying the current isolate.
      *
-     * If this is not an isolate-aware runtime, an empty string is returned.
+     * If this is not an isolate-aware runtime (i.e. {@link #getIsolateAddress()} returns 0), an
+     * empty string is returned.
      *
      * If {@code withAddress == true}, then
      * {@code String.format("%d@%x", getIsolateID(), getIsolateAddress())} is returned.

sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/LibGraalRuntime.java

@@ -79,8 +79,6 @@ public static void notifyLowMemoryPoint(boolean suggestFullGC) {
     /**
      * Gets an identifier for the current isolate that is guaranteed to be unique for the first
      * {@code 2^64 - 1} isolates in the process.
-     *
-     * @return a non-zero value
      */
     public static long getIsolateID() {
         return ImageSingletons.lookup(LibGraalRuntimeSupport.class).getIsolateID();

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/IsolateSupport.java

@@ -58,12 +58,4 @@ public interface IsolateSupport {
     void detachThread(IsolateThread thread) throws IsolateException;
 
     void tearDownIsolate(IsolateThread thread) throws IsolateException;
-
-    /**
-     * Gets an identifier for the current isolate that is guaranteed to be unique for the first
-     * {@code 2^64 - 1} isolates in the process.
-     *
-     * @return a non-zero value
-     */
-    long getIsolateID();
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java

@@ -133,6 +133,10 @@ public static long getStartTimeNanos() {
         return startTimeNanos;
     }
 
+    /**
+     * Gets an identifier for the current isolate that is guaranteed to be unique for the first
+     * {@code 2^64 - 1} isolates in the process.
+     */
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public static long getIsolateId() {
         assert isolateId >= 0;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/IsolateSupportImpl.java

@@ -26,8 +26,6 @@
 
 import java.util.List;
 
-import com.oracle.svm.core.c.CGlobalData;
-import com.oracle.svm.core.c.CGlobalDataFactory;
 import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
@@ -38,7 +36,6 @@
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.nativeimage.impl.IsolateSupport;
-import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.c.function.CEntryPointNativeFunctions.IsolateThreadPointer;
@@ -50,8 +47,6 @@
 import com.oracle.svm.core.os.MemoryProtectionProvider;
 import com.oracle.svm.core.os.MemoryProtectionProvider.UnsupportedDomainException;
 
-import static org.graalvm.word.LocationIdentity.ANY_LOCATION;
-
 @AutomaticallyRegisteredImageSingleton(IsolateSupport.class)
 public final class IsolateSupportImpl implements IsolateSupport {
     private static final String ISOLATES_DISABLED_MESSAGE = "Spawning of multiple isolates is disabled, use " +
@@ -172,31 +167,4 @@ private static void throwOnError(int code) {
             throw new IsolateException(message);
         }
     }
-
-    private static final CGlobalData<Pointer> nextIsolateId = CGlobalDataFactory.createWord((Pointer) Word.unsigned(1L));
-
-    private volatile long isolateId = 0;
-
-    @Override
-    public long getIsolateID() {
-        if (isolateId == 0) {
-            synchronized (this) {
-                if (isolateId == 0) {
-                    Pointer p = nextIsolateId.get();
-                    long value;
-                    long nextValue;
-                    do {
-                        value = p.readLong(0);
-                        nextValue = value + 1;
-                        if (nextValue == 0) {
-                            // Avoid setting id to reserved 0 value after long integer overflow
-                            nextValue = 1;
-                        }
-                    } while (p.compareAndSwapLong(0, value, nextValue, ANY_LOCATION) != value);
-                    isolateId = value;
-                }
-            }
-        }
-        return isolateId;
-    }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java

@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.jni.functions;
 
+import com.oracle.svm.core.Isolates;
 import jdk.graal.compiler.word.Word;
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
@@ -35,7 +35,6 @@
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
 import org.graalvm.nativeimage.c.type.CIntPointer;
 import org.graalvm.nativeimage.c.type.WordPointer;
-import org.graalvm.nativeimage.impl.IsolateSupport;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 
@@ -204,8 +203,8 @@ static int enter(JNIJavaVMPointer vmBuf, JNIEnvironmentPointer penv, JNIJavaVMIn
          |                    | 0-terminated C string describing the error if a description is available,         |
          |                    | otherwise extraInfo is set to null.                                               |
          |--------------------|-----------------------------------------------------------------------------------|
-         | _javavm_id         | extraInfo is a "unsigned long*" value.                                            |
-         |                    | A non-zero identifier for the current isolate that is guaranteed to be unique for |
+         | _javavm_id         | extraInfo is a "jlong*" value.                                                    |
+         |                    | An identifier for the current isolate that is guaranteed to be unique for         |
          |                    | the first 2^64 - 1 isolates in the process is returned in *value.                 |
          |--------------------|-----------------------------------------------------------------------------------|
          * </pre>
@@ -393,7 +392,7 @@ private static int finishInitialization0(JNIJavaVMPointer vmBuf, JNIEnvironmentP
             JNIJavaVM javaVm = JNIFunctionTables.singleton().getGlobalJavaVM();
             JNIJavaVMList.addJavaVM(javaVm);
             if (javaVmIdPointer.isNonNull()) {
-                long javaVmId = ImageSingletons.lookup(IsolateSupport.class).getIsolateID();
+                long javaVmId = Isolates.getIsolateId();
                 javaVmIdPointer.write(Word.pointer(javaVmId));
             }
             RuntimeSupport.getRuntimeSupport().addTearDownHook(new RuntimeSupport.Hook() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/libgraal/LibGraalRuntimeSupportImpl.java

@@ -24,8 +24,7 @@
  */
 package com.oracle.svm.core.libgraal;
 
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.impl.IsolateSupport;
+import com.oracle.svm.core.Isolates;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 import com.oracle.svm.core.heap.Heap;
@@ -48,7 +47,7 @@ public void notifyLowMemoryPoint(boolean suggestFullGC) {
 
     @Override
     public long getIsolateID() {
-        return ImageSingletons.lookup(IsolateSupport.class).getIsolateID();
+        return Isolates.getIsolateId();
     }
 
     @Override

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java

@@ -33,14 +33,14 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.oracle.svm.core.Isolates;
 import jdk.graal.compiler.graph.Edges;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
-import org.graalvm.nativeimage.impl.IsolateSupport;
 
 import com.oracle.svm.core.SubstrateTargetDescription;
 import com.oracle.svm.core.annotate.Alias;
@@ -218,7 +218,7 @@ public static long getIsolateAddress() {
 
     @Substitute
     public static long getIsolateID() {
-        return ImageSingletons.lookup(IsolateSupport.class).getIsolateID();
+        return Isolates.getIsolateId();
     }
 }