Rename PThreadState.getThreadState to getOrCreateNativeThreadState

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCEvalBuiltins.java

@@ -95,7 +95,7 @@ abstract static class PyEval_SaveThread extends CApiNullaryBuiltinNode {
         @Specialization
         static Object save(@Cached GilNode gil) {
             PythonContext context = PythonContext.get(gil);
-            Object threadState = PThreadState.getThreadState(PythonLanguage.get(gil), context);
+            Object threadState = PThreadState.getOrCreateNativeThreadState(PythonLanguage.get(gil), context);
             LOGGER.fine("C extension releases GIL");
             gil.release(context, true);
             return threadState;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextPyStateBuiltins.java

@@ -110,7 +110,7 @@ Object get(Object tstateCurrentPtr,
             if (!lib.isNull(tstateCurrentPtr)) {
                 pythonThreadState.setNativeThreadLocalVarPointer(tstateCurrentPtr);
             }
-            return PThreadState.getThreadState(pythonThreadState);
+            return PThreadState.getOrCreateNativeThreadState(pythonThreadState);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PThreadState.java

@@ -60,8 +60,8 @@
  * <p>
  * This wrapper does intentionally not implement {@link InteropLibrary#isPointer(Object)},
  * {@link InteropLibrary#asPointer(Object)}, and {@link InteropLibrary#toNative(Object)} because the
- * factory method {@link #getThreadState(PythonLanguage, PythonContext)} will already return the
- * appropriate pointer object that implements that.
+ * factory method {@link #getOrCreateNativeThreadState(PythonLanguage, PythonContext)} will already
+ * return the appropriate pointer object that implements that.
  * </p>
  */
 public final class PThreadState extends PythonStructNativeWrapper {
@@ -73,11 +73,11 @@ private PThreadState(PythonThreadState threadState) {
         replacement = registerReplacement(allocateCLayout(threadState), false, InteropLibrary.getUncached());
     }
 
-    public static Object getThreadState(PythonLanguage language, PythonContext context) {
-        return getThreadState(context.getThreadState(language));
+    public static Object getOrCreateNativeThreadState(PythonLanguage language, PythonContext context) {
+        return getOrCreateNativeThreadState(context.getThreadState(language));
     }
 
-    public static Object getThreadState(PythonThreadState threadState) {
+    public static Object getOrCreateNativeThreadState(PythonThreadState threadState) {
         PThreadState nativeWrapper = threadState.getNativeWrapper();
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, nativeWrapper == null)) {
             nativeWrapper = new PThreadState(threadState);
@@ -86,6 +86,14 @@ public static Object getThreadState(PythonThreadState threadState) {
         return nativeWrapper.replacement;
     }
 
+    public static Object getNativeThreadState(PythonThreadState threadState) {
+        PThreadState nativeWrapper = threadState.getNativeWrapper();
+        if (nativeWrapper != null) {
+            return nativeWrapper.replacement;
+        }
+        return null;
+    }
+
     public PythonThreadState getThreadState() {
         return (PythonThreadState) getDelegate();
     }