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.176 by root, Sun Sep 30 13:50:38 2007 UTC vs.
Revision 1.194 by root, Sat Oct 6 00:08:04 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
204 /* statistics */ 219 /* statistics */
205 int usecount; /* number of switches to this coro */ 220 int usecount; /* number of transfers to this coro */
206 221
207 /* coro process data */ 222 /* coro process data */
208 int prio; 223 int prio;
224 //SV *throw;
225
226 /* async_pool */
227 SV *saved_deffh;
209 228
210 /* linked list */ 229 /* linked list */
211 struct coro *next, *prev; 230 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 231 HV *hv; /* the perl hash associated with this coro, if any */
213}; 232};
… …
311 MAGIC *mg; 330 MAGIC *mg;
312 331
313 if (SvROK (coro)) 332 if (SvROK (coro))
314 coro = SvRV (coro); 333 coro = SvRV (coro);
315 334
316 if (SvTYPE (coro) != SVt_PVHV) 335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 336 croak ("Coro::State object required");
318 337
319 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 340 {
322 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
325 } 344 }
… …
335get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
336{ 355{
337 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 357 AV *av;
339 358
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 361 else
343 { 362 {
344#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
358{ 377{
359 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 379 AV *av;
361 380
362 if (!mg) 381 if (expect_false (!mg))
363 { 382 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
368 } 387 }
369 388
370 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
371 390
372 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
374 393
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 395}
377 396
378/** load & save, init *******************************************************/ 397/** load & save, init *******************************************************/
379
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384 398
385static void 399static void
386load_perl (pTHX_ Coro__State c) 400load_perl (pTHX_ Coro__State c)
387{ 401{
388#define VAR(name,type) PL_ ## name = c->name; 402#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 403# include "state.h"
390#undef VAR 404#undef VAR
391 405
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 406 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 407 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 408 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 409 GvSV (irsgv) = c->irssv_sv;
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 410
412 { 411 {
413 dSP; 412 dSP;
414 CV *cv; 413 CV *cv;
415 414
416 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
418 { 417 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
422 } 421 }
… …
441 440
442 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
444 for (;;) 443 for (;;)
445 { 444 {
446 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
447 { 446 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
449 448
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 450 {
452 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
453 452
454 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
455 { 454 {
456 EXTEND (SP, 3); 455 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
463 } 462 }
464 } 463 }
465 } 464 }
466 465
467 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 467 break;
469 468
470 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
473 } 472 }
474 473
475 PUTBACK; 474 PUTBACK;
476 } 475 }
477 476
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 477 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 478 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 479 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 480 c->irssv_sv = GvSV (irsgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
483 481
484#define VAR(name,type)c->name = PL_ ## name; 482#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 483# include "state.h"
486#undef VAR 484#undef VAR
487} 485}
… …
540 * destroy the stacks, the callchain etc... 538 * destroy the stacks, the callchain etc...
541 */ 539 */
542static void 540static void
543coro_destroy_stacks (pTHX) 541coro_destroy_stacks (pTHX)
544{ 542{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 543 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 544 PL_curstackinfo = PL_curstackinfo->si_next;
564 545
565 while (PL_curstackinfo) 546 while (PL_curstackinfo)
566 { 547 {
… …
584} 565}
585 566
586static size_t 567static size_t
587coro_rss (pTHX_ struct coro *coro) 568coro_rss (pTHX_ struct coro *coro)
588{ 569{
589 size_t rss = sizeof (coro); 570 size_t rss = sizeof (*coro);
590 571
591 if (coro->mainstack) 572 if (coro->mainstack)
592 { 573 {
593 if (coro->flags & CF_RUNNING) 574 if (coro->flags & CF_RUNNING)
594 { 575 {
… …
596 # include "state.h" 577 # include "state.h"
597 #undef VAR 578 #undef VAR
598 } 579 }
599 580
600 rss += sizeof (coro->curstackinfo); 581 rss += sizeof (coro->curstackinfo);
601 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 *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 585 rss += coro->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 587 rss += coro->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 588 rss += coro->savestack_max * sizeof (ANY);
608 589
… …
615} 596}
616 597
617/** coroutine stack handling ************************************************/ 598/** coroutine stack handling ************************************************/
618 599
619static void 600static void
620setup_coro (pTHX_ struct coro *coro) 601coro_setup (pTHX_ struct coro *coro)
621{ 602{
622 /* 603 /*
623 * emulate part of the perl startup here. 604 * emulate part of the perl startup here.
624 */ 605 */
625 coro_init_stacks (aTHX); 606 coro_init_stacks (aTHX);
… …
630 PL_comppad = 0; 611 PL_comppad = 0;
631 PL_curpm = 0; 612 PL_curpm = 0;
632 PL_localizing = 0; 613 PL_localizing = 0;
633 PL_dirty = 0; 614 PL_dirty = 0;
634 PL_restartop = 0; 615 PL_restartop = 0;
616
617 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
635 625
636 { 626 {
637 dSP; 627 dSP;
638 LOGOP myop; 628 LOGOP myop;
639 629
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 630 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 631 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 632 myop.op_flags = OPf_WANT_VOID;
646 633
647 PUSHMARK (SP); 634 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 635 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 636 PUTBACK;
650 PL_op = (OP *)&myop; 637 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 639 SPAGAIN;
653 } 640 }
641}
654 642
655 ENTER; /* necessary e.g. for dounwind */ 643static void
644coro_destroy (pTHX_ struct coro *coro)
645{
646 if (!IN_DESTRUCT)
647 {
648 /* restore all saved variables and stuff */
649 LEAVE_SCOPE (0);
650 assert (PL_tmps_floor == -1);
651
652 /* free all temporaries */
653 FREETMPS;
654 assert (PL_tmps_ix == -1);
655
656 /* unwind all extra stacks */
657 POPSTACK_TO (PL_mainstack);
658
659 /* unwind main stack */
660 dounwind (-1);
661 }
662
663 SvREFCNT_dec (GvSV (PL_defgv));
664 SvREFCNT_dec (GvAV (PL_defgv));
665 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv));
669
670 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw);
672
673 coro_destroy_stacks (aTHX);
656} 674}
657 675
658static void 676static void
659free_coro_mortal (pTHX) 677free_coro_mortal (pTHX)
660{ 678{
661 if (coro_mortal) 679 if (expect_true (coro_mortal))
662 { 680 {
663 SvREFCNT_dec (coro_mortal); 681 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 682 coro_mortal = 0;
665 } 683 }
666} 684}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 713 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 714 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 715 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 716 : bot;
699 717
718 av_extend (av, top - bot);
700 while (bot < top) 719 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 720 av_push (av, SvREFCNT_inc (*bot++));
702 721
703 PL_runops = RUNOPS_DEFAULT; 722 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 723 ENTER;
… …
916 Safefree (cctx->sptr); 935 Safefree (cctx->sptr);
917 936
918 Safefree (cctx); 937 Safefree (cctx);
919} 938}
920 939
940/* wether this cctx should be destructed */
941#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
942
921static coro_cctx * 943static coro_cctx *
922cctx_get (pTHX) 944cctx_get (pTHX)
923{ 945{
924 while (cctx_first) 946 while (expect_true (cctx_first))
925 { 947 {
926 coro_cctx *cctx = cctx_first; 948 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 949 cctx_first = cctx->next;
928 --cctx_idle; 950 --cctx_idle;
929 951
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 952 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 953 return cctx;
932 954
933 cctx_destroy (cctx); 955 cctx_destroy (cctx);
934 } 956 }
935 957
… …
938 960
939static void 961static void
940cctx_put (coro_cctx *cctx) 962cctx_put (coro_cctx *cctx)
941{ 963{
942 /* free another cctx if overlimit */ 964 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 965 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 966 {
945 coro_cctx *first = cctx_first; 967 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 968 cctx_first = first->next;
947 --cctx_idle; 969 --cctx_idle;
948 970
… …
954 cctx_first = cctx; 976 cctx_first = cctx;
955} 977}
956 978
957/** coroutine switching *****************************************************/ 979/** coroutine switching *****************************************************/
958 980
959static void NOINLINE 981static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 982transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 983{
962 if (prev != next) 984 if (expect_true (prev != next))
963 { 985 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 986 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 987 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 988
967 if (next->flags & CF_RUNNING) 989 if (expect_false (next->flags & CF_RUNNING))
968 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 991
970 if (next->flags & CF_DESTROYED) 992 if (expect_false (next->flags & CF_DESTROYED))
971 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 994
973 if (PL_lex_state != LEX_NOTPARSING) 995 if (expect_false (PL_lex_state != LEX_NOTPARSING))
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 996 croak ("Coro::State::transfer called while parsing, but this is not supported");
975 } 997 }
976} 998}
977 999
978/* always use the TRANSFER macro */ 1000/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1002transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1003{
982 dSTACKLEVEL; 1004 dSTACKLEVEL;
983 1005
984 /* sometimes transfer is only called to set idle_sp */ 1006 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1007 if (expect_false (!next))
986 { 1008 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1010 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1011 }
990 else if (prev != next) 1012 else if (expect_true (prev != next))
991 { 1013 {
992 coro_cctx *prev__cctx; 1014 coro_cctx *prev__cctx;
993 1015
994 if (prev->flags & CF_NEW) 1016 if (expect_false (prev->flags & CF_NEW))
995 { 1017 {
996 /* create a new empty context */ 1018 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1019 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1020 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1021 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1024 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1025 next->flags |= CF_RUNNING;
1004 1026
1005 LOCK; 1027 LOCK;
1006 1028
1007 if (next->flags & CF_NEW) 1029 if (expect_false (next->flags & CF_NEW))
1008 { 1030 {
1009 /* need to start coroutine */ 1031 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1032 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1033 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1034 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1035 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1036 coro_setup (aTHX_ next);
1015 } 1037 }
1016 else 1038 else
1017 { 1039 {
1018 /* coroutine already started */ 1040 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1041 save_perl (aTHX_ prev);
… …
1021 } 1043 }
1022 1044
1023 prev__cctx = prev->cctx; 1045 prev__cctx = prev->cctx;
1024 1046
1025 /* possibly "free" the cctx */ 1047 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1027 { 1049 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1029 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1051 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1052
1031 prev->cctx = 0; 1053 prev->cctx = 0;
1032 1054
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1058 next->cctx = cctx_get (aTHX);
1059
1033 cctx_put (prev__cctx); 1060 cctx_put (prev__cctx);
1034 } 1061 }
1035 1062
1036 ++next->usecount; 1063 ++next->usecount;
1037 1064
1038 if (!next->cctx) 1065 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1066 next->cctx = cctx_get (aTHX);
1040 1067
1041 if (prev__cctx != next->cctx) 1068 if (expect_false (prev__cctx != next->cctx))
1042 { 1069 {
1043 prev__cctx->top_env = PL_top_env; 1070 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1071 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1073 }
… …
1081 1108
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1109 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1110 {
1084 struct coro temp; 1111 struct coro temp;
1085 1112
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1113 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1114 croak ("FATAL: tried to destroy currently running coroutine");
1093 1115
1094 save_perl (aTHX_ &temp); 1116 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1117 load_perl (aTHX_ coro);
1096 1118
1097 coro_destroy_stacks (aTHX); 1119 coro_destroy (aTHX_ coro);
1098 1120
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1100 1122
1101 coro->mainstack = 0; 1123 coro->mainstack = 0;
1102 } 1124 }
… …
1165 1187
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1188 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1189 TRANSFER (ta);
1168} 1190}
1169 1191
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1192/** Coro ********************************************************************/
1184 1193
1185static void 1194static void
1186coro_enq (pTHX_ SV *coro_sv) 1195coro_enq (pTHX_ SV *coro_sv)
1187{ 1196{
… …
1244 { 1253 {
1245 LOCK; 1254 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1255 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1256
1248 /* nothing to schedule: call the idle handler */ 1257 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1258 if (expect_false (!next_sv))
1250 { 1259 {
1251 dSP; 1260 dSP;
1252 UNLOCK; 1261 UNLOCK;
1253 1262
1254 ENTER; 1263 ENTER;
… …
1264 } 1273 }
1265 1274
1266 ta->next = SvSTATE (next_sv); 1275 ta->next = SvSTATE (next_sv);
1267 1276
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1277 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1278 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1279 {
1271 UNLOCK; 1280 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1281 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1282 /* coro_nready is already taken care of by destroy */
1274 continue; 1283 continue;
… …
1330 dTHX; 1339 dTHX;
1331 struct transfer_args ta; 1340 struct transfer_args ta;
1332 1341
1333 prepare_cede (aTHX_ &ta); 1342 prepare_cede (aTHX_ &ta);
1334 1343
1335 if (ta.prev != ta.next) 1344 if (expect_true (ta.prev != ta.next))
1336 { 1345 {
1337 TRANSFER (ta); 1346 TRANSFER (ta);
1338 return 1; 1347 return 1;
1339 } 1348 }
1340 else 1349 else
… …
1391#ifdef USE_ITHREADS 1400#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1401 MUTEX_INIT (&coro_mutex);
1393#endif 1402#endif
1394 BOOT_PAGESIZE; 1403 BOOT_PAGESIZE;
1395 1404
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1407
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1409
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1412 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1413 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1414
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1415 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1416 main_top_env = PL_top_env;
1413 1417
1414 while (main_top_env->je_prev) 1418 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1419 main_top_env = main_top_env->je_prev;
… …
1427 struct coro *coro; 1431 struct coro *coro;
1428 HV *hv; 1432 HV *hv;
1429 int i; 1433 int i;
1430 1434
1431 Newz (0, coro, 1, struct coro); 1435 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1436 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1437 coro->flags = CF_NEW;
1435 1438
1436 if (coro_first) coro_first->prev = coro; 1439 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1440 coro->next = coro_first;
1438 coro_first = coro; 1441 coro_first = coro;
1439 1442
1440 coro->hv = hv = newHV (); 1443 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1446
1447 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1448 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1449 av_push (coro->args, newSVsv (ST (i)));
1446} 1450}
1447 OUTPUT: 1451 OUTPUT:
1448 RETVAL
1449
1450int
1451save (SV *coro, int new_save = -1)
1452 CODE:
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL 1452 RETVAL
1467 1453
1468# these not obviously related functions are all rolled into the same xs 1454# these not obviously related functions are all rolled into the same xs
1469# function to increase chances that they all will call transfer with the same 1455# function to increase chances that they all will call transfer with the same
1470# stack offset 1456# stack offset
… …
1509 } 1495 }
1510 1496
1511 BARRIER; 1497 BARRIER;
1512 TRANSFER (ta); 1498 TRANSFER (ta);
1513 1499
1514 if (GIMME_V != G_VOID && ta.next != ta.prev) 1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1515 XSRETURN_YES; 1501 XSRETURN_YES;
1516} 1502}
1517 1503
1518bool 1504bool
1519_destroy (SV *coro_sv) 1505_destroy (SV *coro_sv)
… …
1570{ 1556{
1571 if (coro->mainstack) 1557 if (coro->mainstack)
1572 { 1558 {
1573 struct coro temp; 1559 struct coro temp;
1574 Zero (&temp, 1, struct coro); 1560 Zero (&temp, 1, struct coro);
1575 temp.save = CORO_SAVE_ALL;
1576 1561
1577 if (!(coro->flags & CF_RUNNING)) 1562 if (!(coro->flags & CF_RUNNING))
1578 { 1563 {
1579 save_perl (aTHX_ &temp); 1564 save_perl (aTHX_ &temp);
1580 load_perl (aTHX_ coro); 1565 load_perl (aTHX_ coro);
… …
1659 1644
1660 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1661 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1662 av_async_pool = get_av ("Coro::async_pool", TRUE); 1647 av_async_pool = get_av ("Coro::async_pool", TRUE);
1663 1648
1664 coro_current = get_sv ("Coro::current", FALSE); 1649 coro_current = get_sv ("Coro::current", FALSE);
1665 SvREADONLY_on (coro_current); 1650 SvREADONLY_on (coro_current);
1666 1651
1667 coro_stash = gv_stashpv ("Coro", TRUE); 1652 coro_stash = gv_stashpv ("Coro", TRUE);
1668 1653
1669 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1678 1663
1679 { 1664 {
1680 SV *sv = perl_get_sv("Coro::API", 1); 1665 SV *sv = perl_get_sv("Coro::API", 1);
1681 1666
1682 coroapi.schedule = api_schedule; 1667 coroapi.schedule = api_schedule;
1683 coroapi.save = api_save;
1684 coroapi.cede = api_cede; 1668 coroapi.cede = api_cede;
1685 coroapi.cede_notself = api_cede_notself; 1669 coroapi.cede_notself = api_cede_notself;
1686 coroapi.ready = api_ready; 1670 coroapi.ready = api_ready;
1687 coroapi.is_ready = api_is_ready; 1671 coroapi.is_ready = api_is_ready;
1688 coroapi.nready = &coro_nready; 1672 coroapi.nready = &coro_nready;
… …
1742# for async_pool speedup 1726# for async_pool speedup
1743void 1727void
1744_pool_1 (SV *cb) 1728_pool_1 (SV *cb)
1745 CODE: 1729 CODE:
1746{ 1730{
1747 int i, len; 1731 struct coro *coro = SvSTATE (coro_current);
1748 HV *hv = (HV *)SvRV (coro_current); 1732 HV *hv = (HV *)SvRV (coro_current);
1749 AV *defav = GvAV (PL_defgv); 1733 AV *defav = GvAV (PL_defgv);
1750 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1751 AV *invoke_av; 1735 AV *invoke_av;
1736 int i, len;
1752 1737
1753 if (!invoke) 1738 if (!invoke)
1754 croak ("\3terminate\2\n"); 1739 croak ("\3terminate\2\n");
1740
1741 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1755 1743
1756 hv_store (hv, "desc", sizeof ("desc") - 1, 1744 hv_store (hv, "desc", sizeof ("desc") - 1,
1757 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1745 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1758 1746
1759 invoke_av = (AV *)SvRV (invoke); 1747 invoke_av = (AV *)SvRV (invoke);
… …
1777{ 1765{
1778 struct coro *coro = SvSTATE (coro_current); 1766 struct coro *coro = SvSTATE (coro_current);
1779 1767
1780 sv_setsv (cb, &PL_sv_undef); 1768 sv_setsv (cb, &PL_sv_undef);
1781 1769
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0;
1772
1782 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1783 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1784 croak ("\3terminate\2\n"); 1775 croak ("\3terminate\2\n");
1785 1776
1786 av_clear (GvAV (PL_defgv)); 1777 av_clear (GvAV (PL_defgv));
1787 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1788 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1789 1780
1790 coro->save = CORO_SAVE_DEF;
1791 coro->prio = 0; 1781 coro->prio = 0;
1792 1782
1793 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1783 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1794 api_trace (coro_current, 0); 1784 api_trace (coro_current, 0);
1795 1785

Diff Legend

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