Stackless issue #179: Rename smelly symbols

Rename the following symbols (reported by Tools/scripts/smelly.py):
_dont_optimise_away_goobledigoobs -> slp_dont_optimise_away_goobledigoobs
_dont_optimise_away_saved_tstat_with_magic -> slp_dont_optimise_away_saved_tstat_with_magic
_dont_optimise_away_slp_eval_frame_functions -> slp_dont_optimise_away_slp_eval_frame_functions
channel_seq_callback -> slp_channel_seq_callback
init_cframetype -> slp_init_cframetype
init_prickelpit -> slp_init_prickelpit

Author: Anselm Kruis

Python/ceval.c

@@ -3863,7 +3863,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 
 #ifdef STACKLESS
 /* a global write only dummy variable */
-char _dont_optimise_away_slp_eval_frame_functions;
+char slp_dont_optimise_away_slp_eval_frame_functions;
 
 PyObject * _Py_HOT_FUNCTION
 slp_eval_frame_noval(PyFrameObject *f, int throwflag, PyObject *retval)
@@ -3874,7 +3874,7 @@ slp_eval_frame_noval(PyFrameObject *f, int throwflag, PyObject *retval)
      * it serves as a marker whether we expect a value or
      * not, and it makes debugging a little easier.
      */
-    _dont_optimise_away_slp_eval_frame_functions = 1;
+    slp_dont_optimise_away_slp_eval_frame_functions = 1;
     r = slp_eval_frame_value(f, throwflag, retval);
     return r;
 }
@@ -3889,7 +3889,7 @@ slp_eval_frame_iter(PyFrameObject *f, int throwflag, PyObject *retval)
      * for_iter operation. In this case we need to handle
      * null without error as valid result.
      */
-    _dont_optimise_away_slp_eval_frame_functions = 2;
+    slp_dont_optimise_away_slp_eval_frame_functions = 2;
     r = slp_eval_frame_value(f, throwflag, retval);
     return r;
 }
@@ -3904,7 +3904,7 @@ slp_eval_frame_setup_with(PyFrameObject *f, int throwflag, PyObject *retval)
      * SETUP_WITH operation.
      * NOTE / XXX: see above.
      */
-    _dont_optimise_away_slp_eval_frame_functions = 3;
+    slp_dont_optimise_away_slp_eval_frame_functions = 3;
     r = slp_eval_frame_value(f, throwflag, retval);
     return r;
 }
@@ -3919,7 +3919,7 @@ slp_eval_frame_with_cleanup(PyFrameObject *f, int throwflag, PyObject *retval)
      * WITH_CLEANUP operation.
      * NOTE / XXX: see above.
      */
-    _dont_optimise_away_slp_eval_frame_functions = 4;
+    slp_dont_optimise_away_slp_eval_frame_functions = 4;
     r = slp_eval_frame_value(f, throwflag, retval);
     return r;
 }

Stackless/core/cframeobject.c

@@ -319,7 +319,7 @@ PyTypeObject PyCFrame_Type = {
     PyObject_Del,                      /* tp_free */
 };
 
-int init_cframetype(void)
+int slp_init_cframetype(void)
 {
     if (PyType_Ready(&PyCFrame_Type))
         return -1;

Stackless/core/cframeobject.h

@@ -1,2 +1,2 @@
 
-int init_cframetype(void);
+int slp_init_cframetype(void);

Stackless/core/slp_transfer.c

@@ -86,7 +86,7 @@ extern int slp_switch(void);
 #endif
 
 /* a write only variable used to prevent overly optimisation */
-intptr_t *_dont_optimise_away_goobledigoobs;
+intptr_t *slp_dont_optimise_away_goobledigoobs;
 static int
 climb_stack_and_transfer(PyCStackObject **cstprev, PyCStackObject *cst,
                          PyTaskletObject *prev)
@@ -109,7 +109,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 */
-        _dont_optimise_away_goobledigoobs = goobledigoobs;
+        slp_dont_optimise_away_goobledigoobs = goobledigoobs;
     }
     return slp_transfer(cstprev, cst, prev);
 }

Stackless/module/channelobject.c

@@ -960,7 +960,7 @@ _channel_send_sequence(PyChannelObject *self, PyObject *v)
  */
 
 PyObject *
