[Stackless-checkins] CVS: slpdev/src/2.3/dev/Python ceval.c, 1.86, 1.87 pythonrun.c, 1.20, 1.21
Christian Tismer
tismer at centera.de
Mon May 24 03:59:36 CEST 2004
Update of /home/cvs/slpdev/src/2.3/dev/Python
In directory centera.de:/tmp/cvs-serv8807/Python
Modified Files:
ceval.c pythonrun.c
Log Message:
omitted quite a few checkins :-)
Index: ceval.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/ceval.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** ceval.c 3 May 2004 16:54:29 -0000 1.86
--- ceval.c 24 May 2004 01:59:34 -0000 1.87
***************
*** 15,18 ****
--- 15,19 ----
#include "structmember.h"
#include "core/stackless_impl.h"
+ #include "platf/slp_platformselect.h" /* for stack saving */
#ifdef macintosh
***************
*** 718,721 ****
--- 719,726 ----
return NULL;
+ #ifdef STACKLESS
+ if (CSTACK_SAVE_NOW(tstate, f))
+ return slp_eval_frame_newstack(f, retval);
+ #else
#ifdef USE_STACKCHECK
if (tstate->recursion_depth%10 == 0 && PyOS_CheckStack()) {
***************
*** 724,727 ****
--- 729,733 ----
}
#endif
+ #endif /* STACKLESS */
/* push frame */
***************
*** 2662,2666 ****
* instead of repeating code, here.
*/
! if (f->f_execute == PyEval_EvalFrame &&
tstate->recursion_depth < recursion_limit &&
! tstate->use_tracing) {
--- 2668,2672 ----
* instead of repeating code, here.
*/
! if (f && f->f_execute == PyEval_EvalFrame &&
tstate->recursion_depth < recursion_limit &&
! tstate->use_tracing) {
***************
*** 3807,3815 ****
}
#ifdef STACKLESS
- Py_INCREF(Py_None);
- retval = Py_None;
f->f_execute = PyEval_EvalFrame;
! tstate->frame = f;
! return STACKLESS_PACK(retval);
#else
retval = eval_frame(f);
--- 3813,3824 ----
}
#ifdef STACKLESS
f->f_execute = PyEval_EvalFrame;
! if (slp_enable_softswitch) {
! Py_INCREF(Py_None);
! retval = Py_None;
! tstate->frame = f;
! return STACKLESS_PACK(retval);
! }
! return slp_eval_frame(f);
#else
retval = eval_frame(f);
Index: pythonrun.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/pythonrun.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** pythonrun.c 29 Apr 2004 17:58:58 -0000 1.20
--- pythonrun.c 24 May 2004 01:59:34 -0000 1.21
***************
*** 331,335 ****
call_sys_exitfunc();
#ifdef STACKLESS
! PyStackless_kill_tasks_with_stacks();
#endif
initialized = 0;
--- 331,335 ----
call_sys_exitfunc();
#ifdef STACKLESS
! PyStackless_kill_tasks_with_stacks(1);
#endif
initialized = 0;
_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins
More information about the Stackless-checkins
mailing list