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.192 by root, Fri Oct 5 21:51:40 2007 UTC vs.
Revision 1.198 by root, Sun Oct 7 03:58:37 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
… …
106#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
107 108
108#if __GNUC__ >= 3 109#if __GNUC__ >= 3
109# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
110# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
111#else 113#else
112# define attribute(x) 114# define attribute(x)
113# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
114#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
115 121
116#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
117 123
118#include "CoroAPI.h" 124#include "CoroAPI.h"
119 125
… …
187 CF_READY = 0x0002, /* coroutine is ready */ 193 CF_READY = 0x0002, /* coroutine is ready */
188 CF_NEW = 0x0004, /* has never been switched to */ 194 CF_NEW = 0x0004, /* has never been switched to */
189 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 195 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
190}; 196};
191 197
198/* the structure where most of the perl state is stored, overlaid on the cxstack */
199typedef struct {
200 SV *defsv;
201 AV *defav;
202 SV *errsv;
203 SV *irsgv;
204#define VAR(name,type) type name;
205# include "state.h"
206#undef VAR
207} perl_slots;
208
209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
210
192/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
193struct coro { 212struct coro {
194 /* the c coroutine allocated to this perl coroutine, if any */ 213 /* the c coroutine allocated to this perl coroutine, if any */
195 coro_cctx *cctx; 214 coro_cctx *cctx;
196 215
216 /* process data */
217 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */
219
197 /* data associated with this coroutine (initial args) */ 220 /* data associated with this coroutine (initial args) */
198 AV *args; 221 AV *args;
199 int refcnt; 222 int refcnt;
200 int flags; /* CF_ flags */ 223 int flags; /* CF_ flags */
201 224
202 /* optionally saved, might be zero */
203 AV *defav; /* @_ */
204 SV *defsv; /* $_ */
205 SV *errsv; /* $@ */
206 SV *deffh; /* default filehandle */
207 SV *irssv; /* $/ */
208 SV *irssv_sv; /* real $/ cache */
209
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213
214 /* statistics */ 225 /* statistics */
215 int usecount; /* number of transfers to this coro */ 226 int usecount; /* number of transfers to this coro */
216 227
217 /* coro process data */ 228 /* coro process data */
218 int prio; 229 int prio;
219 //SV *throw; 230 SV *throw;
220 231
221 /* async_pool */ 232 /* async_pool */
222 SV *saved_deffh; 233 SV *saved_deffh;
223 234
224 /* linked list */ 235 /* linked list */
… …
325 MAGIC *mg; 336 MAGIC *mg;
326 337
327 if (SvROK (coro)) 338 if (SvROK (coro))
328 coro = SvRV (coro); 339 coro = SvRV (coro);
329 340
330 if (SvTYPE (coro) != SVt_PVHV) 341 if (expect_false (SvTYPE (coro) != SVt_PVHV))
331 croak ("Coro::State object required"); 342 croak ("Coro::State object required");
332 343
333 stash = SvSTASH (coro); 344 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash) 345 if (expect_false (stash != coro_stash && stash != coro_state_stash))
335 { 346 {
336 /* very slow, but rare, check */ 347 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required"); 349 croak ("Coro::State object required");
339 } 350 }
… …
349get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
350{ 361{
351 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
352 AV *av; 363 AV *av;
353 364
354 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
355 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
356 else 367 else
357 { 368 {
358#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
359 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
… …
371put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
372{ 383{
373 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
374 AV *av; 385 AV *av;
375 386
376 if (!mg) 387 if (expect_false (!mg))
377 { 388 {
378 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
379 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
380 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
381 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
382 } 393 }
383 394
384 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
385 396
386 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
387 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
388 399
389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
390} 401}
391 402
392/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
393 404
394static void 405static void
395load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
396{ 407{
408 perl_slots *slot = c->slot;
409 c->slot = 0;
410
411 PL_mainstack = c->mainstack;
412
413 GvSV (PL_defgv) = slot->defsv;
414 GvAV (PL_defgv) = slot->defav;
415 GvSV (PL_errgv) = slot->errsv;
416 GvSV (irsgv) = slot->irsgv;
417
397#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
398# include "state.h" 419 # include "state.h"
399#undef VAR 420 #undef VAR
400
401 GvSV (PL_defgv) = c->defsv;
402 GvAV (PL_defgv) = c->defav;
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 421
406 { 422 {
407 dSP; 423 dSP;
424
408 CV *cv; 425 CV *cv;
409 426
410 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
412 { 429 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
416 } 433 }
… …
435 452
436 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
438 for (;;) 455 for (;;)
439 { 456 {
440 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
441 { 458 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
443 460
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 462 {
446 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
447 464
448 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
449 { 466 {
450 EXTEND (SP, 3); 467 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
457 } 474 }
458 } 475 }
459 } 476 }
460 477
461 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 479 break;
463 480
464 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
467 } 484 }
468 485
469 PUTBACK; 486 PUTBACK;
470 } 487 }
471 488
489 /* allocate some space on the context stack for our purposes */
490 {
491 /* we manually unroll here, as usually 2 slots is enough */
492 int i;
493 if (SLOT_COUNT >= 1) CXINC;
494 if (SLOT_COUNT >= 2) CXINC;
495 if (SLOT_COUNT >= 3) CXINC;
496 for (i = 3; i < SLOT_COUNT; ++i)
497 CXINC;
498
499 cxstack_ix -= SLOT_COUNT; /* undo allocation */
500 }
501
502 c->mainstack = PL_mainstack;
503
504 {
505 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
506
472 c->defav = GvAV (PL_defgv); 507 slot->defav = GvAV (PL_defgv);
473 c->defsv = DEFSV; 508 slot->defsv = DEFSV;
474 c->errsv = ERRSV; 509 slot->errsv = ERRSV;
475 c->irssv_sv = GvSV (irsgv); 510 slot->irsgv = GvSV (irsgv);
476 511
477#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
478# include "state.h" 513 # include "state.h"
479#undef VAR 514 #undef VAR
515 }
480} 516}
481 517
482/* 518/*
483 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
484 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
… …
489# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
490#else 526#else
491static void 527static void
492coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
493{ 529{
494 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
495 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
496 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
497 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
498 534
499 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
500 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
501 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
502 538
503 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
504 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
505 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
506 PL_tmps_max = 64; 542 PL_tmps_max = 32;
507 543
508 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
509 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
510 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
511 547
512#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
513 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
514#endif 550#endif
515 551
516 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
517 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
518 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
519 555
520 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
521 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
522 PL_savestack_max = 64; 558 PL_savestack_max = 24;
523 559
524#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
525 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
526 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
527 PL_retstack_max = 4; 563 PL_retstack_max = 4;
… …
564{ 600{
565 size_t rss = sizeof (*coro); 601 size_t rss = sizeof (*coro);
566 602
567 if (coro->mainstack) 603 if (coro->mainstack)
568 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
569 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
570 { 609 {
610 slot = &tmp_slot;
611
571 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
572 # include "state.h" 613 # include "state.h"
573 #undef VAR 614 #undef VAR
574 } 615 }
616 else
617 slot = coro->slot;
575 618
576 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
577 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
580 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
582 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
583 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
584 626
585#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
586 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
587#endif 629#endif
588 } 630 }
589 631
590 return rss; 632 return rss;
591} 633}
… …
603 PL_runops = RUNOPS_DEFAULT; 645 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 648 PL_comppad = 0;
607 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
608 PL_localizing = 0; 651 PL_localizing = 0;
609 PL_dirty = 0; 652 PL_dirty = 0;
610 PL_restartop = 0; 653 PL_restartop = 0;
654 PL_diehook = 0;
655 PL_warnhook = 0;
611 656
612 GvSV (PL_defgv) = newSV (0); 657 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 658 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 659 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 660 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 661 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 662 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 663
621 { 664 {
622 dSP; 665 dSP;
623 LOGOP myop; 666 LOGOP myop;
624 667
… …
631 PUTBACK; 674 PUTBACK;
632 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 677 SPAGAIN;
635 } 678 }
679
680 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
636} 681}
637 682
638static void 683static void
639coro_destroy (pTHX_ struct coro *coro) 684coro_destroy (pTHX_ struct coro *coro)
640{ 685{
… …
660 SvREFCNT_dec (GvSV (PL_errgv)); 705 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 706 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 707 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 708 SvREFCNT_dec (GvSV (irsgv));
664 709
710 SvREFCNT_dec (PL_diehook);
711 SvREFCNT_dec (PL_warnhook);
712
665 SvREFCNT_dec (coro->saved_deffh); 713 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 714 SvREFCNT_dec (coro->throw);
667 715
668 coro_destroy_stacks (aTHX); 716 coro_destroy_stacks (aTHX);
669} 717}
670 718
671static void 719static void
672free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
673{ 721{
674 if (coro_mortal) 722 if (expect_true (coro_mortal))
675 { 723 {
676 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 725 coro_mortal = 0;
678 } 726 }
679} 727}
… …
708 bot = PL_stack_base + cx->blk_oldsp + 1; 756 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1 757 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1 758 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot; 759 : bot;
712 760
761 av_extend (av, top - bot);
713 while (bot < top) 762 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++)); 763 av_push (av, SvREFCNT_inc (*bot++));
715 764
716 PL_runops = RUNOPS_DEFAULT; 765 PL_runops = RUNOPS_DEFAULT;
717 ENTER; 766 ENTER;
… …
929 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
930 979
931 Safefree (cctx); 980 Safefree (cctx);
932} 981}
933 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
934static coro_cctx * 986static coro_cctx *
935cctx_get (pTHX) 987cctx_get (pTHX)
936{ 988{
937 while (cctx_first) 989 while (expect_true (cctx_first))
938 { 990 {
939 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
940 cctx_first = cctx->next; 992 cctx_first = cctx->next;
941 --cctx_idle; 993 --cctx_idle;
942 994
943 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
944 return cctx; 996 return cctx;
945 997
946 cctx_destroy (cctx); 998 cctx_destroy (cctx);
947 } 999 }
948 1000
… …
951 1003
952static void 1004static void
953cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
954{ 1006{
955 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
956 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
957 { 1009 {
958 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
959 cctx_first = first->next; 1011 cctx_first = first->next;
960 --cctx_idle; 1012 --cctx_idle;
961 1013
… …
967 cctx_first = cctx; 1019 cctx_first = cctx;
968} 1020}
969 1021
970/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
971 1023
972static void NOINLINE 1024static void
973transfer_check (pTHX_ struct coro *prev, struct coro *next) 1025transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{ 1026{
975 if (prev != next) 1027 if (expect_true (prev != next))
976 { 1028 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1029 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
978 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1030 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979 1031
980 if (next->flags & CF_RUNNING) 1032 if (expect_false (next->flags & CF_RUNNING))
981 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1033 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982 1034
983 if (next->flags & CF_DESTROYED) 1035 if (expect_false (next->flags & CF_DESTROYED))
984 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1036 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985 1037
1038 if (
1039#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser)
1041#else
986 if (PL_lex_state != LEX_NOTPARSING) 1042 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif
1044 )
987 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1045 croak ("Coro::State::transfer called while parsing, but this is not supported");
988 } 1046 }
989} 1047}
990 1048
991/* always use the TRANSFER macro */ 1049/* always use the TRANSFER macro */
… …
993transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
994{ 1052{
995 dSTACKLEVEL; 1053 dSTACKLEVEL;
996 1054
997 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
998 if (!next) 1056 if (expect_false (!next))
999 { 1057 {
1000 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1001 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1059 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1002 } 1060 }
1003 else if (prev != next) 1061 else if (expect_true (prev != next))
1004 { 1062 {
1005 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
1006 1064
1007 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
1008 { 1066 {
1009 /* create a new empty context */ 1067 /* create a new empty context */
1010 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
1011 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
1012 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
… …
1015 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
1016 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
1017 1075
1018 LOCK; 1076 LOCK;
1019 1077
1020 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
1021 { 1079 {
1022 /* need to start coroutine */ 1080 /* need to start coroutine */
1023 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
1024 /* first get rid of the old state */ 1082 /* first get rid of the old state */
1025 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
… …
1034 } 1092 }
1035 1093
1036 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
1037 1095
1038 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
1039 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1097 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1040 { 1098 {
1041 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1099 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1042 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1100 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1043 1101
1044 prev->cctx = 0; 1102 prev->cctx = 0;
1045 1103
1104 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1105 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1106 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1107 next->cctx = cctx_get (aTHX);
1108
1046 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
1047 } 1110 }
1048 1111
1049 ++next->usecount; 1112 ++next->usecount;
1050 1113
1051 if (!next->cctx) 1114 if (expect_true (!next->cctx))
1052 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
1053 1116
1054 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
1055 { 1118 {
1056 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
1057 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
1058 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1059 } 1122 }
1060 1123
1061 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
1062 UNLOCK; 1125 UNLOCK;
1126
1127 if (expect_false (prev->throw || next->throw))
1128 {
1129 struct coro *coro = SvSTATE (coro_current);
1130
1131 if (coro->throw)
1132 {
1133 SV *exception = coro->throw;
1134 coro->throw = 0;
1135 sv_setsv (ERRSV, exception);
1136 croak (0);
1137 }
1138 }
1063 } 1139 }
1064} 1140}
1065 1141
1066struct transfer_args 1142struct transfer_args
1067{ 1143{
… …
1102 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
1103 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
1104 1180
1105 coro_destroy (aTHX_ coro); 1181 coro_destroy (aTHX_ coro);
1106 1182
1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
1108 1184
1109 coro->mainstack = 0; 1185 coro->slot = 0;
1110 } 1186 }
1111 1187
1112 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
1113 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
1114 1190
… …
1239 { 1315 {
1240 LOCK; 1316 LOCK;
1241 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1242 1318
1243 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1244 if (!next_sv) 1320 if (expect_false (!next_sv))
1245 { 1321 {
1246 dSP; 1322 dSP;
1247 UNLOCK; 1323 UNLOCK;
1248 1324
1249 ENTER; 1325 ENTER;
… …
1259 } 1335 }
1260 1336
1261 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1262 1338
1263 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1264 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1265 { 1341 {
1266 UNLOCK; 1342 UNLOCK;
1267 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1268 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1269 continue; 1345 continue;
… …
1325 dTHX; 1401 dTHX;
1326 struct transfer_args ta; 1402 struct transfer_args ta;
1327 1403
1328 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1329 1405
1330 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1331 { 1407 {
1332 TRANSFER (ta); 1408 TRANSFER (ta);
1333 return 1; 1409 return 1;
1334 } 1410 }
1335 else 1411 else
… …
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1447 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372 1448
1373 if (coro->flags & CF_RUNNING) 1449 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT; 1450 PL_runops = RUNOPS_DEFAULT;
1375 else 1451 else
1376 coro->runops = RUNOPS_DEFAULT; 1452 coro->slot->runops = RUNOPS_DEFAULT;
1377 } 1453 }
1378} 1454}
1379 1455
1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1381 1457
… …
1429 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1430 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1506 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1431 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1432 1508
1433 av_extend (coro->args, items - 1); 1509 av_extend (coro->args, items - 1);
1434
1435 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1437} 1512}
1438 OUTPUT: 1513 OUTPUT:
1439 RETVAL 1514 RETVAL
… …
1482 } 1557 }
1483 1558
1484 BARRIER; 1559 BARRIER;
1485 TRANSFER (ta); 1560 TRANSFER (ta);
1486 1561
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1488 XSRETURN_YES; 1563 XSRETURN_YES;
1489} 1564}
1490 1565
1491bool 1566bool
1492_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
… …
1542 CODE: 1617 CODE:
1543{ 1618{
1544 if (coro->mainstack) 1619 if (coro->mainstack)
1545 { 1620 {
1546 struct coro temp; 1621 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1622
1549 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1550 { 1624 {
1551 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
… …
1556 dSP; 1630 dSP;
1557 ENTER; 1631 ENTER;
1558 SAVETMPS; 1632 SAVETMPS;
1559 PUSHMARK (SP); 1633 PUSHMARK (SP);
1560 PUTBACK; 1634 PUTBACK;
1635
1561 if (ix) 1636 if (ix)
1562 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1563 else 1638 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1565 SPAGAIN; 1641 SPAGAIN;
1566 FREETMPS; 1642 FREETMPS;
1567 LEAVE; 1643 LEAVE;
1568 PUTBACK; 1644 PUTBACK;
1569 } 1645 }
… …
1628BOOT: 1704BOOT:
1629{ 1705{
1630 int i; 1706 int i;
1631 1707
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1708 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1709 get_sv ("Coro::POOL_RSS" , TRUE); /* silence stupid 5.10 warning */
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1710 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1711 get_sv ("Coro::POOL_SIZE" , TRUE); /* silence stupid 5.10 warning */
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1712 av_async_pool = get_av ("Coro::async_pool", TRUE);
1713 get_av ("Coro::async_pool", TRUE); /* silence stupid 5.10 warning */
1635 1714
1636 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1638 1717
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1719
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1647 1726
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1650 1729
1651 { 1730 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 1731 SV *sv = perl_get_sv ("Coro::API", TRUE);
1732 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 1733
1654 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
… …
1708 CODE: 1788 CODE:
1709 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1710 OUTPUT: 1790 OUTPUT:
1711 RETVAL 1791 RETVAL
1712 1792
1793void
1794throw (Coro::State self, SV *throw = &PL_sv_undef)
1795 PROTOTYPE: $;$
1796 CODE:
1797 SvREFCNT_dec (self->throw);
1798 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1799
1713# for async_pool speedup 1800# for async_pool speedup
1714void 1801void
1715_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1716 CODE: 1803 CODE:
1717{ 1804{
… …
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1809 AV *invoke_av;
1723 int i, len; 1810 int i, len;
1724 1811
1725 if (!invoke) 1812 if (!invoke)
1726 croak ("\3terminate\2\n"); 1813 croak ("\3async_pool terminate\2\n");
1727 1814
1728 SvREFCNT_dec (coro->saved_deffh); 1815 SvREFCNT_dec (coro->saved_deffh);
1729 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1816 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1817
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1757 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->saved_deffh = 0; 1845 coro->saved_deffh = 0;
1759 1846
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1763 1850
1764 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 1854

Diff Legend

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