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.44 by root, Sat Mar 22 18:50:32 2003 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
… …
389 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
390 416
391 get_padlist (cv); /* this is a monster */ 417 get_padlist (cv); /* this is a monster */
392 } 418 }
393 } 419 }
420#ifdef CXt_FORMAT
394 else if (CxTYPE(cx) == CXt_FORMAT) 421 else if (CxTYPE(cx) == CXt_FORMAT)
395 { 422 {
396 /* 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? */
397 /* my bold guess is as a simple, plain sub... */ 424 /* my bold guess is as a simple, plain sub... */
398 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");
399 } 426 }
427#endif
400 } 428 }
401 429
402 if (top_si->si_type == PERLSI_MAIN) 430 if (top_si->si_type == PERLSI_MAIN)
403 break; 431 break;
404 432
… …
471 499
472 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
475 503
504#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
477 507
478 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
481 511
… …
656 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
657 */ 687 */
658 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env; 689 JMPENV coro_start_env;
660 690
661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env; 691 PL_top_env = &ctx->start_env;
666 692
667 ctx->cursp = 0; 693 ctx->cursp = 0;
668 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
669 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
670 696
… …
728 if (!prev->stack) 754 if (!prev->stack)
729 allocate_stack (prev, 0); 755 allocate_stack (prev, 0);
730 756
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 757 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 758 {
759 PL_top_env = &next->start_env;
760
733 setup_coro (next); 761 setup_coro (next);
734 762
735 prev->stack->refcnt++; 763 prev->stack->refcnt++;
736 prev->stack->usecnt++; 764 prev->stack->usecnt++;
737 next->stack = prev->stack; 765 next->stack = prev->stack;
… …
930 958
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 959 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 960 coro->mainstack = 0; /* actual work is done inside transfer */
933 coro->stack = 0; 961 coro->stack = 0;
934 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
935 RETVAL = coro; 969 RETVAL = coro;
936 OUTPUT: 970 OUTPUT:
937 RETVAL 971 RETVAL
938 972
939void 973void
… …
1007 SV *sv; 1041 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1043 struct coro *prev, *next;
1010 1044
1011 if (!returnstk) 1045 if (!returnstk)
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1013 1047
1014 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
1015 av_clear (defav); 1049 av_clear (defav);
1016 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
1017 while (items--) 1051 while (items--)

Diff Legend

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