ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.41 by root, Tue Nov 27 02:51:03 2001 UTC vs.
Revision 1.46 by pcg, Wed Nov 5 20:02:46 2003 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4
5#include "patchlevel.h"
6
7#if PATCHLEVEL < 6
8# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr
10# endif
11# ifndef call_sv
12# define call_sv perl_call_sv
13# endif
14# ifndef get_sv
15# define get_sv perl_get_sv
16# endif
17# ifndef get_cv
18# define get_cv perl_get_cv
19# endif
20# ifndef IS_PADGV
21# define IS_PADGV(v) 0
22# endif
23# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0
25# endif
26#endif
4 27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
… …
47 void *sptr; 70 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 71 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 72} coro_stack;
50 73
51struct coro { 74struct coro {
75 /* the top-level JMPENV for each coroutine, needed to catch dies. */
76 JMPENV start_env;
77
52 /* the optional C context */ 78 /* the optional C context */
53 coro_stack *stack; 79 coro_stack *stack;
54 void *cursp; 80 void *cursp;
55 int gencnt; 81 int gencnt;
56 82
… …
68 AV *curstack; 94 AV *curstack;
69 AV *mainstack; 95 AV *mainstack;
70 SV **stack_sp; 96 SV **stack_sp;
71 OP *op; 97 OP *op;
72 SV **curpad; 98 SV **curpad;
99 AV *comppad;
73 SV **stack_base; 100 SV **stack_base;
74 SV **stack_max; 101 SV **stack_max;
75 SV **tmps_stack; 102 SV **tmps_stack;
76 I32 tmps_floor; 103 I32 tmps_floor;
77 I32 tmps_ix; 104 I32 tmps_ix;
… …
290 PL_curstack = c->curstack; 317 PL_curstack = c->curstack;
291 PL_mainstack = c->mainstack; 318 PL_mainstack = c->mainstack;
292 PL_stack_sp = c->stack_sp; 319 PL_stack_sp = c->stack_sp;
293 PL_op = c->op; 320 PL_op = c->op;
294 PL_curpad = c->curpad; 321 PL_curpad = c->curpad;
322 PL_comppad = c->comppad;
295 PL_stack_base = c->stack_base; 323 PL_stack_base = c->stack_base;
296 PL_stack_max = c->stack_max; 324 PL_stack_max = c->stack_max;
297 PL_tmps_stack = c->tmps_stack; 325 PL_tmps_stack = c->tmps_stack;
298 PL_tmps_floor = c->tmps_floor; 326 PL_tmps_floor = c->tmps_floor;
299 PL_tmps_ix = c->tmps_ix; 327 PL_tmps_ix = c->tmps_ix;
… …
387 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
388 416
389 get_padlist (cv); /* this is a monster */ 417 get_padlist (cv); /* this is a monster */
390 } 418 }
391 } 419 }
420#ifdef CXt_FORMAT
392 else if (CxTYPE(cx) == CXt_FORMAT) 421 else if (CxTYPE(cx) == CXt_FORMAT)
393 { 422 {
394 /* I never used formats, so how should I know how these are implemented? */ 423 /* I never used formats, so how should I know how these are implemented? */
395 /* my bold guess is as a simple, plain sub... */ 424 /* my bold guess is as a simple, plain sub... */
396 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 425 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
397 } 426 }
427#endif
398 } 428 }
399 429
400 if (top_si->si_type == PERLSI_MAIN) 430 if (top_si->si_type == PERLSI_MAIN)
401 break; 431 break;
402 432
… …
419 c->curstack = PL_curstack; 449 c->curstack = PL_curstack;
420 c->mainstack = PL_mainstack; 450 c->mainstack = PL_mainstack;
421 c->stack_sp = PL_stack_sp; 451 c->stack_sp = PL_stack_sp;
422 c->op = PL_op; 452 c->op = PL_op;
423 c->curpad = PL_curpad; 453 c->curpad = PL_curpad;
454 c->comppad = PL_comppad;
424 c->stack_base = PL_stack_base; 455 c->stack_base = PL_stack_base;
425 c->stack_max = PL_stack_max; 456 c->stack_max = PL_stack_max;
426 c->tmps_stack = PL_tmps_stack; 457 c->tmps_stack = PL_tmps_stack;
427 c->tmps_floor = PL_tmps_floor; 458 c->tmps_floor = PL_tmps_floor;
428 c->tmps_ix = PL_tmps_ix; 459 c->tmps_ix = PL_tmps_ix;
… …
468 499
469 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
470 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
471 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
472 503
504#ifdef SET_MARK_OFFSET
473 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
474 507
475 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
476 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
477 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
478 511
… …
637 * that doesn't matter, though, since it is only 670 * that doesn't matter, though, since it is only
638 * pp_nextstate and we never return... 671 * pp_nextstate and we never return...
639 * ah yes, and I don't care anyways ;) 672 * ah yes, and I don't care anyways ;)
640 */ 673 */
641 PUTBACK; 674 PUTBACK;
642 PL_op = pp_entersub(); 675 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
643 SPAGAIN; 676 SPAGAIN;
644 677
645 ENTER; /* necessary e.g. for dounwind */ 678 ENTER; /* necessary e.g. for dounwind */
646 } 679 }
647} 680}
… …
653 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
654 */ 687 */
655 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
656 JMPENV coro_start_env; 689 JMPENV coro_start_env;
657 690
658 /* same as JMPENV_BOOTSTRAP */
659 Zero(&coro_start_env, 1, JMPENV);
660 coro_start_env.je_ret = -1;
661 coro_start_env.je_mustcatch = TRUE;
662 PL_top_env = &coro_start_env; 691 PL_top_env = &ctx->start_env;
663 692
664 ctx->cursp = 0; 693 ctx->cursp = 0;
665 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
666 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
667 696
… …
725 if (!prev->stack) 754 if (!prev->stack)
726 allocate_stack (prev, 0); 755 allocate_stack (prev, 0);
727 756
728 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 757 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
729 { 758 {
759 PL_top_env = &next->start_env;
760
730 setup_coro (next); 761 setup_coro (next);
731 762
732 prev->stack->refcnt++; 763 prev->stack->refcnt++;
733 prev->stack->usecnt++; 764 prev->stack->usecnt++;
734 next->stack = prev->stack; 765 next->stack = prev->stack;
… …
927 958
928 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 959 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
929 coro->mainstack = 0; /* actual work is done inside transfer */ 960 coro->mainstack = 0; /* actual work is done inside transfer */
930 coro->stack = 0; 961 coro->stack = 0;
931 962
963 /* same as JMPENV_BOOTSTRAP */
964 /* we might be able to recycle start_env, but safe is safe */
965 Zero(&coro->start_env, 1, JMPENV);
966 coro->start_env.je_ret = -1;
967 coro->start_env.je_mustcatch = TRUE;
968
932 RETVAL = coro; 969 RETVAL = coro;
933 OUTPUT: 970 OUTPUT:
934 RETVAL 971 RETVAL
935 972
936void 973void
… …
1004 SV *sv; 1041 SV *sv;
1005 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
1006 struct coro *prev, *next; 1043 struct coro *prev, *next;
1007 1044
1008 if (!returnstk) 1045 if (!returnstk)
1009 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1010 1047
1011 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
1012 av_clear (defav); 1049 av_clear (defav);
1013 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
1014 while (items--) 1051 while (items--)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines