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.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.383 by root, Sun Feb 13 04:39:16 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
201static SV *sv_pool_size; 151static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 155static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 156
208/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
209static SV *sv_activity; 158static SV *sv_activity;
210 159
211/* enable processtime/realtime profiling */ 160/* enable processtime/realtime profiling */
… …
310 259
311 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
312 AV *on_enter; 261 AV *on_enter;
313 AV *on_leave; 262 AV *on_leave;
314 263
264 /* swap_sv */
265 AV *swap_sv;
266
315 /* times */ 267 /* times */
316 coro_ts t_cpu, t_real; 268 coro_ts t_cpu, t_real;
317 269
318 /* linked list */ 270 /* linked list */
319 struct coro *next, *prev; 271 struct coro *next, *prev;
… …
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
344static struct coro *coro_first; 296static struct coro *coro_first;
345#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
346 298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
318
347/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
348 320
349static SV * 321static SV *
350coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
351{ 323{
… …
372#if PERL_VERSION_ATLEAST (5,10,0) 344#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 346 get_hv (name, create);
375#endif 347#endif
376 return get_hv (name, create); 348 return get_hv (name, create);
377}
378
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391} 349}
392 350
393INLINE void 351INLINE void
394coro_times_update () 352coro_times_update ()
395{ 353{
… …
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 364#else
407 dTHX; 365 dTHX;
408 UV tv[2]; 366 UV tv[2];
409 367
410 u2time (aTHX_ &tv); 368 u2time (aTHX_ tv);
411 time_real [0] = tv [0]; 369 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 370 time_real [1] = tv [1] * 1000;
413#endif 371#endif
414} 372}
415 373
… …
545 AV *padlist; 503 AV *padlist;
546 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
547 505
548 /* perl manages to free our internal AV and _then_ call us */ 506 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 507 if (IN_DESTRUCT)
550 return; 508 return 0;
551 509
552 /* casting is fun. */ 510 /* casting is fun. */
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
555 513
… …
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 563}
606 564
607/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
608 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
609static void 618static void
610on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
611 620
612static void 621static void
613load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
… …
659 int i; 668 int i;
660 669
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 672 }
673
674 SWAP_SVS (c);
664} 675}
665 676
666static void 677static void
667save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
668{ 679{
680 SWAP_SVS (c);
681
669 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
670 { 683 {
671 int i; 684 int i;
672 685
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
736 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
737 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
740 { 753 {
741 int i; 754 unsigned int i;
742 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
743 CXINC; 756 CXINC;
744 } 757 }
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
746 759
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 994{
982 return 1; 995 return 1;
983} 996}
984 997
985static UNOP coro_setup_op; 998static UNOP init_perl_op;
986 999
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
989{ 1002{
990 /* 1003 /*
991 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
992 */ 1005 */
993 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1013 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1014 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1015 PL_curpm = 0;
1003 PL_curpad = 0; 1016 PL_curpad = 0;
1004 PL_localizing = 0; 1017 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1018 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1020 PL_parser = 0;
1009#endif 1021#endif
1010 PL_hints = 0; 1022 PL_hints = 0;
… …
1042 */ 1054 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1045 1057
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1059 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1060 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
1051 1063
1052 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
1053 1065
1054 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
1068
1069 SWAP_SVS (coro);
1056 1070
1057 if (expect_false (enable_times)) 1071 if (expect_false (enable_times))
1058 { 1072 {
1059 coro_times_update (); 1073 coro_times_update ();
1060 coro_times_sub (coro); 1074 coro_times_sub (coro);
… …
1081 dounwind (-1); 1095 dounwind (-1);
1082 } 1096 }
1083} 1097}
1084 1098
1085static void 1099static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1100destroy_perl (pTHX_ struct coro *coro)
1087{ 1101{
1088 SV *svf [9]; 1102 SV *svf [9];
1089 1103
1090 { 1104 {
1091 struct coro *current = SvSTATE_current; 1105 struct coro *current = SvSTATE_current;
… …
1095 save_perl (aTHX_ current); 1109 save_perl (aTHX_ current);
1096 load_perl (aTHX_ coro); 1110 load_perl (aTHX_ coro);
1097 1111
1098 coro_unwind_stacks (aTHX); 1112 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1113 coro_destruct_stacks (aTHX);
1114
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1100 1117
1101 // now save some sv's to be free'd later 1118 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1119 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1120 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1121 svf [2] = GvSV (PL_errgv);
… …
1112 1129
1113 load_perl (aTHX_ current); 1130 load_perl (aTHX_ current);
1114 } 1131 }
1115 1132
1116 { 1133 {
1117 int i; 1134 unsigned int i;
1118 1135
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1136 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]); 1137 SvREFCNT_dec (svf [i]);
1121 1138
1122 SvREFCNT_dec (coro->saved_deffh); 1139 SvREFCNT_dec (coro->saved_deffh);
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1331 /* 1348 /*
1332 * Unfortunately, there is no way to get at the return values of the 1349 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1352 */
1335 1353
1336 /* 1354 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1355 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1356 * fell off the end, which seems to be the only valid (non-bug)
… …
1545 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1546 { 1564 {
1547 /* need to start coroutine */ 1565 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1567 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1551 } 1569 }
1552 else 1570 else
1553 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1554 1572
1555 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
… …
1618 1636
1619 if (coro->mainstack 1637 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1638 && coro->mainstack != main_mainstack
1621 && coro->slot 1639 && coro->slot
1622 && !PL_dirty) 1640 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1641 destroy_perl (aTHX_ coro);
1642
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1624 1646
1625 cctx_destroy (coro->cctx); 1647 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1648 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1651 SvREFCNT_dec (CORO_THROW);
1629
1630 if (coro->next) coro->next->prev = coro->prev;
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633 1652
1634 return 1; 1653 return 1;
1635} 1654}
1636 1655
1637static int 1656static int
… …
1687 1706
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1707 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1708 TRANSFER (ta, 1);
1690} 1709}
1691 1710
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1711/** Coro ********************************************************************/
1716 1712
1717INLINE void 1713INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1714coro_enq (pTHX_ struct coro *coro)
1719{ 1715{
… …
1744 } 1740 }
1745 1741
1746 return 0; 1742 return 0;
1747} 1743}
1748 1744
1745static void
1746invoke_sv_ready_hook_helper (void)
1747{
1748 dTHX;
1749 dSP;
1750
1751 ENTER;
1752 SAVETMPS;
1753
1754 PUSHMARK (SP);
1755 PUTBACK;
1756 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1757
1758 FREETMPS;
1759 LEAVE;
1760}
1761
1749static int 1762static int
1750api_ready (pTHX_ SV *coro_sv) 1763api_ready (pTHX_ SV *coro_sv)
1751{ 1764{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1765 struct coro *coro = SvSTATE (coro_sv);
1757 1766
1758 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1759 return 0; 1768 return 0;
1760 1769
1761 coro->flags |= CF_READY; 1770 coro->flags |= CF_READY;
1762 1771
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1772 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1773
1769 if (sv_hook) 1774 if (!coro_nready++)
1770 { 1775 if (coroapi.readyhook)
1771 dSP; 1776 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1777
1787 return 1; 1778 return 1;
1788} 1779}
1789 1780
1790static int 1781static int
… …
1835 { 1826 {
1836 /* nothing to schedule: call the idle handler */ 1827 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1828 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1829 && SvOBJECT (SvRV (sv_idle)))
1839 { 1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1835 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1836 --coro_nready;
1843 } 1837 }
1844 else 1838 else
1845 { 1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1841 dSP;
1847 1842
1848 ENTER; 1843 ENTER;
1849 SAVETMPS; 1844 SAVETMPS;
1850 1845
… …
1996{ 1991{
1997 int i; 1992 int i;
1998 HV *hv = (HV *)SvRV (coro_current); 1993 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 1994 AV *av = newAV ();
2000 1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
2001 av_extend (av, items - 1); 1999 av_extend (av, items - 1);
2000
2002 for (i = 0; i < items; ++i) 2001 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
2004 2004
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2006 2006
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2008 api_ready (aTHX_ sv_manager);
… …
2098 2098
2099static void 2099static void
2100coro_rouse_callback (pTHX_ CV *cv) 2100coro_rouse_callback (pTHX_ CV *cv)
2101{ 2101{
2102 dXSARGS; 2102 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)S_GENSUB_ARG;
2104 2104
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2106 {
2107 /* first call, set args */ 2107 /* first call, set args */
2108 SV *coro = SvRV (data); 2108 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2174 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2176 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2177
2178 { 2178 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2180 SV *data = (SV *)S_GENSUB_ARG;
2181 2181
2182 frame->data = (void *)data; 2182 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2184 frame->check = slf_check_rouse_wait;
2185 } 2185 }
… …
2189coro_new_rouse_cb (pTHX) 2189coro_new_rouse_cb (pTHX)
2190{ 2190{
2191 HV *hv = (HV *)SvRV (coro_current); 2191 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2192 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2193 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2194 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2195
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2197 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2198
2199 SvREFCNT_dec (coro->rouse_cb); 2199 SvREFCNT_dec (coro->rouse_cb);
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2425 { 2425 {
2426 if (items > slf_arga) 2426 if (items > slf_arga)
2427 { 2427 {
2428 slf_arga = items; 2428 slf_arga = items;
2429 free (slf_argv); 2429 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2431 } 2431 }
2432 2432
2433 slf_argc = items; 2433 slf_argc = items;
2434 2434
2435 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
… …
2722{ 2722{
2723 if (items >= 2) 2723 if (items >= 2)
2724 { 2724 {
2725 /* callback form */ 2725 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2728
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2730
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2792{
2793 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2794 2794
2795 if (items >= 2) 2795 if (items >= 2)
2796 { 2796 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2799
2800 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 2802
2803 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2805 } 2805 }
2806 else if (SvIVX (AvARRAY (av)[0])) 2806 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 2837
2838static void 2838static void
2839coro_aio_callback (pTHX_ CV *cv) 2839coro_aio_callback (pTHX_ CV *cv)
2840{ 2840{
2841 dXSARGS; 2841 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2845 2845
2846 av_extend (state, items - 1); 2846 av_extend (state, items - 1);
2847 2847
… …
2961 2961
2962 for (i = 0; i < items; ++i) 2962 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 2963 PUSHs (arg [i]);
2964 2964
2965 /* now push the callback closure */ 2965 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2966 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 2967
2968 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 2969 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 2971 }
2972 2972
2973 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 2974 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2977} 2977}
2978 2978
… …
2989/*****************************************************************************/ 2989/*****************************************************************************/
2990 2990
2991#if CORO_CLONE 2991#if CORO_CLONE
2992# include "clone.c" 2992# include "clone.c"
2993#endif 2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2994 3052
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3054
2997PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2998 3056
… …
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061 3119
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063 3121
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (double (*)(), SvIV (*svp)); 3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 } 3124 }
3067 3125
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3127}
3070 3128
3071SV * 3129SV *
3072new (char *klass, ...) 3130new (SV *klass, ...)
3073 ALIAS: 3131 ALIAS:
3074 Coro::new = 1 3132 Coro::new = 1
3075 CODE: 3133 CODE:
3076{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3135 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3136 RETVAL
3128 3137
3129void 3138void
3130transfer (...) 3139transfer (...)
3131 PROTOTYPE: $$ 3140 PROTOTYPE: $$
… …
3268 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3278 OUTPUT:
3270 RETVAL 3279 RETVAL
3271 3280
3272void 3281void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
3275 CODE: 3284 CODE:
3276{ 3285{
3277 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3289 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3291}
3283 3292
3284void 3293void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
… …
3381 3390
3382 if (expect_false (current == self)) 3391 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3392 coro_times_sub (SvSTATE (coro_current));
3384} 3393}
3385 3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
3414
3386MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
3387 3416
3388BOOT: 3417BOOT:
3389{ 3418{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3428
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3433
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3435
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
3429 } 3458 }
3430} 3459}
3431 3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3469
3432void 3470void
3433terminate (...) 3471terminate (...)
3434 CODE: 3472 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436 3474
… …
3470_set_readyhook (SV *hook) 3508_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3509 PROTOTYPE: $
3472 CODE: 3510 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3511 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3512 SvGETMAGIC (hook);
3513 if (SvOK (hook))
3514 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3515 coro_readyhook = newSVsv (hook);
3516 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3517 }
3518 else
3519 {
3520 coro_readyhook = 0;
3521 CORO_READYHOOK = 0;
3522 }
3476 3523
3477int 3524int
3478prio (Coro::State coro, int newprio = 0) 3525prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3526 PROTOTYPE: $;$
3480 ALIAS: 3527 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3591 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3593
3547 if ((SV *)hv == &PL_sv_undef) 3594 if ((SV *)hv == &PL_sv_undef)
3548 { 3595 {
3549 PUSHMARK (SP); 3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv);
3558 } 3599 }
3559 3600
3560 { 3601 {
3561 struct coro *coro = SvSTATE_hv (hv); 3602 struct coro *coro = SvSTATE_hv (hv);
3562 3603
… …
3596 CODE: 3637 CODE:
3597{ 3638{
3598 struct coro *coro = SvSTATE_current; 3639 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3641
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3642 block = s_get_cv_croak (block);
3602 3643
3603 if (!*avp) 3644 if (!*avp)
3604 *avp = newAV (); 3645 *avp = newAV ();
3605 3646
3606 av_push (*avp, SvREFCNT_inc (block)); 3647 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3847
3807void 3848void
3808_register (char *target, char *proto, SV *req) 3849_register (char *target, char *proto, SV *req)
3809 CODE: 3850 CODE:
3810{ 3851{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3852 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3853 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3854 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3855 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3856 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3857}
3817 3858
3859MODULE = Coro::State PACKAGE = Coro::Select
3860
3861void
3862patch_pp_sselect ()
3863 CODE:
3864 if (!coro_old_pp_sselect)
3865 {
3866 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3867 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3868 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3869 }
3870
3871void
3872unpatch_pp_sselect ()
3873 CODE:
3874 if (coro_old_pp_sselect)
3875 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0;
3878 }
3879

Diff Legend

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