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.40 by root, Tue Nov 27 01:41:41 2001 UTC vs.
Revision 1.50 by pcg, Sun Nov 30 16:59:15 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
… …
16# undef HAVE_MMAP 39# undef HAVE_MMAP
17# endif 40# endif
18# endif 41# endif
19#endif 42#endif
20 43
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
25 46
26/* The next macro should declare a variable stacklevel that contains and approximation 47/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
… …
47 void *sptr; 68 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 70} coro_stack;
50 71
51struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
52 /* the optional C context */ 76 /* the optional C context */
53 coro_stack *stack; 77 coro_stack *stack;
54 void *cursp; 78 void *cursp;
55 int gencnt; 79 int gencnt;
56 80
… …
68 AV *curstack; 92 AV *curstack;
69 AV *mainstack; 93 AV *mainstack;
70 SV **stack_sp; 94 SV **stack_sp;
71 OP *op; 95 OP *op;
72 SV **curpad; 96 SV **curpad;
97 AV *comppad;
73 SV **stack_base; 98 SV **stack_base;
74 SV **stack_max; 99 SV **stack_max;
75 SV **tmps_stack; 100 SV **tmps_stack;
76 I32 tmps_floor; 101 I32 tmps_floor;
77 I32 tmps_ix; 102 I32 tmps_ix;
… …
87 I32 savestack_max; 112 I32 savestack_max;
88 OP **retstack; 113 OP **retstack;
89 I32 retstack_ix; 114 I32 retstack_ix;
90 I32 retstack_max; 115 I32 retstack_max;
91 COP *curcop; 116 COP *curcop;
92 PMOP *curpm;
93 JMPENV *top_env; 117 JMPENV *top_env;
94 118
95 /* data associated with this coroutine (initial args) */ 119 /* data associated with this coroutine (initial args) */
96 AV *args; 120 AV *args;
97}; 121};
… …
158 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
159 else if (*name == '%') 183 else if (*name == '%')
160 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
161 else 185 else
162 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
164 SvPADMY_on (sv); 190 SvPADMY_on (sv);
165 npad[ix] = sv; 191 npad[ix] = sv;
166 } 192 }
167 } 193 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
198#endif 224#endif
199 225
200 return newpadlist; 226 return newpadlist;
201} 227}
202 228
203#ifdef MAY_FLUSH
204STATIC void 229STATIC void
205free_padlist (AV *padlist) 230free_padlist (AV *padlist)
206{ 231{
207 /* may be during global destruction */ 232 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
209 { 234 {
210 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
211 while (i >= 0) 236 while (i >= 0)
212 { 237 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
217 } 247 }
218 248
219 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
220 } 250 }
221} 251}
222#endif 252
253STATIC int
254coro_cv_free (SV *sv, MAGIC *mg)
255{
256 AV *padlist;
257 AV *av = (AV *)mg->mg_obj;
258
259 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist);
262}
263
264#define PERL_MAGIC_coro PERL_MAGIC_ext
265
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
223 267
224/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
225STATIC void 269STATIC void
226get_padlist (CV *cv) 270get_padlist (CV *cv)
227{ 271{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 273
230 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 276 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
234} 278}
235 279
236STATIC void 280STATIC void
237put_padlist (CV *cv) 281put_padlist (CV *cv)
238{ 282{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 284
241 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
242 { 286 {
243 SvREFCNT_dec (*he); 287 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
288 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
289 mg->mg_virtual = &vtbl_coro;
244 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
245 } 291 }
246 292
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 294}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 295
276#define SB do { 296#define SB do {
277#define SE } while (0) 297#define SE } while (0)
278 298
279#define LOAD(state) load_state(aTHX_ (state)); 299#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 301
282#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 302#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
283 303
284static void 304static void
285load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
286{ 306{
287 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
291 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
292 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
293 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
294 PL_op = c->op; 314 PL_op = c->op;
295 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
296 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
297 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
298 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
299 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
300 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
… …
388 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
389 410
390 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
391 } 412 }
392 } 413 }
414#ifdef CXt_FORMAT
393 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
394 { 416 {
395 /* I never used formats, so how should I know how these are implemented? */ 417 /* I never used formats, so how should I know how these are implemented? */
396 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
397 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 419 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
398 } 420 }
421#endif
399 } 422 }
400 423
401 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
402 break; 425 break;
403 426
… …
420 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
421 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
422 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
423 c->op = PL_op; 446 c->op = PL_op;
424 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
425 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
426 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
427 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
428 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
429 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
… …
469 493
470 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
471 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
472 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
473 497
498#ifdef SET_MARK_OFFSET
474 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
475 501
476 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
477 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
478 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
479 505
… …
486 PL_retstack_max = 8; 512 PL_retstack_max = 8;
487} 513}
488 514
489/* 515/*
490 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
491 * still there is a memleak of 128 bytes...
492 */ 517 */
493STATIC void 518STATIC void
494destroy_stacks(pTHX) 519destroy_stacks(pTHX)
495{ 520{
496 if (!IN_DESTRUCT) 521 if (!IN_DESTRUCT)
… …
577 { 602 {
578#ifdef HAVE_MMAP 603#ifdef HAVE_MMAP
579 if (stack->ssize > 0 && stack->sptr) 604 if (stack->ssize > 0 && stack->sptr)
580 munmap (stack->sptr, stack->ssize); 605 munmap (stack->sptr, stack->ssize);
581 else 606 else
582#else 607#endif
583 Safefree (stack->sptr); 608 Safefree (stack->sptr);
584#endif 609
585 Safefree (stack); 610 Safefree (stack);
586 } 611 }
587 else if (ctx->gencnt == stack->gencnt) 612 else if (ctx->gencnt == stack->gencnt)
588 --stack->usecnt; 613 --stack->usecnt;
589 } 614 }
… …
598 dSP; 623 dSP;
599 Coro__State ctx = (Coro__State)arg; 624 Coro__State ctx = (Coro__State)arg;
600 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE);
601 626
602 coro_init_stacks (aTHX); 627 coro_init_stacks (aTHX);
603 PL_curpm = 0; /* segfault on first access */
604 /*PL_curcop = 0;*/ 628 /*PL_curcop = 0;*/
605 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 629 /*PL_in_eval = PL_in_eval;*/ /* inherit */
606 SvREFCNT_dec (GvAV (PL_defgv)); 630 SvREFCNT_dec (GvAV (PL_defgv));
607 GvAV (PL_defgv) = ctx->args; 631 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
608 632
609 SPAGAIN; 633 SPAGAIN;
610 634
611 if (ctx->stack) 635 if (ctx->stack)
612 { 636 {
… …
639 * that doesn't matter, though, since it is only 663 * that doesn't matter, though, since it is only
640 * pp_nextstate and we never return... 664 * pp_nextstate and we never return...
641 * ah yes, and I don't care anyways ;) 665 * ah yes, and I don't care anyways ;)
642 */ 666 */
643 PUTBACK; 667 PUTBACK;
644 PL_op = pp_entersub(); 668 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
645 SPAGAIN; 669 SPAGAIN;
646 670
647 ENTER; /* necessary e.g. for dounwind */ 671 ENTER; /* necessary e.g. for dounwind */
648 } 672 }
649} 673}
… …
655 * this is a _very_ stripped down perl interpreter ;) 679 * this is a _very_ stripped down perl interpreter ;)
656 */ 680 */
657 Coro__State ctx = (Coro__State)arg; 681 Coro__State ctx = (Coro__State)arg;
658 JMPENV coro_start_env; 682 JMPENV coro_start_env;
659 683
660 /* same as JMPENV_BOOTSTRAP */
661 Zero(&coro_start_env, 1, JMPENV);
662 coro_start_env.je_ret = -1;
663 coro_start_env.je_mustcatch = TRUE;
664 PL_top_env = &coro_start_env; 684 PL_top_env = &ctx->start_env;
665 685
666 ctx->cursp = 0; 686 ctx->cursp = 0;
667 PL_op = PL_op->op_next; 687 PL_op = PL_op->op_next;
668 CALLRUNOPS(aTHX); 688 CALLRUNOPS(aTHX);
669 689
… …
727 if (!prev->stack) 747 if (!prev->stack)
728 allocate_stack (prev, 0); 748 allocate_stack (prev, 0);
729 749
730 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
731 { 751 {
752 PL_top_env = &next->start_env;
753
732 setup_coro (next); 754 setup_coro (next);
733 755
734 prev->stack->refcnt++; 756 prev->stack->refcnt++;
735 prev->stack->usecnt++; 757 prev->stack->usecnt++;
736 next->stack = prev->stack; 758 next->stack = prev->stack;
737 next->gencnt = prev->gencnt; 759 next->gencnt = prev->gencnt;
738 } 760 }
739 else 761 else
740 { 762 {
763 assert (!next->stack);
741 allocate_stack (next, 1); 764 allocate_stack (next, 1);
742 coro_create (&(next->stack->cctx), 765 coro_create (&(next->stack->cctx),
743 setup_coro, (void *)next, 766 setup_coro, (void *)next,
744 next->stack->sptr, labs (next->stack->ssize)); 767 next->stack->sptr, labs (next->stack->ssize));
745 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
750 setup_coro (next); 773 setup_coro (next);
751 } 774 }
752 775
753 /* 776 /*
754 * xnext is now either prev or next, depending on wether 777 * xnext is now either prev or next, depending on wether
755 * we switched the c stack or not. that's why i use a global 778 * we switched the c stack or not. that's why I use a global
756 * variable, that should become thread-specific at one point. 779 * variable, that should become thread-specific at one point.
757 */ 780 */
758 xnext->cursp = stacklevel; 781 xnext->cursp = stacklevel;
759 } 782 }
760 783
… …
902 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 925 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
903 926
904 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
905 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
906 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
907 newCONSTSUB (coro_state_stash, "SAVE_CURPM", newSViv (TRANSFER_SAVE_CURPM));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909 931
910 if (!padlist_cache) 932 if (!padlist_cache)
911 padlist_cache = newHV (); 933 padlist_cache = newHV ();
912 934
… …
924 Coro__State coro; 946 Coro__State coro;
925 947
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 948 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 949 croak ("Coro::State::_newprocess expects an arrayref");
928 950
929 New (0, coro, 1, struct coro); 951 Newz (0, coro, 1, struct coro);
930 952
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 953 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 954 coro->mainstack = 0; /* actual work is done inside transfer */
933 coro->stack = 0; 955 coro->stack = 0;
956
957 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV);
960 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE;
934 962
935 RETVAL = coro; 963 RETVAL = coro;
936 OUTPUT: 964 OUTPUT:
937 RETVAL 965 RETVAL
938 966
… …
970 998
971 coro->mainstack = 0; 999 coro->mainstack = 0;
972 } 1000 }
973 1001
974 deallocate_stack (coro); 1002 deallocate_stack (coro);
975 1003 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1004 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1005
985void 1006void
986_exit(code) 1007_exit(code)
987 int code 1008 int code
988 PROTOTYPE: $ 1009 PROTOTYPE: $
… …
1007 SV *sv; 1028 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1029 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1030 struct coro *prev, *next;
1010 1031
1011 if (!returnstk) 1032 if (!returnstk)
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1013 1034
1014 /* set up @_ -- ugly */ 1035 /* set up @_ -- ugly */
1015 av_clear (defav); 1036 av_clear (defav);
1016 av_fill (defav, items - 1); 1037 av_fill (defav, items - 1);
1017 while (items--) 1038 while (items--)
… …
1060 sv_setiv(sv, (IV)&coroapi); 1081 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1082 SvREADONLY_on(sv);
1062 } 1083 }
1063} 1084}
1064 1085
1086#if !PERL_MICRO
1087
1065void 1088void
1066ready(self) 1089ready(self)
1067 SV * self 1090 SV * self
1068 PROTOTYPE: $ 1091 PROTOTYPE: $
1069 CODE: 1092 CODE:
1070 api_ready (self); 1093 api_ready (self);
1094
1095#endif
1071 1096
1072int 1097int
1073nready(...) 1098nready(...)
1074 PROTOTYPE: 1099 PROTOTYPE:
1075 CODE: 1100 CODE:

Diff Legend

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