Add Py_IsInitialized

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/pylifecycle.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,18 +40,15 @@
  */
 #include "capi.h"
 
+int Py_IsInitialized(void) {
+    return 1;
+}
+
+#ifndef COMPILING_NATIVE_CAPI
 void _Py_NO_RETURN  _Py_FatalErrorFunc(const char *func, const char *msg) {
 	GraalPyTruffle_FatalErrorFunc(func != NULL? truffleString(func): NULL, truffleString(msg), -1);
 	/* If the above upcall returns, then we just fall through to the 'abort' call. */
 	abort();
 }
+#endif // COMPILING_NATIVE_CAPI
 
-PyOS_sighandler_t PyOS_setsig(int sig, PyOS_sighandler_t handler) {
-	PyErr_SetString(PyExc_SystemError, "'PyOS_setsig' not implemented");
-	return NULL;
-}
-
-int PyOS_InterruptOccurred(void) {
-	PyErr_SetString(PyExc_SystemError, "'PyOS_InterruptOccurred' not implemented");
-	return -1;
-}

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -3354,10 +3354,8 @@ PyAPI_FUNC(PyObject*) PyOS_FSPath(PyObject* a) {
     PyObject* result = (PyObject*) __target__PyOS_FSPath(a);
     return result;
 }
-int (*__target__PyOS_InterruptOccurred)() = NULL;
 PyAPI_FUNC(int) PyOS_InterruptOccurred() {
-    int result = (int) __target__PyOS_InterruptOccurred();
-    return result;
+    unimplemented("PyOS_InterruptOccurred"); exit(-1);
 }
 PyAPI_FUNC(char*) PyOS_Readline(FILE* a, FILE* b, const char* c) {
     unimplemented("PyOS_Readline"); exit(-1);
@@ -3376,10 +3374,8 @@ PyAPI_FUNC(int) PyOS_mystricmp(const char* a, const char* b) {
 PyAPI_FUNC(int) PyOS_mystrnicmp(const char* a, const char* b, Py_ssize_t c) {
     unimplemented("PyOS_mystrnicmp"); exit(-1);
 }
-PyOS_sighandler_t (*__target__PyOS_setsig)(int, PyOS_sighandler_t) = NULL;
 PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int a, PyOS_sighandler_t b) {
-    PyOS_sighandler_t result = (PyOS_sighandler_t) __target__PyOS_setsig(a, b);
-    return result;
+    unimplemented("PyOS_setsig"); exit(-1);
 }
 double (*__target__PyOS_string_to_double)(const char*, char**, PyObject*) = NULL;
 PyAPI_FUNC(double) PyOS_string_to_double(const char* a, char** b, PyObject* c) {
@@ -4957,9 +4953,6 @@ PyAPI_FUNC(int) Py_IsFalse(PyObject* a) {
     int result = (int) __target__Py_IsFalse(a);
     return result;
 }
-PyAPI_FUNC(int) Py_IsInitialized() {
-    unimplemented("Py_IsInitialized"); exit(-1);
-}
 int (*__target__Py_IsNone)(PyObject*) = NULL;
 PyAPI_FUNC(int) Py_IsNone(PyObject* a) {
     int result = (int) __target__Py_IsNone(a);
@@ -6879,9 +6872,7 @@ void initializeCAPIForwards(void* (*getAPI)(const char*)) {
     __target__PyNumber_TrueDivide = getAPI("PyNumber_TrueDivide");
     __target__PyNumber_Xor = getAPI("PyNumber_Xor");
     __target__PyOS_FSPath = getAPI("PyOS_FSPath");
-    __target__PyOS_InterruptOccurred = getAPI("PyOS_InterruptOccurred");
     __target__PyOS_double_to_string = getAPI("PyOS_double_to_string");
-    __target__PyOS_setsig = getAPI("PyOS_setsig");
     __target__PyOS_string_to_double = getAPI("PyOS_string_to_double");
     __target__PyOS_strtol = getAPI("PyOS_strtol");
     __target__PyOS_strtoul = getAPI("PyOS_strtoul");

graalpython/com.oracle.graal.python.jni/src/capi_native.c

@@ -557,11 +557,13 @@ char _PyByteArray_empty_string[] = "";
  * The following source files contain code that can be compiled directly and does not need to be called via stubs in Sulong:
  */
 
+#define COMPILING_NATIVE_CAPI
 #include "_warnings.c"
 #include "boolobject.c"
 #include "complexobject.c"
 #include "dictobject.c"
 #include "modsupport_shared.c"
+#include "pylifecycle.c"
 
 /*
  * This mirrors the definition in capi.c that we us on Sulong, and needs to be

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

@@ -287,6 +287,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyModule_AddStringConstant", ret = Int, args = {PyObject, ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString}, call = CImpl)
     @CApiBuiltin(name = "PyModule_AddType", ret = Int, args = {PyObject, PyTypeObject}, call = CImpl)
     @CApiBuiltin(name = "PyObject_GenericGetDict", ret = PyObject, args = {PyObject, Pointer}, call = CImpl)
+    @CApiBuiltin(name = "Py_IsInitialized", ret = Int, args = {}, call = CImpl)
 
     /*
      * Functions that are implemented in C code:
@@ -581,8 +582,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyObject_SetAttrString", ret = Int, args = {PyObject, ConstCharPtrAsTruffleString, PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyObject_VectorcallDict", ret = PyObject, args = {PyObject, PyObjectConstPtr, SIZE_T, PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyOS_double_to_string", ret = CHAR_PTR, args = {Double, CHAR, Int, Int, INT_LIST}, call = PolyglotImpl)
-    @CApiBuiltin(name = "PyOS_InterruptOccurred", ret = Int, args = {}, call = PolyglotImpl)
-    @CApiBuiltin(name = "PyOS_setsig", ret = PY_OS_SIGHANDLER, args = {Int, PY_OS_SIGHANDLER}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyOS_snprintf", ret = Int, args = {CHAR_PTR, SIZE_T, ConstCharPtrAsTruffleString, VARARGS}, forwardsTo = "PyOS_vsnprintf", call = PolyglotImpl)
     @CApiBuiltin(name = "PyOS_string_to_double", ret = Double, args = {ConstCharPtrAsTruffleString, CHAR_PTR_LIST, PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyOS_strtol", ret = Long, args = {ConstCharPtrAsTruffleString, CHAR_PTR_LIST, Int}, call = PolyglotImpl)
@@ -991,7 +990,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "Py_Initialize", ret = Void, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "Py_InitializeEx", ret = Void, args = {Int}, call = NotImplemented)
     @CApiBuiltin(name = "Py_InitializeFromConfig", ret = PYSTATUS, args = {CONST_PYCONFIG_PTR}, call = NotImplemented)
-    @CApiBuiltin(name = "Py_IsInitialized", ret = Int, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "Py_Main", ret = Int, args = {Int, WCHAR_T_PTR_LIST}, call = NotImplemented)
     @CApiBuiltin(name = "Py_MakePendingCalls", ret = Int, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "Py_NewInterpreter", ret = PyThreadState, args = {}, call = NotImplemented)
@@ -1208,9 +1206,11 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyOS_AfterFork_Parent", ret = Void, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_AfterFork", ret = Void, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_BeforeFork", ret = Void, args = {}, call = NotImplemented)
+    @CApiBuiltin(name = "PyOS_InterruptOccurred", ret = Int, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_getsig", ret = PY_OS_SIGHANDLER, args = {Int}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_mystricmp", ret = Int, args = {ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_mystrnicmp", ret = Int, args = {ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString, Py_ssize_t}, call = NotImplemented)
+    @CApiBuiltin(name = "PyOS_setsig", ret = PY_OS_SIGHANDLER, args = {Int, PY_OS_SIGHANDLER}, call = NotImplemented)
     @CApiBuiltin(name = "PyOS_Readline", ret = CHAR_PTR, args = {FILE_PTR, FILE_PTR, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyPickleBuffer_FromObject", ret = PyObject, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyPickleBuffer_GetBuffer", ret = CONST_PY_BUFFER, args = {PyObject}, call = NotImplemented)