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.169 by root, Thu Sep 27 16:25:10 2007 UTC vs.
Revision 1.195 by root, Sat Oct 6 00:35:41 2007 UTC

… …
75/* 5.8.7 */ 75/* 5.8.7 */
76#ifndef SvRV_set 76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 78#endif
79 79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif
87
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 89# undef CORO_STACKGUARD
82#endif 90#endif
83 91
84#ifndef CORO_STACKGUARD 92#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 106#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 107
100#if __GNUC__ >= 3 108#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 109# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 110# define BARRIER __asm__ __volatile__ ("" : : : "memory")
111# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 112#else
104# define attribute(x) 113# define attribute(x)
105# define BARRIER 114# define BARRIER
115# define expect(expr,value) (expr)
106#endif 116#endif
117
118#define expect_false(expr) expect ((expr) != 0, 0)
119#define expect_true(expr) expect ((expr) != 0, 1)
107 120
108#define NOINLINE attribute ((noinline)) 121#define NOINLINE attribute ((noinline))
109 122
110#include "CoroAPI.h" 123#include "CoroAPI.h"
111 124
… …
131static struct CoroAPI coroapi; 144static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 145static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 146static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 147static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 148static SV *coro_mortal; /* will be freed after next transfer */
149
150static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */
136 152
137/* async_pool helper stuff */ 153/* async_pool helper stuff */
138static SV *sv_pool_rss; 154static SV *sv_pool_rss;
139static SV *sv_pool_size; 155static SV *sv_pool_size;
140static AV *av_async_pool; 156static AV *av_async_pool;
… …
184 coro_cctx *cctx; 200 coro_cctx *cctx;
185 201
186 /* data associated with this coroutine (initial args) */ 202 /* data associated with this coroutine (initial args) */
187 AV *args; 203 AV *args;
188 int refcnt; 204 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 205 int flags; /* CF_ flags */
191 206
192 /* optionally saved, might be zero */ 207 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 208 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 209 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 210 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 211 SV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 212 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 213 SV *irssv_sv; /* real $/ cache */
199 214
200#define VAR(name,type) type name; 215#define VAR(name,type) type name;
201# include "state.h" 216# include "state.h"
202#undef VAR 217#undef VAR
203 218
219 /* statistics */
220 int usecount; /* number of transfers to this coro */
221
204 /* coro process data */ 222 /* coro process data */
205 int prio; 223 int prio;
224 //SV *throw;
225
226 /* async_pool */
227 SV *saved_deffh;
206 228
207 /* linked list */ 229 /* linked list */
208 struct coro *next, *prev; 230 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */ 231 HV *hv; /* the perl hash associated with this coro, if any */
210}; 232};
… …
308 MAGIC *mg; 330 MAGIC *mg;
309 331
310 if (SvROK (coro)) 332 if (SvROK (coro))
311 coro = SvRV (coro); 333 coro = SvRV (coro);
312 334
335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
336 croak ("Coro::State object required");
337
313 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 340 {
316 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
319 } 344 }
… …
329get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
330{ 355{
331 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
332 AV *av; 357 AV *av;
333 358
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 361 else
337 { 362 {
338#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
351put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
352{ 377{
353 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
354 AV *av; 379 AV *av;
355 380
356 if (!mg) 381 if (expect_false (!mg))
357 { 382 {
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
362 } 387 }
363 388
364 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
365 390
366 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
368 393
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 395}
371 396
372/** load & save, init *******************************************************/ 397/** load & save, init *******************************************************/
373
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378 398
379static void 399static void
380load_perl (pTHX_ Coro__State c) 400load_perl (pTHX_ Coro__State c)
381{ 401{
382#define VAR(name,type) PL_ ## name = c->name; 402#define VAR(name,type) PL_ ## name = c->name;
383# include "state.h" 403# include "state.h"
384#undef VAR 404#undef VAR
385 405
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 406 GvSV (PL_defgv) = c->defsv;
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 407 GvAV (PL_defgv) = c->defav;
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 408 GvSV (PL_errgv) = c->errsv;
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 409 GvSV (irsgv) = c->irssv_sv;
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 410
406 { 411 {
407 dSP; 412 dSP;
408 CV *cv; 413 CV *cv;
409 414
410 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
412 { 417 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
416 } 421 }
… …
435 440
436 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
438 for (;;) 443 for (;;)
439 { 444 {
440 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
441 { 446 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
443 448
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 450 {
446 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
447 452
448 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
449 { 454 {
450 EXTEND (SP, 3); 455 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
457 } 462 }
458 } 463 }
459 } 464 }
460 465
461 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 467 break;
463 468
464 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
467 } 472 }
468 473
469 PUTBACK; 474 PUTBACK;
470 } 475 }
471 476
472 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 477 c->defav = GvAV (PL_defgv);
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 478 c->defsv = DEFSV;
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 479 c->errsv = ERRSV;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 480 c->irssv_sv = GvSV (irsgv);
476 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
477 481
478#define VAR(name,type)c->name = PL_ ## name; 482#define VAR(name,type)c->name = PL_ ## name;
479# include "state.h" 483# include "state.h"
480#undef VAR 484#undef VAR
481} 485}
… …
534 * destroy the stacks, the callchain etc... 538 * destroy the stacks, the callchain etc...
535 */ 539 */
536static void 540static void
537coro_destroy_stacks (pTHX) 541coro_destroy_stacks (pTHX)
538{ 542{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 543 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 544 PL_curstackinfo = PL_curstackinfo->si_next;
558 545
559 while (PL_curstackinfo) 546 while (PL_curstackinfo)
560 { 547 {
… …
576 Safefree (PL_retstack); 563 Safefree (PL_retstack);
577#endif 564#endif
578} 565}
579 566
580static size_t 567static size_t
581coro_rss (struct coro *coro) 568coro_rss (pTHX_ struct coro *coro)
582{ 569{
583 size_t rss = sizeof (coro); 570 size_t rss = sizeof (*coro);
584 571
585 if (coro->mainstack) 572 if (coro->mainstack)
586 { 573 {
587 if (coro->flags & CF_RUNNING) 574 if (coro->flags & CF_RUNNING)
588 { 575 {
… …
590 # include "state.h" 577 # include "state.h"
591 #undef VAR 578 #undef VAR
592 } 579 }
593 580
594 rss += sizeof (coro->curstackinfo); 581 rss += sizeof (coro->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 582 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 585 rss += coro->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 587 rss += coro->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 588 rss += coro->savestack_max * sizeof (ANY);
602 589
… …
609} 596}
610 597
611/** coroutine stack handling ************************************************/ 598/** coroutine stack handling ************************************************/
612 599
613static void 600static void
614setup_coro (pTHX_ struct coro *coro) 601coro_setup (pTHX_ struct coro *coro)
615{ 602{
616 /* 603 /*
617 * emulate part of the perl startup here. 604 * emulate part of the perl startup here.
618 */ 605 */
619 coro_init_stacks (aTHX); 606 coro_init_stacks (aTHX);
… …
621 PL_runops = RUNOPS_DEFAULT; 608 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 609 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 610 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 611 PL_comppad = 0;
625 PL_curpm = 0; 612 PL_curpm = 0;
613 PL_curpad = 1;
626 PL_localizing = 0; 614 PL_localizing = 0;
627 PL_dirty = 0; 615 PL_dirty = 0;
628 PL_restartop = 0; 616 PL_restartop = 0;
617
618 GvSV (PL_defgv) = newSV (0);
619 GvAV (PL_defgv) = coro->args; coro->args = 0;
620 GvSV (PL_errgv) = newSV (0);
621 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
622 PL_rs = newSVsv (GvSV (irsgv));
623 PL_defoutgv = SvREFCNT_inc (stdoutgv);
629 624
630 { 625 {
631 dSP; 626 dSP;
632 LOGOP myop; 627 LOGOP myop;
633 628
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 629 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 630 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 631 myop.op_flags = OPf_WANT_VOID;
640 632
641 PUSHMARK (SP); 633 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 634 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 635 PUTBACK;
644 PL_op = (OP *)&myop; 636 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 637 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 638 SPAGAIN;
647 } 639 }
648 640
649 ENTER; /* necessary e.g. for dounwind */ 641 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
642}
643
644static void
645coro_destroy (pTHX_ struct coro *coro)
646{
647 if (!IN_DESTRUCT)
648 {
649 /* restore all saved variables and stuff */
650 LEAVE_SCOPE (0);
651 assert (PL_tmps_floor == -1);
652
653 /* free all temporaries */
654 FREETMPS;
655 assert (PL_tmps_ix == -1);
656
657 /* unwind all extra stacks */
658 POPSTACK_TO (PL_mainstack);
659
660 /* unwind main stack */
661 dounwind (-1);
662 }
663
664 SvREFCNT_dec (GvSV (PL_defgv));
665 SvREFCNT_dec (GvAV (PL_defgv));
666 SvREFCNT_dec (GvSV (PL_errgv));
667 SvREFCNT_dec (PL_defoutgv);
668 SvREFCNT_dec (PL_rs);
669 SvREFCNT_dec (GvSV (irsgv));
670
671 SvREFCNT_dec (coro->saved_deffh);
672 //SvREFCNT_dec (coro->throw);
673
674 coro_destroy_stacks (aTHX);
650} 675}
651 676
652static void 677static void
653free_coro_mortal (pTHX) 678free_coro_mortal (pTHX)
654{ 679{
655 if (coro_mortal) 680 if (expect_true (coro_mortal))
656 { 681 {
657 SvREFCNT_dec (coro_mortal); 682 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 683 coro_mortal = 0;
659 } 684 }
660} 685}
… …
669 694
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 695 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 696 {
672 PERL_ASYNC_CHECK (); 697 PERL_ASYNC_CHECK ();
673 698
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 699 if (cctx->flags & CC_TRACE_ALL)
675 { 700 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 701 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 702 {
703 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
704 SV **bot, **top;
705 AV *av = newAV (); /* return values */
720 SV **cb; 706 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 707 dSP;
708
709 GV *gv = CvGV (cx->blk_sub.cv);
710 SV *fullname = sv_2mortal (newSV (0));
711 if (isGV (gv))
712 gv_efullname3 (fullname, gv, 0);
713
714 bot = PL_stack_base + cx->blk_oldsp + 1;
715 top = cx->blk_gimme == G_ARRAY ? SP + 1
716 : cx->blk_gimme == G_SCALAR ? bot + 1
717 : bot;
718
719 av_extend (av, top - bot);
720 while (bot < top)
721 av_push (av, SvREFCNT_inc (*bot++));
722
723 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 724 ENTER;
724 SAVETMPS; 725 SAVETMPS;
725 EXTEND (SP, 3); 726 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 727 PUSHMARK (SP);
728 PUSHs (&PL_sv_no);
729 PUSHs (fullname);
730 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
731 PUTBACK;
732 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
733 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
734 SPAGAIN;
735 FREETMPS;
736 LEAVE;
737 PL_runops = runops_trace;
738 }
727 739
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 740 if (oldcop != PL_curcop)
741 {
742 oldcop = PL_curcop;
743
744 if (PL_curcop != &PL_compiling)
729 { 745 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 746 SV **cb;
731 747
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 748 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 749 {
750 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
751
752 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
753 {
754 runops_proc_t old_runops = PL_runops;
755 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 756 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 757 SV *fullname = sv_2mortal (newSV (0));
758
736 if (isGV (gv)) 759 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 760 gv_efullname3 (fullname, gv, 0);
738 761
762 PL_runops = RUNOPS_DEFAULT;
763 ENTER;
764 SAVETMPS;
765 EXTEND (SP, 3);
766 PUSHMARK (SP);
767 PUSHs (&PL_sv_yes);
768 PUSHs (fullname);
769 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
770 PUTBACK;
771 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
772 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
773 SPAGAIN;
774 FREETMPS;
775 LEAVE;
776 PL_runops = runops_trace;
777 }
778
779 oldcxix = cxstack_ix;
780 }
781
782 if (cctx->flags & CC_TRACE_LINE)
783 {
784 dSP;
785
786 PL_runops = RUNOPS_DEFAULT;
787 ENTER;
788 SAVETMPS;
789 EXTEND (SP, 3);
790 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 791 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 792 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 793 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 794 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 795 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 796 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 797 SPAGAIN;
798 FREETMPS;
799 LEAVE;
800 PL_runops = runops_trace;
747 } 801 }
748
749 oldcxix = cxstack_ix;
750 } 802 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 803 }
767 } 804 }
768 } 805 }
769 806
770 TAINT_NOT; 807 TAINT_NOT;
… …
899 Safefree (cctx->sptr); 936 Safefree (cctx->sptr);
900 937
901 Safefree (cctx); 938 Safefree (cctx);
902} 939}
903 940
941/* wether this cctx should be destructed */
942#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
943
904static coro_cctx * 944static coro_cctx *
905cctx_get (pTHX) 945cctx_get (pTHX)
906{ 946{
907 while (cctx_first) 947 while (expect_true (cctx_first))
908 { 948 {
909 coro_cctx *cctx = cctx_first; 949 coro_cctx *cctx = cctx_first;
910 cctx_first = cctx->next; 950 cctx_first = cctx->next;
911 --cctx_idle; 951 --cctx_idle;
912 952
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 953 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 954 return cctx;
915 955
916 cctx_destroy (cctx); 956 cctx_destroy (cctx);
917 } 957 }
918 958
… …
921 961
922static void 962static void
923cctx_put (coro_cctx *cctx) 963cctx_put (coro_cctx *cctx)
924{ 964{
925 /* free another cctx if overlimit */ 965 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 966 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
927 { 967 {
928 coro_cctx *first = cctx_first; 968 coro_cctx *first = cctx_first;
929 cctx_first = first->next; 969 cctx_first = first->next;
930 --cctx_idle; 970 --cctx_idle;
931 971
… …
937 cctx_first = cctx; 977 cctx_first = cctx;
938} 978}
939 979
940/** coroutine switching *****************************************************/ 980/** coroutine switching *****************************************************/
941 981
942/* never call directly, always through the coro_state_transfer global variable */ 982static void
983transfer_check (pTHX_ struct coro *prev, struct coro *next)
984{
985 if (expect_true (prev != next))
986 {
987 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
988 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
989
990 if (expect_false (next->flags & CF_RUNNING))
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992
993 if (expect_false (next->flags & CF_DESTROYED))
994 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995
996 if (expect_false (PL_lex_state != LEX_NOTPARSING))
997 croak ("Coro::State::transfer called while parsing, but this is not supported");
998 }
999}
1000
1001/* always use the TRANSFER macro */
943static void NOINLINE 1002static void NOINLINE
944transfer (pTHX_ struct coro *prev, struct coro *next) 1003transfer (pTHX_ struct coro *prev, struct coro *next)
945{ 1004{
946 dSTACKLEVEL; 1005 dSTACKLEVEL;
947 1006
948 /* sometimes transfer is only called to set idle_sp */ 1007 /* sometimes transfer is only called to set idle_sp */
949 if (!next) 1008 if (expect_false (!next))
950 { 1009 {
951 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
952 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1011 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
953 } 1012 }
954 else if (prev != next) 1013 else if (expect_true (prev != next))
955 { 1014 {
956 coro_cctx *prev__cctx; 1015 coro_cctx *prev__cctx;
957 1016
958 if (prev->flags & CF_NEW) 1017 if (expect_false (prev->flags & CF_NEW))
959 { 1018 {
960 /* create a new empty context */ 1019 /* create a new empty context */
961 Newz (0, prev->cctx, 1, coro_cctx); 1020 Newz (0, prev->cctx, 1, coro_cctx);
962 prev->flags &= ~CF_NEW; 1021 prev->flags &= ~CF_NEW;
963 prev->flags |= CF_RUNNING; 1022 prev->flags |= CF_RUNNING;
964 } 1023 }
965 1024
966 /*TODO: must not croak here */
967 if (!prev->flags & CF_RUNNING)
968 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
969
970 if (next->flags & CF_RUNNING)
971 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
972
973 if (next->flags & CF_DESTROYED)
974 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
975
976 prev->flags &= ~CF_RUNNING; 1025 prev->flags &= ~CF_RUNNING;
977 next->flags |= CF_RUNNING; 1026 next->flags |= CF_RUNNING;
978 1027
979 LOCK; 1028 LOCK;
980 1029
981 if (next->flags & CF_NEW) 1030 if (expect_false (next->flags & CF_NEW))
982 { 1031 {
983 /* need to start coroutine */ 1032 /* need to start coroutine */
984 next->flags &= ~CF_NEW; 1033 next->flags &= ~CF_NEW;
985 /* first get rid of the old state */ 1034 /* first get rid of the old state */
986 save_perl (aTHX_ prev); 1035 save_perl (aTHX_ prev);
987 /* setup coroutine call */ 1036 /* setup coroutine call */
988 setup_coro (aTHX_ next); 1037 coro_setup (aTHX_ next);
989 } 1038 }
990 else 1039 else
991 { 1040 {
992 /* coroutine already started */ 1041 /* coroutine already started */
993 save_perl (aTHX_ prev); 1042 save_perl (aTHX_ prev);
… …
995 } 1044 }
996 1045
997 prev__cctx = prev->cctx; 1046 prev__cctx = prev->cctx;
998 1047
999 /* possibly "free" the cctx */ 1048 /* possibly "free" the cctx */
1000 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1001 { 1050 {
1002 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1051 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1003 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1052 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1004 1053
1005 prev->cctx = 0; 1054 prev->cctx = 0;
1006 1055
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1057 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1059 next->cctx = cctx_get (aTHX);
1060
1007 cctx_put (prev__cctx); 1061 cctx_put (prev__cctx);
1008 } 1062 }
1009 1063
1064 ++next->usecount;
1065
1010 if (!next->cctx) 1066 if (expect_true (!next->cctx))
1011 next->cctx = cctx_get (aTHX); 1067 next->cctx = cctx_get (aTHX);
1012 1068
1013 if (prev__cctx != next->cctx) 1069 if (expect_false (prev__cctx != next->cctx))
1014 { 1070 {
1015 prev__cctx->top_env = PL_top_env; 1071 prev__cctx->top_env = PL_top_env;
1016 PL_top_env = next->cctx->top_env; 1072 PL_top_env = next->cctx->top_env;
1017 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1073 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1018 } 1074 }
… …
1026{ 1082{
1027 struct coro *prev, *next; 1083 struct coro *prev, *next;
1028}; 1084};
1029 1085
1030#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1086#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1087#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1031 1088
1032/** high level stuff ********************************************************/ 1089/** high level stuff ********************************************************/
1033 1090
1034static int 1091static int
1035coro_state_destroy (pTHX_ struct coro *coro) 1092coro_state_destroy (pTHX_ struct coro *coro)
… …
1052 1109
1053 if (coro->mainstack && coro->mainstack != main_mainstack) 1110 if (coro->mainstack && coro->mainstack != main_mainstack)
1054 { 1111 {
1055 struct coro temp; 1112 struct coro temp;
1056 1113
1057 assert (!(coro->flags & CF_RUNNING));
1058
1059 Zero (&temp, 1, struct coro);
1060 temp.save = CORO_SAVE_ALL;
1061
1062 if (coro->flags & CF_RUNNING) 1114 if (coro->flags & CF_RUNNING)
1063 croak ("FATAL: tried to destroy currently running coroutine"); 1115 croak ("FATAL: tried to destroy currently running coroutine");
1064 1116
1065 save_perl (aTHX_ &temp); 1117 save_perl (aTHX_ &temp);
1066 load_perl (aTHX_ coro); 1118 load_perl (aTHX_ coro);
1067 1119
1068 coro_destroy_stacks (aTHX); 1120 coro_destroy (aTHX_ coro);
1069 1121
1070 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1122 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1071 1123
1072 coro->mainstack = 0; 1124 coro->mainstack = 0;
1073 } 1125 }
… …
1123static void 1175static void
1124prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1176prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1125{ 1177{
1126 ta->prev = SvSTATE (prev_sv); 1178 ta->prev = SvSTATE (prev_sv);
1127 ta->next = SvSTATE (next_sv); 1179 ta->next = SvSTATE (next_sv);
1180 TRANSFER_CHECK (*ta);
1128} 1181}
1129 1182
1130static void 1183static void
1131api_transfer (SV *prev_sv, SV *next_sv) 1184api_transfer (SV *prev_sv, SV *next_sv)
1132{ 1185{
1133 dTHX; 1186 dTHX;
1134 struct transfer_args ta; 1187 struct transfer_args ta;
1135 1188
1136 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1189 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1137 TRANSFER (ta); 1190 TRANSFER (ta);
1138}
1139
1140static int
1141api_save (SV *coro_sv, int new_save)
1142{
1143 dTHX;
1144 struct coro *coro = SvSTATE (coro_sv);
1145 int old_save = coro->save;
1146
1147 if (new_save >= 0)
1148 coro->save = new_save;
1149
1150 return old_save;
1151} 1191}
1152 1192
1153/** Coro ********************************************************************/ 1193/** Coro ********************************************************************/
1154 1194
1155static void 1195static void
… …
1214 { 1254 {
1215 LOCK; 1255 LOCK;
1216 next_sv = coro_deq (aTHX_ PRIO_MIN); 1256 next_sv = coro_deq (aTHX_ PRIO_MIN);
1217 1257
1218 /* nothing to schedule: call the idle handler */ 1258 /* nothing to schedule: call the idle handler */
1219 if (!next_sv) 1259 if (expect_false (!next_sv))
1220 { 1260 {
1221 dSP; 1261 dSP;
1222 UNLOCK; 1262 UNLOCK;
1223 1263
1224 ENTER; 1264 ENTER;
… …
1234 } 1274 }
1235 1275
1236 ta->next = SvSTATE (next_sv); 1276 ta->next = SvSTATE (next_sv);
1237 1277
1238 /* cannot transfer to destroyed coros, skip and look for next */ 1278 /* cannot transfer to destroyed coros, skip and look for next */
1239 if (ta->next->flags & CF_DESTROYED) 1279 if (expect_false (ta->next->flags & CF_DESTROYED))
1240 { 1280 {
1241 UNLOCK; 1281 UNLOCK;
1242 SvREFCNT_dec (next_sv); 1282 SvREFCNT_dec (next_sv);
1243 /* coro_nready is already taken care of by destroy */ 1283 /* coro_nready is already taken care of by destroy */
1244 continue; 1284 continue;
… …
1249 break; 1289 break;
1250 } 1290 }
1251 1291
1252 /* free this only after the transfer */ 1292 /* free this only after the transfer */
1253 prev_sv = SvRV (coro_current); 1293 prev_sv = SvRV (coro_current);
1254 SvRV_set (coro_current, next_sv);
1255 ta->prev = SvSTATE (prev_sv); 1294 ta->prev = SvSTATE (prev_sv);
1256 1295 TRANSFER_CHECK (*ta);
1257 assert (ta->next->flags & CF_READY); 1296 assert (ta->next->flags & CF_READY);
1258 ta->next->flags &= ~CF_READY; 1297 ta->next->flags &= ~CF_READY;
1298 SvRV_set (coro_current, next_sv);
1259 1299
1260 LOCK; 1300 LOCK;
1261 free_coro_mortal (aTHX); 1301 free_coro_mortal (aTHX);
1262 coro_mortal = prev_sv; 1302 coro_mortal = prev_sv;
1263 UNLOCK; 1303 UNLOCK;
… …
1300 dTHX; 1340 dTHX;
1301 struct transfer_args ta; 1341 struct transfer_args ta;
1302 1342
1303 prepare_cede (aTHX_ &ta); 1343 prepare_cede (aTHX_ &ta);
1304 1344
1305 if (ta.prev != ta.next) 1345 if (expect_true (ta.prev != ta.next))
1306 { 1346 {
1307 TRANSFER (ta); 1347 TRANSFER (ta);
1308 return 1; 1348 return 1;
1309 } 1349 }
1310 else 1350 else
… …
1324 } 1364 }
1325 else 1365 else
1326 return 0; 1366 return 0;
1327} 1367}
1328 1368
1369static void
1370api_trace (SV *coro_sv, int flags)
1371{
1372 dTHX;
1373 struct coro *coro = SvSTATE (coro_sv);
1374
1375 if (flags & CC_TRACE)
1376 {
1377 if (!coro->cctx)
1378 coro->cctx = cctx_new ();
1379 else if (!(coro->cctx->flags & CC_TRACE))
1380 croak ("cannot enable tracing on coroutine with custom stack");
1381
1382 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1383 }
1384 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1385 {
1386 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1387
1388 if (coro->flags & CF_RUNNING)
1389 PL_runops = RUNOPS_DEFAULT;
1390 else
1391 coro->runops = RUNOPS_DEFAULT;
1392 }
1393}
1394
1329MODULE = Coro::State PACKAGE = Coro::State 1395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1330 1396
1331PROTOTYPES: DISABLE 1397PROTOTYPES: DISABLE
1332 1398
1333BOOT: 1399BOOT:
1334{ 1400{
1335#ifdef USE_ITHREADS 1401#ifdef USE_ITHREADS
1336 MUTEX_INIT (&coro_mutex); 1402 MUTEX_INIT (&coro_mutex);
1337#endif 1403#endif
1338 BOOT_PAGESIZE; 1404 BOOT_PAGESIZE;
1405
1406 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1407 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1339 1408
1340 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1409 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1341 1410
1342 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1411 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1343 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1412 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1344 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1413 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1345 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1414 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1346 1415
1347 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1348 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1349 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1350 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1351 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1352 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1353 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1354
1355 main_mainstack = PL_mainstack; 1416 main_mainstack = PL_mainstack;
1356 main_top_env = PL_top_env; 1417 main_top_env = PL_top_env;
1357 1418
1358 while (main_top_env->je_prev) 1419 while (main_top_env->je_prev)
1359 main_top_env = main_top_env->je_prev; 1420 main_top_env = main_top_env->je_prev;
… …
1371 struct coro *coro; 1432 struct coro *coro;
1372 HV *hv; 1433 HV *hv;
1373 int i; 1434 int i;
1374 1435
1375 Newz (0, coro, 1, struct coro); 1436 Newz (0, coro, 1, struct coro);
1376 coro->args = newAV (); 1437 coro->args = newAV ();
1377 coro->save = CORO_SAVE_DEF;
1378 coro->flags = CF_NEW; 1438 coro->flags = CF_NEW;
1379 1439
1380 if (coro_first) coro_first->prev = coro; 1440 if (coro_first) coro_first->prev = coro;
1381 coro->next = coro_first; 1441 coro->next = coro_first;
1382 coro_first = coro; 1442 coro_first = coro;
1383 1443
1384 coro->hv = hv = newHV (); 1444 coro->hv = hv = newHV ();
1385 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1445 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1386 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1446 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1387 1447
1448 av_extend (coro->args, items - 1);
1388 for (i = 1; i < items; i++) 1449 for (i = 1; i < items; i++)
1389 av_push (coro->args, newSVsv (ST (i))); 1450 av_push (coro->args, newSVsv (ST (i)));
1390} 1451}
1391 OUTPUT: 1452 OUTPUT:
1392 RETVAL 1453 RETVAL
1393 1454
1394int 1455# these not obviously related functions are all rolled into the same xs
1395save (SV *coro, int new_save = -1) 1456# function to increase chances that they all will call transfer with the same
1396 CODE: 1457# stack offset
1397 RETVAL = api_save (coro, new_save);
1398 OUTPUT:
1399 RETVAL
1400
1401int
1402save_also (SV *coro_sv, int save_also)
1403 CODE:
1404{
1405 struct coro *coro = SvSTATE (coro_sv);
1406 RETVAL = coro->save;
1407 coro->save |= save_also;
1408}
1409 OUTPUT:
1410 RETVAL
1411
1412void 1458void
1413_set_stacklevel (...) 1459_set_stacklevel (...)
1414 ALIAS: 1460 ALIAS:
1415 Coro::State::transfer = 1 1461 Coro::State::transfer = 1
1416 Coro::schedule = 2 1462 Coro::schedule = 2
… …
1450 } 1496 }
1451 1497
1452 BARRIER; 1498 BARRIER;
1453 TRANSFER (ta); 1499 TRANSFER (ta);
1454 1500
1455 if (GIMME_V != G_VOID && ta.next != ta.prev) 1501 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1456 XSRETURN_YES; 1502 XSRETURN_YES;
1457} 1503}
1458 1504
1459bool 1505bool
1460_destroy (SV *coro_sv) 1506_destroy (SV *coro_sv)
… …
1511{ 1557{
1512 if (coro->mainstack) 1558 if (coro->mainstack)
1513 { 1559 {
1514 struct coro temp; 1560 struct coro temp;
1515 Zero (&temp, 1, struct coro); 1561 Zero (&temp, 1, struct coro);
1516 temp.save = CORO_SAVE_ALL;
1517 1562
1518 if (!(coro->flags & CF_RUNNING)) 1563 if (!(coro->flags & CF_RUNNING))
1519 { 1564 {
1520 save_perl (aTHX_ &temp); 1565 save_perl (aTHX_ &temp);
1521 load_perl (aTHX_ coro); 1566 load_perl (aTHX_ coro);
… …
1542 save_perl (aTHX_ coro); 1587 save_perl (aTHX_ coro);
1543 load_perl (aTHX_ &temp); 1588 load_perl (aTHX_ &temp);
1544 } 1589 }
1545 } 1590 }
1546} 1591}
1547 1592
1548SV * 1593SV *
1549is_ready (Coro::State coro) 1594is_ready (Coro::State coro)
1550 PROTOTYPE: $ 1595 PROTOTYPE: $
1551 ALIAS: 1596 ALIAS:
1552 is_ready = CF_READY 1597 is_ready = CF_READY
… …
1557 RETVAL = boolSV (coro->flags & ix); 1602 RETVAL = boolSV (coro->flags & ix);
1558 OUTPUT: 1603 OUTPUT:
1559 RETVAL 1604 RETVAL
1560 1605
1561void 1606void
1562trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1607api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1563 CODE:
1564 if (flags & CC_TRACE)
1565 {
1566 if (!coro->cctx)
1567 coro->cctx = cctx_new ();
1568 else if (!(coro->cctx->flags & CC_TRACE))
1569 croak ("cannot enable tracing on coroutine with custom stack");
1570
1571 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1572 }
1573 else
1574 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1575 {
1576 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1577 coro->cctx->flags |= CC_NOREUSE;
1578
1579 if (coro->flags & CF_RUNNING)
1580 PL_runops = RUNOPS_DEFAULT;
1581 else
1582 coro->runops = RUNOPS_DEFAULT;
1583 }
1584 1608
1585SV * 1609SV *
1586has_stack (Coro::State coro) 1610has_stack (Coro::State coro)
1587 PROTOTYPE: $ 1611 PROTOTYPE: $
1588 CODE: 1612 CODE:
… …
1599 RETVAL 1623 RETVAL
1600 1624
1601IV 1625IV
1602rss (Coro::State coro) 1626rss (Coro::State coro)
1603 PROTOTYPE: $ 1627 PROTOTYPE: $
1628 ALIAS:
1629 usecount = 1
1604 CODE: 1630 CODE:
1605 RETVAL = coro_rss (coro); 1631 switch (ix)
1632 {
1633 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1634 case 1: RETVAL = coro->usecount; break;
1635 }
1606 OUTPUT: 1636 OUTPUT:
1607 RETVAL 1637 RETVAL
1608 1638
1609 1639
1610MODULE = Coro::State PACKAGE = Coro 1640MODULE = Coro::State PACKAGE = Coro
… …
1615 1645
1616 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1646 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1617 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1647 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1618 av_async_pool = get_av ("Coro::async_pool", TRUE); 1648 av_async_pool = get_av ("Coro::async_pool", TRUE);
1619 1649
1620 coro_current = get_sv ("Coro::current", FALSE); 1650 coro_current = get_sv ("Coro::current", FALSE);
1621 SvREADONLY_on (coro_current); 1651 SvREADONLY_on (coro_current);
1622 1652
1623 coro_stash = gv_stashpv ("Coro", TRUE); 1653 coro_stash = gv_stashpv ("Coro", TRUE);
1624 1654
1625 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1655 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1634 1664
1635 { 1665 {
1636 SV *sv = perl_get_sv("Coro::API", 1); 1666 SV *sv = perl_get_sv("Coro::API", 1);
1637 1667
1638 coroapi.schedule = api_schedule; 1668 coroapi.schedule = api_schedule;
1639 coroapi.save = api_save;
1640 coroapi.cede = api_cede; 1669 coroapi.cede = api_cede;
1641 coroapi.cede_notself = api_cede_notself; 1670 coroapi.cede_notself = api_cede_notself;
1642 coroapi.ready = api_ready; 1671 coroapi.ready = api_ready;
1643 coroapi.is_ready = api_is_ready; 1672 coroapi.is_ready = api_is_ready;
1644 coroapi.nready = &coro_nready; 1673 coroapi.nready = &coro_nready;
… …
1698# for async_pool speedup 1727# for async_pool speedup
1699void 1728void
1700_pool_1 (SV *cb) 1729_pool_1 (SV *cb)
1701 CODE: 1730 CODE:
1702{ 1731{
1703 int i, len; 1732 struct coro *coro = SvSTATE (coro_current);
1704 HV *hv = (HV *)SvRV (coro_current); 1733 HV *hv = (HV *)SvRV (coro_current);
1705 AV *defav = GvAV (PL_defgv); 1734 AV *defav = GvAV (PL_defgv);
1706 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1735 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1707 AV *invoke_av; 1736 AV *invoke_av;
1737 int i, len;
1708 1738
1709 if (!invoke) 1739 if (!invoke)
1710 croak ("\3terminate\2\n"); 1740 croak ("\3terminate\2\n");
1741
1742 SvREFCNT_dec (coro->saved_deffh);
1743 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1711 1744
1712 hv_store (hv, "desc", sizeof ("desc") - 1, 1745 hv_store (hv, "desc", sizeof ("desc") - 1,
1713 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1746 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1714 1747
1715 invoke_av = (AV *)SvRV (invoke); 1748 invoke_av = (AV *)SvRV (invoke);
… …
1733{ 1766{
1734 struct coro *coro = SvSTATE (coro_current); 1767 struct coro *coro = SvSTATE (coro_current);
1735 1768
1736 sv_setsv (cb, &PL_sv_undef); 1769 sv_setsv (cb, &PL_sv_undef);
1737 1770
1771 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1772 coro->saved_deffh = 0;
1773
1738 if (coro_rss (coro) > SvIV (sv_pool_rss) 1774 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1739 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1775 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1740 croak ("\3terminate\2\n"); 1776 croak ("\3terminate\2\n");
1741 1777
1742 av_clear (GvAV (PL_defgv)); 1778 av_clear (GvAV (PL_defgv));
1743 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1779 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1744 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1780 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1745 coro->save = CORO_SAVE_DEF; 1781
1746 coro->prio = 0; 1782 coro->prio = 0;
1783
1784 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1785 api_trace (coro_current, 0);
1786
1747 av_push (av_async_pool, newSVsv (coro_current)); 1787 av_push (av_async_pool, newSVsv (coro_current));
1748} 1788}
1749 1789
1750 1790
1751MODULE = Coro::State PACKAGE = Coro::AIO 1791MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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