Stackless issue #254: Make PyInterpreterState an opaque type in the

public API.

Adapt Stackless to bpo-35886 and move the definition of
PyStacklessInterpreterState from cpython/slp_tstate.h to
internal/pycore_slp_pystate.h

Author: Anselm Kruis

Include/cpython/pystate.h

@@ -162,6 +162,9 @@ struct _ts {
 
     /* XXX signal handlers should also be here */
 
+#ifdef STACKLESS
+    PyStacklessState st;
+#endif
 };
 
 /* Get the current interpreter state.

Include/cpython/slp_tstate.h

@@ -10,50 +10,6 @@ struct _ts;
 
 typedef int (slp_schedule_hook_func) (struct _tasklet *from, struct _tasklet *to);
 
-typedef struct {
-    struct _cstack * cstack_chain;              /* the chain of all C-stacks of this interpreter. This is an uncounted/borrowed ref. */
-    PyObject * reduce_frame_func;               /* a function used to pickle frames */
-    PyObject * error_handler;                   /* the Stackless error handler */
-    PyObject * channel_hook;                    /* the channel callback function */
-    struct _bomb * mem_bomb;                    /* a permanent bomb to use for memory errors */
-    PyObject * schedule_hook;                   /* the schedule callback function */
-    slp_schedule_hook_func * schedule_fasthook; /* the fast C-only schedule_hook */
-    struct _ts * initial_tstate;                /* recording the main thread state */
-    uint8_t enable_softswitch;                  /* the flag which decides whether we try to use soft switching */
-    uint8_t pickleflags;                        /* flags for pickling / unpickling */
-} PyStacklessInterpreterState;
-
-#ifdef Py_BUILD_CORE
-#define SLP_INITIAL_TSTATE(tstate) \
-    (assert(tstate), \
-     assert((tstate)->interp->st.initial_tstate), \
-     (tstate)->interp->st.initial_tstate)
-
-#define SPL_INTERPRETERSTATE_NEW(interp)       \
-    (interp)->st.cstack_chain = NULL;          \
-    (interp)->st.reduce_frame_func = NULL;     \
-    (interp)->st.error_handler = NULL;         \
-    (interp)->st.channel_hook = NULL;          \
-    (interp)->st.mem_bomb = NULL;              \
-    (interp)->st.schedule_hook = NULL;         \
-    (interp)->st.schedule_fasthook = NULL;     \
-    (interp)->st.initial_tstate = NULL;        \
-    (interp)->st.enable_softswitch = 1;        \
-    (interp)->st.pickleflags = 0;
-
-#define SPL_INTERPRETERSTATE_CLEAR(interp)     \
-    (interp)->st.cstack_chain = NULL; /* uncounted ref */  \
-    Py_CLEAR((interp)->st.reduce_frame_func);  \
-    Py_CLEAR((interp)->st.error_handler);      \
-    Py_CLEAR((interp)->st.mem_bomb);           \
-    Py_CLEAR((interp)->st.channel_hook);       \
-    Py_CLEAR((interp)->st.schedule_hook);      \
-    (interp)->st.schedule_fasthook = NULL;     \
-    (interp)->st.enable_softswitch = 1;        \
-    (interp)->st.pickleflags = 0;
-
-#endif /* #ifdef Py_BUILD_CORE */
-
 struct _frame; /* Avoid including frameobject.h */
 
 typedef struct _sts {

Include/internal/pycore_pystate.h

@@ -81,6 +81,9 @@ struct _is {
     PyObject *pyexitmodule;
 
     uint64_t tstate_next_unique_id;
+#ifdef STACKLESS
+    PyStacklessInterpreterState st;
+#endif
 };
 
 PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(PY_INT64_T);

Include/internal/pycore_slp_pystate.h

@@ -26,6 +26,47 @@
 #define SLP_CSTACK_SLOTS        1024
 #endif
 
+typedef struct {
+    struct _cstack * cstack_chain;              /* the chain of all C-stacks of this interpreter. This is an uncounted/borrowed ref. */
+    PyObject * reduce_frame_func;               /* a function used to pickle frames */
+    PyObject * error_handler;                   /* the Stackless error handler */
+    PyObject * channel_hook;                    /* the channel callback function */
+    struct _bomb * mem_bomb;                    /* a permanent bomb to use for memory errors */
+    PyObject * schedule_hook;                   /* the schedule callback function */
+    slp_schedule_hook_func * schedule_fasthook; /* the fast C-only schedule_hook */
+    struct _ts * initial_tstate;                /* recording the main thread state */
+    uint8_t enable_softswitch;                  /* the flag which decides whether we try to use soft switching */
+    uint8_t pickleflags;                        /* flags for pickling / unpickling */
+} PyStacklessInterpreterState;
+
+#define SLP_INITIAL_TSTATE(tstate) \
+    (assert(tstate), \
+     assert((tstate)->interp->st.initial_tstate), \
+     (tstate)->interp->st.initial_tstate)
+
+#define SPL_INTERPRETERSTATE_NEW(interp)       \
+    (interp)->st.cstack_chain = NULL;          \
+    (interp)->st.reduce_frame_func = NULL;     \
+    (interp)->st.error_handler = NULL;         \
+    (interp)->st.channel_hook = NULL;          \
+    (interp)->st.mem_bomb = NULL;              \
+    (interp)->st.schedule_hook = NULL;         \
+    (interp)->st.schedule_fasthook = NULL;     \
+    (interp)->st.initial_tstate = NULL;        \
+    (interp)->st.enable_softswitch = 1;        \
+    (interp)->st.pickleflags = 0;
+
+#define SPL_INTERPRETERSTATE_CLEAR(interp)     \
+    (interp)->st.cstack_chain = NULL; /* uncounted ref */  \
+    Py_CLEAR((interp)->st.reduce_frame_func);  \
+    Py_CLEAR((interp)->st.error_handler);      \
+    Py_CLEAR((interp)->st.mem_bomb);           \
+    Py_CLEAR((interp)->st.channel_hook);       \
+    Py_CLEAR((interp)->st.schedule_hook);      \
+    (interp)->st.schedule_fasthook = NULL;     \
+    (interp)->st.enable_softswitch = 1;        \
+    (interp)->st.pickleflags = 0;
+
 /*
  * Stackless runtime state
  *