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.30 by root, Sat Aug 25 22:19:05 2001 UTC vs.
Revision 1.54 by pcg, Sat Mar 13 06:45:04 2004 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 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
27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
9#ifdef HAVE_MMAP 32#ifdef HAVE_MMAP
10# include <unistd.h> 33# include <unistd.h>
11# include <sys/mman.h> 34# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 35# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
15# else 38# else
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
28 * and should be unique. */ 49 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 50#define dSTACKLEVEL void *stacklevel = &stacklevel
51
52#define IN_DESTRUCT (PL_main_cv == Nullcv)
30 53
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
32 55
33#include "CoroAPI.h" 56#include "CoroAPI.h"
34 57
… …
45 void *sptr; 68 void *sptr;
46 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
47} coro_stack; 70} coro_stack;
48 71
49struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
50 /* the optional C context */ 76 /* the optional C context */
51 coro_stack *stack; 77 coro_stack *stack;
52 void *cursp; 78 void *cursp;
53 int gencnt; 79 int gencnt;
54 80
… …
66 AV *curstack; 92 AV *curstack;
67 AV *mainstack; 93 AV *mainstack;
68 SV **stack_sp; 94 SV **stack_sp;
69 OP *op; 95 OP *op;
70 SV **curpad; 96 SV **curpad;
97 AV *comppad;
71 SV **stack_base; 98 SV **stack_base;
72 SV **stack_max; 99 SV **stack_max;
73 SV **tmps_stack; 100 SV **tmps_stack;
74 I32 tmps_floor; 101 I32 tmps_floor;
75 I32 tmps_ix; 102 I32 tmps_ix;
… …
99static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
100static HV *coro_state_stash; 127static HV *coro_state_stash;
101static SV *ucoro_state_sv; 128static SV *ucoro_state_sv;
102static U32 ucoro_state_hash; 129static U32 ucoro_state_hash;
103static HV *padlist_cache; 130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
104 132
105/* mostly copied from op.c:cv_clone2 */ 133/* mostly copied from op.c:cv_clone2 */
106STATIC AV * 134STATIC AV *
107clone_padlist (AV *protopadlist) 135clone_padlist (AV *protopadlist)
108{ 136{
… …
154 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
155 else if (*name == '%') 183 else if (*name == '%')
156 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
157 else 185 else
158 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
159 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
160 SvPADMY_on (sv); 190 SvPADMY_on (sv);
161 npad[ix] = sv; 191 npad[ix] = sv;
162 } 192 }
163 } 193 }
164 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
194#endif 224#endif
195 225
196 return newpadlist; 226 return newpadlist;
197} 227}
198 228
199#ifdef MAY_FLUSH
200STATIC void 229STATIC void
201free_padlist (AV *padlist) 230free_padlist (AV *padlist)
202{ 231{
203 /* may be during global destruction */ 232 /* may be during global destruction */
204 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
205 { 234 {
206 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
207 while (i >= 0) 236 while (i >= 0)
208 { 237 {
209 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
210 SV *sv = svp ? *svp : Nullsv;
211 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
212 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
213 } 247 }
214 248
215 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
216 } 250 }
217} 251}
218#endif 252
253STATIC int
254coro_cv_free (pTHX_ 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};
219 267
220/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
221STATIC void 269STATIC void
222get_padlist (CV *cv) 270get_padlist (CV *cv)
223{ 271{
224 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
225 273
226 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
227 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
228 else 276 else
229 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
230} 278}
231 279
232STATIC void 280STATIC void
233put_padlist (CV *cv) 281put_padlist (CV *cv)
234{ 282{
235 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
236 284
237 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
238 { 286 {
239 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;
240 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
241 } 291 }
242 292
243 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
244} 294}
245
246#ifdef MAY_FLUSH
247STATIC void
248flush_padlist_cache ()
249{
250 HV *hv = padlist_cache;
251 padlist_cache = newHV ();
252
253 if (hv_iterinit (hv))
254 {
255 HE *he;
256 AV *padlist;
257
258 while (!!(he = hv_iternext (hv)))
259 {
260 AV *av = (AV *)HeVAL(he);
261
262 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist);
265 }
266 }
267
268 SvREFCNT_dec (hv);
269}
270#endif
271 295
272#define SB do { 296#define SB do {
273#define SE } while (0) 297#define SE } while (0)
274 298
275#define LOAD(state) load_state(aTHX_ (state)); 299#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 301
278#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
279 303
280static void 304static void
281load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
282{ 306{
283 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
287 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 314 PL_op = c->op;
291 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
… …
384 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
385 410
386 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
387 } 412 }
388 } 413 }
414#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 416 {
391 /* 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? */
392 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
393 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");
394 } 420 }
421#endif
395 } 422 }
396 423
397 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
398 break; 425 break;
399 426
… …
416 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
417 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
418 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
419 c->op = PL_op; 446 c->op = PL_op;
420 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
421 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
422 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
423 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
424 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
425 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
… …
441} 469}
442 470
443/* 471/*
444 * allocate various perl stacks. This is an exact copy 472 * allocate various perl stacks. This is an exact copy
445 * of perl.c:init_stacks, except that it uses less memory 473 * of perl.c:init_stacks, except that it uses less memory
446 * on the assumption that coroutines do not usually need 474 * on the (sometimes correct) assumption that coroutines do
447 * a lot of stackspace. 475 * not usually need a lot of stackspace.
448 */ 476 */
449STATIC void 477STATIC void
450coro_init_stacks (pTHX) 478coro_init_stacks (pTHX)
451{ 479{
452 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
465 493
466 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
467 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
468 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
469 497
498#ifdef SET_MARK_OFFSET
470 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
471 501
472 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
473 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
474 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
475 505
… …
482 PL_retstack_max = 8; 512 PL_retstack_max = 8;
483} 513}
484 514
485/* 515/*
486 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
487 * still there is a memleak of 128 bytes...
488 */ 517 */
489STATIC void 518STATIC void
490destroy_stacks(pTHX) 519destroy_stacks(pTHX)
491{ 520{
521 if (!IN_DESTRUCT)
522 {
492 /* is this ugly, I ask? */ 523 /* is this ugly, I ask? */
493 while (PL_scopestack_ix) 524 LEAVE_SCOPE (0);
494 LEAVE;
495 525
496 /* sure it is, but more important: is it correct?? :/ */ 526 /* sure it is, but more important: is it correct?? :/ */
497 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
498 FREETMPS; 527 FREETMPS;
528 }
499 529
500 while (PL_curstackinfo->si_next) 530 while (PL_curstackinfo->si_next)
501 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
502 532
503 while (PL_curstackinfo) 533 while (PL_curstackinfo)
… …
508 dSP; 538 dSP;
509 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 539 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
510 PUTBACK; /* possibly superfluous */ 540 PUTBACK; /* possibly superfluous */
511 } 541 }
512 542
513 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 543 if (!IN_DESTRUCT)
544 {
514 dounwind(-1); 545 dounwind(-1);
515
516 SvREFCNT_dec(PL_curstackinfo->si_stack); 546 SvREFCNT_dec(PL_curstackinfo->si_stack);
547 }
548
517 Safefree(PL_curstackinfo->si_cxstack); 549 Safefree(PL_curstackinfo->si_cxstack);
518 Safefree(PL_curstackinfo); 550 Safefree(PL_curstackinfo);
519 PL_curstackinfo = p; 551 PL_curstackinfo = p;
520 } 552 }
521 553
… …
536 stack->refcnt = 1; 568 stack->refcnt = 1;
537 stack->usecnt = 1; 569 stack->usecnt = 1;
538 stack->gencnt = ctx->gencnt = 0; 570 stack->gencnt = ctx->gencnt = 0;
539 if (alloc) 571 if (alloc)
540 { 572 {
541#ifdef HAVE_MMAP 573#if HAVE_MMAP
542 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 574 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
543 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 575 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
544 if (stack->sptr == (void *)-1) 576 if (stack->sptr == (void *)-1)
545#endif 577#endif
546 { 578 {
547 /*FIXME*//*D*//* reasonable stack size! */ 579 /*FIXME*//*D*//* reasonable stack size! */
548 stack->ssize = -4096 * sizeof (long); 580 stack->ssize = - (8192 * sizeof (long));
549 New (0, stack->sptr, 4096, long); 581 New (0, stack->sptr, 8192, long);
550 } 582 }
551 } 583 }
552 else 584 else
553 stack->sptr = 0; 585 stack->sptr = 0;
554 586
… …
568 { 600 {
569#ifdef HAVE_MMAP 601#ifdef HAVE_MMAP
570 if (stack->ssize > 0 && stack->sptr) 602 if (stack->ssize > 0 && stack->sptr)
571 munmap (stack->sptr, stack->ssize); 603 munmap (stack->sptr, stack->ssize);
572 else 604 else
573#else 605#endif
574 Safefree (stack->sptr); 606 Safefree (stack->sptr);
575#endif 607
576 Safefree (stack); 608 Safefree (stack);
577 } 609 }
578 else if (ctx->gencnt == stack->gencnt) 610 else if (ctx->gencnt == stack->gencnt)
579 --stack->usecnt; 611 --stack->usecnt;
580 } 612 }
… …
586 /* 618 /*
587 * emulate part of the perl startup here. 619 * emulate part of the perl startup here.
588 */ 620 */
589 dSP; 621 dSP;
590 Coro__State ctx = (Coro__State)arg; 622 Coro__State ctx = (Coro__State)arg;
591 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 623 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
592 624
593 coro_init_stacks (aTHX); 625 coro_init_stacks (aTHX);
594 /*PL_curcop = 0;*/ 626 /*PL_curcop = 0;*/
595 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 627 /*PL_in_eval = PL_in_eval;*/ /* inherit */
596 SvREFCNT_dec (GvAV (PL_defgv)); 628 SvREFCNT_dec (GvAV (PL_defgv));
597 GvAV (PL_defgv) = ctx->args; 629 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
598 630
599 SPAGAIN; 631 SPAGAIN;
600 632
601 if (ctx->stack) 633 if (ctx->stack)
602 { 634 {
… …
629 * that doesn't matter, though, since it is only 661 * that doesn't matter, though, since it is only
630 * pp_nextstate and we never return... 662 * pp_nextstate and we never return...
631 * ah yes, and I don't care anyways ;) 663 * ah yes, and I don't care anyways ;)
632 */ 664 */
633 PUTBACK; 665 PUTBACK;
634 PL_op = pp_entersub(); 666 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 667 SPAGAIN;
636 668
637 ENTER; /* necessary e.g. for dounwind */ 669 ENTER; /* necessary e.g. for dounwind */
638 } 670 }
639} 671}
… …
643{ 675{
644 /* 676 /*
645 * this is a _very_ stripped down perl interpreter ;) 677 * this is a _very_ stripped down perl interpreter ;)
646 */ 678 */
647 Coro__State ctx = (Coro__State)arg; 679 Coro__State ctx = (Coro__State)arg;
680 JMPENV coro_start_env;
648 681
649 /*FIXME*//* must set up top_env here */ 682 PL_top_env = &ctx->start_env;
683
650 ctx->cursp = 0; 684 ctx->cursp = 0;
651 PL_op = PL_op->op_next; 685 PL_op = PL_op->op_next;
652 CALLRUNOPS(aTHX); 686 CALLRUNOPS(aTHX);
653 687
654 abort (); 688 abort ();
… …
711 if (!prev->stack) 745 if (!prev->stack)
712 allocate_stack (prev, 0); 746 allocate_stack (prev, 0);
713 747
714 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 748 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
715 { 749 {
750 PL_top_env = &next->start_env;
751
716 setup_coro (next); 752 setup_coro (next);
717 753
718 prev->stack->refcnt++; 754 prev->stack->refcnt++;
719 prev->stack->usecnt++; 755 prev->stack->usecnt++;
720 next->stack = prev->stack; 756 next->stack = prev->stack;
721 next->gencnt = prev->gencnt; 757 next->gencnt = prev->gencnt;
722 } 758 }
723 else 759 else
724 { 760 {
761 assert (!next->stack);
725 allocate_stack (next, 1); 762 allocate_stack (next, 1);
726 coro_create (&(next->stack->cctx), 763 coro_create (&(next->stack->cctx),
727 setup_coro, (void *)next, 764 setup_coro, (void *)next,
728 next->stack->sptr, labs (next->stack->ssize)); 765 next->stack->sptr, labs (next->stack->ssize));
729 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 766 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
731 } 768 }
732 } 769 }
733 else 770 else
734 setup_coro (next); 771 setup_coro (next);
735 } 772 }
773
774 /*
775 * xnext is now either prev or next, depending on wether
776 * we switched the c stack or not. that's why I use a global
777 * variable, that should become thread-specific at one point.
778 */
779 xnext->cursp = stacklevel;
736 } 780 }
737 781
738 /* 782 if (coro_mortal)
739 * xnext is now either prev or next, depending on wether
740 * we switched the c stack or not. that's why i use a global
741 * variable, that should become thread-specific at one point.
742 */
743 xnext->cursp = stacklevel;
744}
745
746static struct coro *
747sv_to_coro (SV *arg, const char *funcname, const char *varname)
748{
749 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
750 { 783 {
751 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 784 SvREFCNT_dec (coro_mortal);
752 785 coro_mortal = 0;
753 if (!he)
754 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
755
756 arg = HeVAL(he);
757 } 786 }
758 787}
788
789#define SV_CORO(sv,func) \
790 do { \
791 if (SvROK (sv)) \
792 sv = SvRV (sv); \
793 \
794 if (SvTYPE(sv) == SVt_PVHV) \
795 { \
796 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
797 \
798 if (!he) \
799 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
800 \
801 (sv) = SvRV (HeVAL(he)); \
802 } \
803 \
759 /* must also be changed inside Coro::Cont::yield */ 804 /* must also be changed inside Coro::Cont::yield */ \
760 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 805 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
761 return (struct coro *) SvIV((SV*)SvRV(arg));
762
763 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 806 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
764 /*NORETURN*/ 807 \
765} 808 } while(0)
809
810#define SvSTATE(sv) (struct coro *)SvIV (sv)
766 811
767static void 812static void
768api_transfer(pTHX_ SV *prev, SV *next, int flags) 813api_transfer(pTHX_ SV *prev, SV *next, int flags)
769{ 814{
770 transfer(aTHX_ 815 SV_CORO (prev, "Coro::transfer");
771 sv_to_coro (prev, "Coro::transfer", "prev"), 816 SV_CORO (next, "Coro::transfer");
772 sv_to_coro (next, "Coro::transfer", "next"), 817
773 flags); 818 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
774} 819}
775 820
776/** Coro ********************************************************************/ 821/** Coro ********************************************************************/
777 822
778#define PRIO_MAX 3 823#define PRIO_MAX 3
… …
788static int coro_nready; 833static int coro_nready;
789 834
790static void 835static void
791coro_enq (SV *sv) 836coro_enq (SV *sv)
792{ 837{
793 if (SvROK (sv)) 838 if (SvTYPE (sv) == SVt_PVHV)
794 { 839 {
795 SV *hv = SvRV (sv);
796 if (SvTYPE (hv) == SVt_PVHV)
797 {
798 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 840 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
799 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 841 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
800 842
801 prio = prio > PRIO_MAX ? PRIO_MAX 843 prio = prio > PRIO_MAX ? PRIO_MAX
802 : prio < PRIO_MIN ? PRIO_MIN 844 : prio < PRIO_MIN ? PRIO_MIN
803 : prio; 845 : prio;
804 846
805 av_push (coro_ready [prio - PRIO_MIN], sv); 847 av_push (coro_ready [prio - PRIO_MIN], sv);
806 coro_nready++; 848 coro_nready++;
807 849
808 return; 850 return;
809 }
810 } 851 }
811 852
812 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 853 croak ("Coro::ready tried to enqueue something that is not a coroutine");
813} 854}
814 855
… …
832} 873}
833 874
834static void 875static void
835api_ready (SV *coro) 876api_ready (SV *coro)
836{ 877{
878 if (SvROK (coro))
879 coro = SvRV (coro);
880
837 coro_enq (SvREFCNT_inc (coro)); 881 coro_enq (SvREFCNT_inc (coro));
838} 882}
839 883
840static void 884static void
841api_schedule (int cede) 885api_schedule (void)
842{ 886{
843 SV *prev, *next; 887 SV *prev, *next;
844 888
845 prev = GvSV (coro_current); 889 prev = SvRV (GvSV (coro_current));
846
847 if (cede)
848 coro_enq (SvREFCNT_inc (prev));
849
850 next = coro_deq (PRIO_MIN); 890 next = coro_deq (PRIO_MIN);
851 891
852 if (!next) 892 if (!next)
853 next = SvREFCNT_inc (GvSV (coro_idle)); 893 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
854 894
855 GvSV (coro_current) = SvREFCNT_inc (next); 895 /* free this only after the transfer */
856 transfer (aTHX_ 896 coro_mortal = prev;
857 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 897 SV_CORO (prev, "Coro::schedule");
858 sv_to_coro (next, "Coro::schedule", "next coroutine"), 898
899 SvRV (GvSV (coro_current)) = next;
900
901 SV_CORO (next, "Coro::schedule");
902
903 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
859 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 904 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
860 SvREFCNT_dec (next); 905}
861 SvREFCNT_dec (prev); 906
907static void
908api_cede (void)
909{
910 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
911
912 api_schedule ();
862} 913}
863 914
864MODULE = Coro::State PACKAGE = Coro::State 915MODULE = Coro::State PACKAGE = Coro::State
865 916
866PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
… …
893 Coro__State coro; 944 Coro__State coro;
894 945
895 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 946 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
896 croak ("Coro::State::_newprocess expects an arrayref"); 947 croak ("Coro::State::_newprocess expects an arrayref");
897 948
898 New (0, coro, 1, struct coro); 949 Newz (0, coro, 1, struct coro);
899 950
900 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 951 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
901 coro->mainstack = 0; /* actual work is done inside transfer */ 952 coro->mainstack = 0; /* actual work is done inside transfer */
902 coro->stack = 0; 953 coro->stack = 0;
903 954
955 /* same as JMPENV_BOOTSTRAP */
956 /* we might be able to recycle start_env, but safe is safe */
957 //Zero(&coro->start_env, 1, JMPENV);
958 coro->start_env.je_ret = -1;
959 coro->start_env.je_mustcatch = TRUE;
960
904 RETVAL = coro; 961 RETVAL = coro;
905 OUTPUT: 962 OUTPUT:
906 RETVAL 963 RETVAL
907 964
908void 965void
909transfer(prev, next, flags) 966transfer(prev, next, flags)
910 Coro::State_or_hashref prev 967 SV *prev
911 Coro::State_or_hashref next 968 SV *next
912 int flags 969 int flags
913 PROTOTYPE: @ 970 PROTOTYPE: @
914 CODE: 971 CODE:
915 PUTBACK; 972 PUTBACK;
973 SV_CORO (next, "Coro::transfer");
974 SV_CORO (prev, "Coro::transfer");
916 transfer (aTHX_ prev, next, flags); 975 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
917 SPAGAIN; 976 SPAGAIN;
918 977
919void 978void
920DESTROY(coro) 979DESTROY(coro)
921 Coro::State coro 980 Coro::State coro
… …
937 996
938 coro->mainstack = 0; 997 coro->mainstack = 0;
939 } 998 }
940 999
941 deallocate_stack (coro); 1000 deallocate_stack (coro);
942 1001 SvREFCNT_dec (coro->args);
943 Safefree (coro); 1002 Safefree (coro);
944
945void
946flush()
947 CODE:
948#ifdef MAY_FLUSH
949 flush_padlist_cache ();
950#endif
951 1003
952void 1004void
953_exit(code) 1005_exit(code)
954 int code 1006 int code
955 PROTOTYPE: $ 1007 PROTOTYPE: $
956 CODE: 1008 CODE:
957#if defined(__GLIBC__) || _POSIX_C_SOURCE
958 _exit (code); 1009 _exit (code);
959#else
960 signal (SIGTERM, SIG_DFL);
961 raise (SIGTERM);
962 exit (code);
963#endif
964 1010
965MODULE = Coro::State PACKAGE = Coro::Cont 1011MODULE = Coro::State PACKAGE = Coro::Cont
966 1012
967# this is slightly dirty (should expose a c-level api) 1013# this is slightly dirty (should expose a c-level api)
968 1014
… …
974 SV *sv; 1020 SV *sv;
975 AV *defav = GvAV (PL_defgv); 1021 AV *defav = GvAV (PL_defgv);
976 struct coro *prev, *next; 1022 struct coro *prev, *next;
977 1023
978 if (!returnstk) 1024 if (!returnstk)
979 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1025 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
980 1026
981 /* set up @_ -- ugly */ 1027 /* set up @_ -- ugly */
982 av_clear (defav); 1028 av_clear (defav);
983 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
984 while (items--) 1030 while (items--)
… …
1016 1062
1017 { 1063 {
1018 SV *sv = perl_get_sv("Coro::API", 1); 1064 SV *sv = perl_get_sv("Coro::API", 1);
1019 1065
1020 coroapi.schedule = api_schedule; 1066 coroapi.schedule = api_schedule;
1067 coroapi.cede = api_cede;
1021 coroapi.ready = api_ready; 1068 coroapi.ready = api_ready;
1022 coroapi.nready = &coro_nready; 1069 coroapi.nready = &coro_nready;
1023 coroapi.current = coro_current; 1070 coroapi.current = coro_current;
1024 1071
1025 GCoroAPI = &coroapi; 1072 GCoroAPI = &coroapi;
1026 sv_setiv(sv, (IV)&coroapi); 1073 sv_setiv(sv, (IV)&coroapi);
1027 SvREADONLY_on(sv); 1074 SvREADONLY_on(sv);
1028 } 1075 }
1029} 1076}
1030 1077
1078#if !PERL_MICRO
1079
1031void 1080void
1032ready(self) 1081ready(self)
1033 SV * self 1082 SV * self
1083 PROTOTYPE: $
1034 CODE: 1084 CODE:
1035 api_ready (self); 1085 api_ready (self);
1086
1087#endif
1036 1088
1037int 1089int
1038nready(...) 1090nready(...)
1039 PROTOTYPE: 1091 PROTOTYPE:
1040 CODE: 1092 CODE:
… …
1043 RETVAL 1095 RETVAL
1044 1096
1045void 1097void
1046schedule(...) 1098schedule(...)
1047 PROTOTYPE: 1099 PROTOTYPE:
1048 ALIAS:
1049 cede = 1
1050 CODE: 1100 CODE:
1051 api_schedule (ix); 1101 api_schedule ();
1052 1102
1103void
1104cede(...)
1105 PROTOTYPE:
1106 CODE:
1107 api_cede ();
1108

Diff Legend

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