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.179 by root, Wed Oct 3 16:03:17 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
… …
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 */
136 149
137static GV *irsgv; /* $/ */ 150static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */
138 152
139/* async_pool helper stuff */ 153/* async_pool helper stuff */
140static SV *sv_pool_rss; 154static SV *sv_pool_rss;
141static SV *sv_pool_size; 155static SV *sv_pool_size;
142static AV *av_async_pool; 156static AV *av_async_pool;
… …
192 206
193 /* optionally saved, might be zero */ 207 /* optionally saved, might be zero */
194 AV *defav; /* @_ */ 208 AV *defav; /* @_ */
195 SV *defsv; /* $_ */ 209 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */ 210 SV *errsv; /* $@ */
197 IO *deffh; /* default filehandle */ 211 SV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */ 212 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */ 213 SV *irssv_sv; /* real $/ cache */
200 214
201#define VAR(name,type) type name; 215#define VAR(name,type) type name;
202# include "state.h" 216# include "state.h"
203#undef VAR 217#undef VAR
204 218
205 /* statistics */ 219 /* statistics */
206 int usecount; /* number of switches to this coro */ 220 int usecount; /* number of transfers to this coro */
207 221
208 /* coro process data */ 222 /* coro process data */
209 int prio; 223 int prio;
224 //SV *throw;
225
226 /* async_pool */
227 SV *saved_deffh;
210 228
211 /* linked list */ 229 /* linked list */
212 struct coro *next, *prev; 230 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */ 231 HV *hv; /* the perl hash associated with this coro, if any */
214}; 232};
… …
312 MAGIC *mg; 330 MAGIC *mg;
313 331
314 if (SvROK (coro)) 332 if (SvROK (coro))
315 coro = SvRV (coro); 333 coro = SvRV (coro);
316 334
317 if (SvTYPE (coro) != SVt_PVHV) 335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 336 croak ("Coro::State object required");
319 337
320 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 340 {
323 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
326 } 344 }
… …
336get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
337{ 355{
338 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
339 AV *av; 357 AV *av;
340 358
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 361 else
344 { 362 {
345#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
358put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
359{ 377{
360 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
361 AV *av; 379 AV *av;
362 380
363 if (!mg) 381 if (expect_false (!mg))
364 { 382 {
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
369 } 387 }
370 388
371 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
372 390
373 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
375 393
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 395}
378 396
… …
383{ 401{
384#define VAR(name,type) PL_ ## name = c->name; 402#define VAR(name,type) PL_ ## name = c->name;
385# include "state.h" 403# include "state.h"
386#undef VAR 404#undef VAR
387 405
388 GvSV (PL_defgv) = c->defsv; 406 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav; 407 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv; 408 GvSV (PL_errgv) = c->errsv;
391 GvIOp(PL_defoutgv) = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv; 409 GvSV (irsgv) = c->irssv_sv;
394 410
395 { 411 {
396 dSP; 412 dSP;
397 CV *cv; 413 CV *cv;
398 414
399 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
401 { 417 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
405 } 421 }
… …
424 440
425 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
427 for (;;) 443 for (;;)
428 { 444 {
429 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
430 { 446 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
432 448
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 450 {
435 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
436 452
437 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
438 { 454 {
439 EXTEND (SP, 3); 455 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
445 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
446 } 462 }
447 } 463 }
448 } 464 }
449 465
450 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 467 break;
452 468
453 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
… …
459 } 475 }
460 476
461 c->defav = GvAV (PL_defgv); 477 c->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 478 c->defsv = DEFSV;
463 c->errsv = ERRSV; 479 c->errsv = ERRSV;
464 c->deffh = GvIOp (PL_defoutgv);
465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 480 c->irssv_sv = GvSV (irsgv);
467 481
468#define VAR(name,type)c->name = PL_ ## name; 482#define VAR(name,type)c->name = PL_ ## name;
469# include "state.h" 483# include "state.h"
470#undef VAR 484#undef VAR
… …
551} 565}
552 566
553static size_t 567static size_t
554coro_rss (pTHX_ struct coro *coro) 568coro_rss (pTHX_ struct coro *coro)
555{ 569{
556 size_t rss = sizeof (coro); 570 size_t rss = sizeof (*coro);
557 571
558 if (coro->mainstack) 572 if (coro->mainstack)
559 { 573 {
560 if (coro->flags & CF_RUNNING) 574 if (coro->flags & CF_RUNNING)
561 { 575 {
… …
563 # include "state.h" 577 # include "state.h"
564 #undef VAR 578 #undef VAR
565 } 579 }
566 580
567 rss += sizeof (coro->curstackinfo); 581 rss += sizeof (coro->curstackinfo);
568 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 *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
571 rss += coro->tmps_max * sizeof (SV *); 585 rss += coro->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 587 rss += coro->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 588 rss += coro->savestack_max * sizeof (ANY);
575 589
… …
598 PL_curpm = 0; 612 PL_curpm = 0;
599 PL_localizing = 0; 613 PL_localizing = 0;
600 PL_dirty = 0; 614 PL_dirty = 0;
601 PL_restartop = 0; 615 PL_restartop = 0;
602 616
603 GvSV (PL_defgv) = NEWSV (0, 0); 617 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 618 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 619 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), irsgv, PERL_MAGIC_sv, "/", 1); 620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv)); 621 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv);
608 623
609 { 624 ENTER; /* necessary e.g. for dounwind */
610 IO *io = newIO ();
611 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH;
615 }
616 625
617 { 626 {
618 dSP; 627 dSP;
619 LOGOP myop; 628 LOGOP myop;
620 629
621 Zero (&myop, 1, LOGOP); 630 Zero (&myop, 1, LOGOP);
622 myop.op_next = Nullop; 631 myop.op_next = Nullop;
623 myop.op_flags = OPf_WANT_VOID; 632 myop.op_flags = OPf_WANT_VOID;
624 633
625 PUSHMARK (SP); 634 PUSHMARK (SP);
626 XPUSHs (av_shift (GvAV (PL_defgv))); 635 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
627 PUTBACK; 636 PUTBACK;
628 PL_op = (OP *)&myop; 637 PL_op = (OP *)&myop;
629 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
630 SPAGAIN; 639 SPAGAIN;
631 } 640 }
632
633 ENTER; /* necessary e.g. for dounwind */
634} 641}
635 642
636static void 643static void
637coro_destroy (pTHX_ struct coro *coro) 644coro_destroy (pTHX_ struct coro *coro)
638{ 645{
… …
654 } 661 }
655 662
656 SvREFCNT_dec (GvSV (PL_defgv)); 663 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv)); 664 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv)); 665 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv)); 666 SvREFCNT_dec (PL_defoutgv);
660 SvREFCNT_dec (PL_rs); 667 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv)); 668 SvREFCNT_dec (GvSV (irsgv));
662 669
670 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw);
672
663 coro_destroy_stacks (aTHX); 673 coro_destroy_stacks (aTHX);
664} 674}
665 675
666static void 676static void
667free_coro_mortal (pTHX) 677free_coro_mortal (pTHX)
668{ 678{
669 if (coro_mortal) 679 if (expect_true (coro_mortal))
670 { 680 {
671 SvREFCNT_dec (coro_mortal); 681 SvREFCNT_dec (coro_mortal);
672 coro_mortal = 0; 682 coro_mortal = 0;
673 } 683 }
674} 684}
… …
703 bot = PL_stack_base + cx->blk_oldsp + 1; 713 bot = PL_stack_base + cx->blk_oldsp + 1;
704 top = cx->blk_gimme == G_ARRAY ? SP + 1 714 top = cx->blk_gimme == G_ARRAY ? SP + 1
705 : cx->blk_gimme == G_SCALAR ? bot + 1 715 : cx->blk_gimme == G_SCALAR ? bot + 1
706 : bot; 716 : bot;
707 717
718 av_extend (av, top - bot);
708 while (bot < top) 719 while (bot < top)
709 av_push (av, SvREFCNT_inc (*bot++)); 720 av_push (av, SvREFCNT_inc (*bot++));
710 721
711 PL_runops = RUNOPS_DEFAULT; 722 PL_runops = RUNOPS_DEFAULT;
712 ENTER; 723 ENTER;
… …
924 Safefree (cctx->sptr); 935 Safefree (cctx->sptr);
925 936
926 Safefree (cctx); 937 Safefree (cctx);
927} 938}
928 939
940/* wether this cctx should be destructed */
941#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
942
929static coro_cctx * 943static coro_cctx *
930cctx_get (pTHX) 944cctx_get (pTHX)
931{ 945{
932 while (cctx_first) 946 while (expect_true (cctx_first))
933 { 947 {
934 coro_cctx *cctx = cctx_first; 948 coro_cctx *cctx = cctx_first;
935 cctx_first = cctx->next; 949 cctx_first = cctx->next;
936 --cctx_idle; 950 --cctx_idle;
937 951
938 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 952 if (expect_true (!CCTX_EXPIRED (cctx)))
939 return cctx; 953 return cctx;
940 954
941 cctx_destroy (cctx); 955 cctx_destroy (cctx);
942 } 956 }
943 957
… …
946 960
947static void 961static void
948cctx_put (coro_cctx *cctx) 962cctx_put (coro_cctx *cctx)
949{ 963{
950 /* free another cctx if overlimit */ 964 /* free another cctx if overlimit */
951 if (cctx_idle >= MAX_IDLE_CCTX) 965 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
952 { 966 {
953 coro_cctx *first = cctx_first; 967 coro_cctx *first = cctx_first;
954 cctx_first = first->next; 968 cctx_first = first->next;
955 --cctx_idle; 969 --cctx_idle;
956 970
… …
962 cctx_first = cctx; 976 cctx_first = cctx;
963} 977}
964 978
965/** coroutine switching *****************************************************/ 979/** coroutine switching *****************************************************/
966 980
967static void NOINLINE 981static void
968transfer_check (pTHX_ struct coro *prev, struct coro *next) 982transfer_check (pTHX_ struct coro *prev, struct coro *next)
969{ 983{
970 if (prev != next) 984 if (expect_true (prev != next))
971 { 985 {
972 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 986 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
973 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");
974 988
975 if (next->flags & CF_RUNNING) 989 if (expect_false (next->flags & CF_RUNNING))
976 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");
977 991
978 if (next->flags & CF_DESTROYED) 992 if (expect_false (next->flags & CF_DESTROYED))
979 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");
980 994
981 if (PL_lex_state != LEX_NOTPARSING) 995 if (expect_false (PL_lex_state != LEX_NOTPARSING))
982 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");
983 } 997 }
984} 998}
985 999
986/* always use the TRANSFER macro */ 1000/* always use the TRANSFER macro */
… …
988transfer (pTHX_ struct coro *prev, struct coro *next) 1002transfer (pTHX_ struct coro *prev, struct coro *next)
989{ 1003{
990 dSTACKLEVEL; 1004 dSTACKLEVEL;
991 1005
992 /* sometimes transfer is only called to set idle_sp */ 1006 /* sometimes transfer is only called to set idle_sp */
993 if (!next) 1007 if (expect_false (!next))
994 { 1008 {
995 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
996 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 */
997 } 1011 }
998 else if (prev != next) 1012 else if (expect_true (prev != next))
999 { 1013 {
1000 coro_cctx *prev__cctx; 1014 coro_cctx *prev__cctx;
1001 1015
1002 if (prev->flags & CF_NEW) 1016 if (expect_false (prev->flags & CF_NEW))
1003 { 1017 {
1004 /* create a new empty context */ 1018 /* create a new empty context */
1005 Newz (0, prev->cctx, 1, coro_cctx); 1019 Newz (0, prev->cctx, 1, coro_cctx);
1006 prev->flags &= ~CF_NEW; 1020 prev->flags &= ~CF_NEW;
1007 prev->flags |= CF_RUNNING; 1021 prev->flags |= CF_RUNNING;
… …
1010 prev->flags &= ~CF_RUNNING; 1024 prev->flags &= ~CF_RUNNING;
1011 next->flags |= CF_RUNNING; 1025 next->flags |= CF_RUNNING;
1012 1026
1013 LOCK; 1027 LOCK;
1014 1028
1015 if (next->flags & CF_NEW) 1029 if (expect_false (next->flags & CF_NEW))
1016 { 1030 {
1017 /* need to start coroutine */ 1031 /* need to start coroutine */
1018 next->flags &= ~CF_NEW; 1032 next->flags &= ~CF_NEW;
1019 /* first get rid of the old state */ 1033 /* first get rid of the old state */
1020 save_perl (aTHX_ prev); 1034 save_perl (aTHX_ prev);
… …
1029 } 1043 }
1030 1044
1031 prev__cctx = prev->cctx; 1045 prev__cctx = prev->cctx;
1032 1046
1033 /* possibly "free" the cctx */ 1047 /* possibly "free" the cctx */
1034 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)))
1035 { 1049 {
1036 /* 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 */
1037 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));
1038 1052
1039 prev->cctx = 0; 1053 prev->cctx = 0;
1040 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
1041 cctx_put (prev__cctx); 1060 cctx_put (prev__cctx);
1042 } 1061 }
1043 1062
1044 ++next->usecount; 1063 ++next->usecount;
1045 1064
1046 if (!next->cctx) 1065 if (expect_true (!next->cctx))
1047 next->cctx = cctx_get (aTHX); 1066 next->cctx = cctx_get (aTHX);
1048 1067
1049 if (prev__cctx != next->cctx) 1068 if (expect_false (prev__cctx != next->cctx))
1050 { 1069 {
1051 prev__cctx->top_env = PL_top_env; 1070 prev__cctx->top_env = PL_top_env;
1052 PL_top_env = next->cctx->top_env; 1071 PL_top_env = next->cctx->top_env;
1053 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1054 } 1073 }
… …
1234 { 1253 {
1235 LOCK; 1254 LOCK;
1236 next_sv = coro_deq (aTHX_ PRIO_MIN); 1255 next_sv = coro_deq (aTHX_ PRIO_MIN);
1237 1256
1238 /* nothing to schedule: call the idle handler */ 1257 /* nothing to schedule: call the idle handler */
1239 if (!next_sv) 1258 if (expect_false (!next_sv))
1240 { 1259 {
1241 dSP; 1260 dSP;
1242 UNLOCK; 1261 UNLOCK;
1243 1262
1244 ENTER; 1263 ENTER;
… …
1254 } 1273 }
1255 1274
1256 ta->next = SvSTATE (next_sv); 1275 ta->next = SvSTATE (next_sv);
1257 1276
1258 /* cannot transfer to destroyed coros, skip and look for next */ 1277 /* cannot transfer to destroyed coros, skip and look for next */
1259 if (ta->next->flags & CF_DESTROYED) 1278 if (expect_false (ta->next->flags & CF_DESTROYED))
1260 { 1279 {
1261 UNLOCK; 1280 UNLOCK;
1262 SvREFCNT_dec (next_sv); 1281 SvREFCNT_dec (next_sv);
1263 /* coro_nready is already taken care of by destroy */ 1282 /* coro_nready is already taken care of by destroy */
1264 continue; 1283 continue;
… …
1320 dTHX; 1339 dTHX;
1321 struct transfer_args ta; 1340 struct transfer_args ta;
1322 1341
1323 prepare_cede (aTHX_ &ta); 1342 prepare_cede (aTHX_ &ta);
1324 1343
1325 if (ta.prev != ta.next) 1344 if (expect_true (ta.prev != ta.next))
1326 { 1345 {
1327 TRANSFER (ta); 1346 TRANSFER (ta);
1328 return 1; 1347 return 1;
1329 } 1348 }
1330 else 1349 else
… …
1381#ifdef USE_ITHREADS 1400#ifdef USE_ITHREADS
1382 MUTEX_INIT (&coro_mutex); 1401 MUTEX_INIT (&coro_mutex);
1383#endif 1402#endif
1384 BOOT_PAGESIZE; 1403 BOOT_PAGESIZE;
1385 1404
1386 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1387 1407
1388 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1389 1409
1390 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1391 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1422 1442
1423 coro->hv = hv = newHV (); 1443 coro->hv = hv = newHV ();
1424 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;
1425 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1426 1446
1447 av_extend (coro->args, items - 1);
1427 for (i = 1; i < items; i++) 1448 for (i = 1; i < items; i++)
1428 av_push (coro->args, newSVsv (ST (i))); 1449 av_push (coro->args, newSVsv (ST (i)));
1429} 1450}
1430 OUTPUT: 1451 OUTPUT:
1431 RETVAL 1452 RETVAL
… …
1474 } 1495 }
1475 1496
1476 BARRIER; 1497 BARRIER;
1477 TRANSFER (ta); 1498 TRANSFER (ta);
1478 1499
1479 if (GIMME_V != G_VOID && ta.next != ta.prev) 1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1480 XSRETURN_YES; 1501 XSRETURN_YES;
1481} 1502}
1482 1503
1483bool 1504bool
1484_destroy (SV *coro_sv) 1505_destroy (SV *coro_sv)
… …
1623 1644
1624 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1625 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1626 av_async_pool = get_av ("Coro::async_pool", TRUE); 1647 av_async_pool = get_av ("Coro::async_pool", TRUE);
1627 1648
1628 coro_current = get_sv ("Coro::current", FALSE); 1649 coro_current = get_sv ("Coro::current", FALSE);
1629 SvREADONLY_on (coro_current); 1650 SvREADONLY_on (coro_current);
1630 1651
1631 coro_stash = gv_stashpv ("Coro", TRUE); 1652 coro_stash = gv_stashpv ("Coro", TRUE);
1632 1653
1633 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1705# for async_pool speedup 1726# for async_pool speedup
1706void 1727void
1707_pool_1 (SV *cb) 1728_pool_1 (SV *cb)
1708 CODE: 1729 CODE:
1709{ 1730{
1710 int i, len; 1731 struct coro *coro = SvSTATE (coro_current);
1711 HV *hv = (HV *)SvRV (coro_current); 1732 HV *hv = (HV *)SvRV (coro_current);
1712 AV *defav = GvAV (PL_defgv); 1733 AV *defav = GvAV (PL_defgv);
1713 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1714 AV *invoke_av; 1735 AV *invoke_av;
1736 int i, len;
1715 1737
1716 if (!invoke) 1738 if (!invoke)
1717 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);
1718 1743
1719 hv_store (hv, "desc", sizeof ("desc") - 1, 1744 hv_store (hv, "desc", sizeof ("desc") - 1,
1720 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1745 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1721 1746
1722 invoke_av = (AV *)SvRV (invoke); 1747 invoke_av = (AV *)SvRV (invoke);
… …
1740{ 1765{
1741 struct coro *coro = SvSTATE (coro_current); 1766 struct coro *coro = SvSTATE (coro_current);
1742 1767
1743 sv_setsv (cb, &PL_sv_undef); 1768 sv_setsv (cb, &PL_sv_undef);
1744 1769
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0;
1772
1745 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1747 croak ("\3terminate\2\n"); 1775 croak ("\3terminate\2\n");
1748 1776
1749 av_clear (GvAV (PL_defgv)); 1777 av_clear (GvAV (PL_defgv));

Diff Legend

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