Stackless issue #152: Cleanups, no functional change

Preparations:
- use meaningful variable names
- remove dead code
- move the stackless addition to PyThreadState to the end of the struct
- remove redundant declarations from stackless_structs.h

Author: Anselm Kruis

Include/pystate.h

@@ -189,10 +189,6 @@ typedef struct _ts {
     int trash_delete_nesting;
     PyObject *trash_delete_later;
 
-#ifdef STACKLESS
-PyStacklessState st;
-#endif
-
     /* Called when a thread state is deleted normally, but not when it
      * is destroyed after fork().
      * Pain:  to prevent rare but fatal shutdown errors (issue 18808),
@@ -227,6 +223,9 @@ PyStacklessState st;
 
     /* XXX signal handlers should also be here */
 
+#ifdef STACKLESS
+    PyStacklessState st;
+#endif
 } PyThreadState;
 #endif
 

Objects/typeobject.c

@@ -3641,7 +3641,7 @@ excess_args(PyObject *args, PyObject *kwds)
 }
 
 #ifdef STACKLESS
-int generic_init(PyObject *ob, PyObject *args, PyObject *kwds);
+int slp_generic_init(PyObject *ob, PyObject *args, PyObject *kwds);
 #endif
 
 static int
@@ -3650,7 +3650,7 @@ object_init(PyObject *self, PyObject *args, PyObject *kwds)
     PyTypeObject *type = Py_TYPE(self);
 #ifdef STACKLESS
     /* The following checking clashes with Stackless unpickling. */
-    if (type->tp_init == generic_init)
+    if (type->tp_init == slp_generic_init)
         type = type->tp_base;
 #endif
     if (excess_args(args, kwds)) {

Stackless/core/slp_transfer.c

@@ -81,7 +81,7 @@ extern int slp_switch(void);
 #endif
 
 /* a write only variable used to prevent overly optimisation */
-intptr_t *global_goobledigoobs;
+intptr_t *_dont_optimise_away_goobledigoobs;
 static int
 climb_stack_and_transfer(PyCStackObject **cstprev, PyCStackObject *cst,
                          PyTaskletObject *prev)
@@ -104,7 +104,7 @@ climb_stack_and_transfer(PyCStackObject **cstprev, PyCStackObject *cst,
         /* hinder the compiler to optimise away 
            goobledigoobs and the alloca call. 
            This happens with gcc 4.7.x and -O2 */
-        global_goobledigoobs = goobledigoobs;
+        _dont_optimise_away_goobledigoobs = goobledigoobs;
     }
     return slp_transfer(cstprev, cst, prev);
 }

Stackless/core/stackless_structs.h

@@ -256,16 +256,6 @@ PyAPI_DATA(PyTypeObject) PyChannel_Type;
 #define PyChannel_Check(op) PyObject_TypeCheck(op, &PyChannel_Type)
 #define PyChannel_CheckExact(op) (Py_TYPE(op) == PyChannel_TypePtr)
 
-/*** these are in other bits of C-Python(r) ***/
-PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
-PyAPI_DATA(PyTypeObject) PyListIter_Type;
-PyAPI_DATA(PyTypeObject) PySetIter_Type;
-PyAPI_DATA(PyTypeObject) PyRangeIter_Type;
-PyAPI_DATA(PyTypeObject) PyTupleIter_Type;
-PyAPI_DATA(PyTypeObject) PyEnum_Type;
-
 #ifdef __cplusplus
 }
 #endif

Stackless/pickling/prickelpit.c

@@ -61,7 +61,7 @@ generic_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 int
-generic_init(PyObject *ob, PyObject *args, PyObject *kwds)
+slp_generic_init(PyObject *ob, PyObject *args, PyObject *kwds)
 {
 
     initproc init = Py_TYPE(ob)->tp_base->tp_init;
@@ -185,7 +185,7 @@ static struct _typeobject wrap_##type = { \
     0,                                          /* tp_descr_get */ \
     0,                                          /* tp_descr_set */ \
     0,                                          /* tp_dictoffset */ \
-    generic_init,                               /* tp_init */ \
+    slp_generic_init,                           /* tp_init */ \
     0,                                          /* tp_alloc */ \
     newfunc,                                    /* tp_new */ \
     0,                                          /* tp_free */ \