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.184 by root, Thu Oct 4 13:45:56 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;
… …
316 MAGIC *mg; 330 MAGIC *mg;
317 331
318 if (SvROK (coro)) 332 if (SvROK (coro))
319 coro = SvRV (coro); 333 coro = SvRV (coro);
320 334
321 if (SvTYPE (coro) != SVt_PVHV) 335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 336 croak ("Coro::State object required");
323 337
324 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 340 {
327 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
330 } 344 }
… …
340get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
341{ 355{
342 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
343 AV *av; 357 AV *av;
344 358
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 361 else
348 { 362 {
349#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
362put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
363{ 377{
364 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
365 AV *av; 379 AV *av;
366 380
367 if (!mg) 381 if (expect_false (!mg))
368 { 382 {
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
373 } 387 }
374 388
375 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
376 390
377 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
379 393
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 395}
382 396
… …
397 { 411 {
398 dSP; 412 dSP;
399 CV *cv; 413 CV *cv;
400 414
401 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
402 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
403 { 417 {
404 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
405 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
406 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
407 } 421 }
… …
426 440
427 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
428 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
429 for (;;) 443 for (;;)
430 { 444 {
431 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
432 { 446 {
433 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
434 448
435 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
436 { 450 {
437 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
438 452
439 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
440 { 454 {
441 EXTEND (SP, 3); 455 EXTEND (SP, 3);
442 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
443 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
444 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
447 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
448 } 462 }
449 } 463 }
450 } 464 }
451 465
452 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
453 break; 467 break;
454 468
455 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
456 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
457 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
… …
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), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 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 PL_defoutgv = newGVgen ("Coro");
612 GvIOp(PL_defoutgv) = io;
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 }
617 625
618 { 626 {
619 dSP; 627 dSP;
620 LOGOP myop; 628 LOGOP myop;
621 629
622 Zero (&myop, 1, LOGOP); 630 Zero (&myop, 1, LOGOP);
623 myop.op_next = Nullop; 631 myop.op_next = Nullop;
624 myop.op_flags = OPf_WANT_VOID; 632 myop.op_flags = OPf_WANT_VOID;
625 633
626 PUSHMARK (SP); 634 PUSHMARK (SP);
627 XPUSHs (av_shift (GvAV (PL_defgv))); 635 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
628 PUTBACK; 636 PUTBACK;
629 PL_op = (OP *)&myop; 637 PL_op = (OP *)&myop;
630 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
631 SPAGAIN; 639 SPAGAIN;
632 } 640 }
633
634 ENTER; /* necessary e.g. for dounwind */
635} 641}
636 642
637static void 643static void
638coro_destroy (pTHX_ struct coro *coro) 644coro_destroy (pTHX_ struct coro *coro)
639{ 645{
… …
668} 674}
669 675
670static void 676static void
671free_coro_mortal (pTHX) 677free_coro_mortal (pTHX)
672{ 678{
673 if (coro_mortal) 679 if (expect_true (coro_mortal))
674 { 680 {
675 SvREFCNT_dec (coro_mortal); 681 SvREFCNT_dec (coro_mortal);
676 coro_mortal = 0; 682 coro_mortal = 0;
677 } 683 }
678} 684}
… …
707 bot = PL_stack_base + cx->blk_oldsp + 1; 713 bot = PL_stack_base + cx->blk_oldsp + 1;
708 top = cx->blk_gimme == G_ARRAY ? SP + 1 714 top = cx->blk_gimme == G_ARRAY ? SP + 1
709 : cx->blk_gimme == G_SCALAR ? bot + 1 715 : cx->blk_gimme == G_SCALAR ? bot + 1
710 : bot; 716 : bot;
711 717
718 av_extend (av, top - bot);
712 while (bot < top) 719 while (bot < top)
713 av_push (av, SvREFCNT_inc (*bot++)); 720 av_push (av, SvREFCNT_inc (*bot++));
714 721
715 PL_runops = RUNOPS_DEFAULT; 722 PL_runops = RUNOPS_DEFAULT;
716 ENTER; 723 ENTER;
… …
928 Safefree (cctx->sptr); 935 Safefree (cctx->sptr);
929 936
930 Safefree (cctx); 937 Safefree (cctx);
931} 938}
932 939
940/* wether this cctx should be destructed */
941#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
942
933static coro_cctx * 943static coro_cctx *
934cctx_get (pTHX) 944cctx_get (pTHX)
935{ 945{
936 while (cctx_first) 946 while (expect_true (cctx_first))
937 { 947 {
938 coro_cctx *cctx = cctx_first; 948 coro_cctx *cctx = cctx_first;
939 cctx_first = cctx->next; 949 cctx_first = cctx->next;
940 --cctx_idle; 950 --cctx_idle;
941 951
942 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 952 if (expect_true (!CCTX_EXPIRED (cctx)))
943 return cctx; 953 return cctx;
944 954
945 cctx_destroy (cctx); 955 cctx_destroy (cctx);
946 } 956 }
947 957
… …
950 960
951static void 961static void
952cctx_put (coro_cctx *cctx) 962cctx_put (coro_cctx *cctx)
953{ 963{
954 /* free another cctx if overlimit */ 964 /* free another cctx if overlimit */
955 if (cctx_idle >= MAX_IDLE_CCTX) 965 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
956 { 966 {
957 coro_cctx *first = cctx_first; 967 coro_cctx *first = cctx_first;
958 cctx_first = first->next; 968 cctx_first = first->next;
959 --cctx_idle; 969 --cctx_idle;
960 970
… …
966 cctx_first = cctx; 976 cctx_first = cctx;
967} 977}
968 978
969/** coroutine switching *****************************************************/ 979/** coroutine switching *****************************************************/
970 980
971static void NOINLINE 981static void
972transfer_check (pTHX_ struct coro *prev, struct coro *next) 982transfer_check (pTHX_ struct coro *prev, struct coro *next)
973{ 983{
974 if (prev != next) 984 if (expect_true (prev != next))
975 { 985 {
976 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 986 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
977 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");
978 988
979 if (next->flags & CF_RUNNING) 989 if (expect_false (next->flags & CF_RUNNING))
980 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");
981 991
982 if (next->flags & CF_DESTROYED) 992 if (expect_false (next->flags & CF_DESTROYED))
983 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");
984 994
985 if (PL_lex_state != LEX_NOTPARSING) 995 if (expect_false (PL_lex_state != LEX_NOTPARSING))
986 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");
987 } 997 }
988} 998}
989 999
990/* always use the TRANSFER macro */ 1000/* always use the TRANSFER macro */
… …
992transfer (pTHX_ struct coro *prev, struct coro *next) 1002transfer (pTHX_ struct coro *prev, struct coro *next)
993{ 1003{
994 dSTACKLEVEL; 1004 dSTACKLEVEL;
995 1005
996 /* sometimes transfer is only called to set idle_sp */ 1006 /* sometimes transfer is only called to set idle_sp */
997 if (!next) 1007 if (expect_false (!next))
998 { 1008 {
999 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1000 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 */
1001 } 1011 }
1002 else if (prev != next) 1012 else if (expect_true (prev != next))
1003 { 1013 {
1004 coro_cctx *prev__cctx; 1014 coro_cctx *prev__cctx;
1005 1015
1006 if (prev->flags & CF_NEW) 1016 if (expect_false (prev->flags & CF_NEW))
1007 { 1017 {
1008 /* create a new empty context */ 1018 /* create a new empty context */
1009 Newz (0, prev->cctx, 1, coro_cctx); 1019 Newz (0, prev->cctx, 1, coro_cctx);
1010 prev->flags &= ~CF_NEW; 1020 prev->flags &= ~CF_NEW;
1011 prev->flags |= CF_RUNNING; 1021 prev->flags |= CF_RUNNING;
… …
1014 prev->flags &= ~CF_RUNNING; 1024 prev->flags &= ~CF_RUNNING;
1015 next->flags |= CF_RUNNING; 1025 next->flags |= CF_RUNNING;
1016 1026
1017 LOCK; 1027 LOCK;
1018 1028
1019 if (next->flags & CF_NEW) 1029 if (expect_false (next->flags & CF_NEW))
1020 { 1030 {
1021 /* need to start coroutine */ 1031 /* need to start coroutine */
1022 next->flags &= ~CF_NEW; 1032 next->flags &= ~CF_NEW;
1023 /* first get rid of the old state */ 1033 /* first get rid of the old state */
1024 save_perl (aTHX_ prev); 1034 save_perl (aTHX_ prev);
… …
1033 } 1043 }
1034 1044
1035 prev__cctx = prev->cctx; 1045 prev__cctx = prev->cctx;
1036 1046
1037 /* possibly "free" the cctx */ 1047 /* possibly "free" the cctx */
1038 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)))
1039 { 1049 {
1040 /* 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 */
1041 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));
1042 1052
1043 prev->cctx = 0; 1053 prev->cctx = 0;
1044 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
1045 cctx_put (prev__cctx); 1060 cctx_put (prev__cctx);
1046 } 1061 }
1047 1062
1048 ++next->usecount; 1063 ++next->usecount;
1049 1064
1050 if (!next->cctx) 1065 if (expect_true (!next->cctx))
1051 next->cctx = cctx_get (aTHX); 1066 next->cctx = cctx_get (aTHX);
1052 1067
1053 if (prev__cctx != next->cctx) 1068 if (expect_false (prev__cctx != next->cctx))
1054 { 1069 {
1055 prev__cctx->top_env = PL_top_env; 1070 prev__cctx->top_env = PL_top_env;
1056 PL_top_env = next->cctx->top_env; 1071 PL_top_env = next->cctx->top_env;
1057 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1058 } 1073 }
… …
1238 { 1253 {
1239 LOCK; 1254 LOCK;
1240 next_sv = coro_deq (aTHX_ PRIO_MIN); 1255 next_sv = coro_deq (aTHX_ PRIO_MIN);
1241 1256
1242 /* nothing to schedule: call the idle handler */ 1257 /* nothing to schedule: call the idle handler */
1243 if (!next_sv) 1258 if (expect_false (!next_sv))
1244 { 1259 {
1245 dSP; 1260 dSP;
1246 UNLOCK; 1261 UNLOCK;
1247 1262
1248 ENTER; 1263 ENTER;
… …
1258 } 1273 }
1259 1274
1260 ta->next = SvSTATE (next_sv); 1275 ta->next = SvSTATE (next_sv);
1261 1276
1262 /* cannot transfer to destroyed coros, skip and look for next */ 1277 /* cannot transfer to destroyed coros, skip and look for next */
1263 if (ta->next->flags & CF_DESTROYED) 1278 if (expect_false (ta->next->flags & CF_DESTROYED))
1264 { 1279 {
1265 UNLOCK; 1280 UNLOCK;
1266 SvREFCNT_dec (next_sv); 1281 SvREFCNT_dec (next_sv);
1267 /* coro_nready is already taken care of by destroy */ 1282 /* coro_nready is already taken care of by destroy */
1268 continue; 1283 continue;
… …
1324 dTHX; 1339 dTHX;
1325 struct transfer_args ta; 1340 struct transfer_args ta;
1326 1341
1327 prepare_cede (aTHX_ &ta); 1342 prepare_cede (aTHX_ &ta);
1328 1343
1329 if (ta.prev != ta.next) 1344 if (expect_true (ta.prev != ta.next))
1330 { 1345 {
1331 TRANSFER (ta); 1346 TRANSFER (ta);
1332 return 1; 1347 return 1;
1333 } 1348 }
1334 else 1349 else
… …
1385#ifdef USE_ITHREADS 1400#ifdef USE_ITHREADS
1386 MUTEX_INIT (&coro_mutex); 1401 MUTEX_INIT (&coro_mutex);
1387#endif 1402#endif
1388 BOOT_PAGESIZE; 1403 BOOT_PAGESIZE;
1389 1404
1390 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);
1391 1407
1392 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1393 1409
1394 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1395 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1426 1442
1427 coro->hv = hv = newHV (); 1443 coro->hv = hv = newHV ();
1428 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;
1429 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1430 1446
1447 av_extend (coro->args, items - 1);
1431 for (i = 1; i < items; i++) 1448 for (i = 1; i < items; i++)
1432 av_push (coro->args, newSVsv (ST (i))); 1449 av_push (coro->args, newSVsv (ST (i)));
1433} 1450}
1434 OUTPUT: 1451 OUTPUT:
1435 RETVAL 1452 RETVAL
… …
1478 } 1495 }
1479 1496
1480 BARRIER; 1497 BARRIER;
1481 TRANSFER (ta); 1498 TRANSFER (ta);
1482 1499
1483 if (GIMME_V != G_VOID && ta.next != ta.prev) 1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1484 XSRETURN_YES; 1501 XSRETURN_YES;
1485} 1502}
1486 1503
1487bool 1504bool
1488_destroy (SV *coro_sv) 1505_destroy (SV *coro_sv)

Diff Legend

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