-channel_seq_callback(PyFrameObject *_f, int exc, PyObject *retval)
+slp_channel_seq_callback(PyFrameObject *_f, int exc, PyObject *retval)
 {
     PyThreadState *ts = PyThreadState_GET();
     PyCFrameObject *f = (PyCFrameObject *) _f;
@@ -1046,7 +1046,7 @@ channel_send_sequence(PyChannelObject *self, PyObject *v)
     if (it == NULL)
         return NULL;
 
-    f = slp_cframe_new(channel_seq_callback, 1);
+    f = slp_cframe_new(slp_channel_seq_callback, 1);
     if (f == NULL)
         goto error;
 

Stackless/module/channelobject.h

@@ -1,3 +1,3 @@
 
-PyObject * channel_seq_callback(struct _frame *f,  int throwflag,
+PyObject * slp_channel_seq_callback(struct _frame *f,  int throwflag,
 					     PyObject *retval);

Stackless/module/scheduling.c

@@ -355,7 +355,7 @@ typedef struct {
 /* not a valid ptr and not a common integer */
 #define SAVED_TSTATE_MAGIC1 (((intptr_t)transfer_with_tracing)+1)
 #define SAVED_TSTATE_MAGIC2 (-1*((intptr_t)transfer_with_tracing))
-saved_tstat_with_magic_t * _dont_optimise_away_saved_tstat_with_magic;
+saved_tstat_with_magic_t * slp_dont_optimise_away_saved_tstat_with_magic;
 
 static int
 transfer_with_tracing(PyCStackObject **cstprev, PyCStackObject *cst, PyTaskletObject *prev)
@@ -370,7 +370,7 @@ transfer_with_tracing(PyCStackObject **cstprev, PyCStackObject *cst, PyTaskletOb
     /* prevent overly compiler optimisation.
     We store the address of sm into a global variable.
     This way the optimizer can't change the layout of the structure. */
-    _dont_optimise_away_saved_tstat_with_magic = &sm;
+    slp_dont_optimise_away_saved_tstat_with_magic = &sm;
 
     sm.s.tracing = ts->tracing;
     sm.s.c_profilefunc = ts->c_profilefunc;

Stackless/module/stacklessmodule.c

@@ -1702,7 +1702,7 @@ PyInit__stackless(void)
     };
 
     if (0
-        || init_cframetype()
+        || slp_init_cframetype()
         || PyType_Ready(&PyChannel_Type)
         || PyType_Ready(&PyAtomic_Type)
         )
@@ -1733,7 +1733,7 @@ PyInit__stackless(void)
     Py_DECREF(tmp);
 
     /* add the prickelpit submodule */
-    tmp = init_prickelpit();
+    tmp = slp_init_prickelpit();
     if (tmp == NULL)
         goto fail;
     INSERT("_wrap", tmp);

Stackless/pickling/prickelpit.c

@@ -840,7 +840,7 @@ DEF_INVALID_EXEC(eval_frame_noval)
 DEF_INVALID_EXEC(eval_frame_iter)
 DEF_INVALID_EXEC(eval_frame_setup_with)
 DEF_INVALID_EXEC(eval_frame_with_cleanup)
-DEF_INVALID_EXEC(channel_seq_callback)
+DEF_INVALID_EXEC(slp_channel_seq_callback)
 DEF_INVALID_EXEC(slp_restore_tracing)
 DEF_INVALID_EXEC(slp_tp_init_callback)
 
@@ -1205,7 +1205,7 @@ static int init_frametype(PyObject * mod)
         || slp_register_execute(&PyFrame_Type, "eval_frame_with_cleanup",
                              slp_eval_frame_with_cleanup, REF_INVALID_EXEC(eval_frame_with_cleanup))
         || slp_register_execute(&PyCFrame_Type, "channel_seq_callback",
-                             channel_seq_callback, REF_INVALID_EXEC(channel_seq_callback))
+                             slp_channel_seq_callback, REF_INVALID_EXEC(slp_channel_seq_callback))
         || slp_register_execute(&PyCFrame_Type, "slp_restore_tracing",
                              slp_restore_tracing, REF_INVALID_EXEC(slp_restore_tracing))
         || slp_register_execute(&PyCFrame_Type, "slp_tp_init_callback",
@@ -1986,7 +1986,7 @@ static struct PyModuleDef _wrapmodule = {
 };
 
 PyObject*
-init_prickelpit(void)
+slp_init_prickelpit(void)
 {
     PyObject *tmp;
 

Stackless/pickling/prickelpit.h

@@ -51,7 +51,7 @@ extern char slp_pickle_moduledict__doc__[];
 
 /* initialization */
 
-PyObject *init_prickelpit(void);
+PyObject *slp_init_prickelpit(void);
 
 #ifdef __cplusplus
 }