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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.392 by root, Fri Apr 29 15:43:27 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>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
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 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
201static SV *sv_pool_size; 152static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 156static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 157
208/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
209static SV *sv_activity; 159static SV *sv_activity;
210 160
211/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
… …
291 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
297 247
298 /* statistics */ 248 /* statistics */
299 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
300 250
301 /* coro process data */ 251 /* coro process data */
… …
309 AV *invoke_av; 259 AV *invoke_av;
310 260
311 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
312 AV *on_enter; 262 AV *on_enter;
313 AV *on_leave; 263 AV *on_leave;
264
265 /* swap_sv */
266 AV *swap_sv;
314 267
315 /* times */ 268 /* times */
316 coro_ts t_cpu, t_real; 269 coro_ts t_cpu, t_real;
317 270
318 /* linked list */ 271 /* linked list */
… …
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
344static struct coro *coro_first; 297static struct coro *coro_first;
345#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
346 299
300/** Coro::Select ************************************************************/
301
302static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select;
304
305/* horrible hack, but if it works... */
306static OP *
307coro_pp_sselect (pTHX)
308{
309 dSP;
310 PUSHMARK (SP - 4); /* fake argument list */
311 XPUSHs (coro_select_select);
312 PUTBACK;
313
314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
315 PL_op->op_flags |= OPf_STACKED;
316 PL_op->op_private = 0;
317 return PL_ppaddr [OP_ENTERSUB](aTHX);
318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
371
347/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
348 373
349static SV * 374static SV *
350coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
351{ 376{
… …
372#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 399 get_hv (name, create);
375#endif 400#endif
376 return get_hv (name, create); 401 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} 402}
392 403
393INLINE void 404INLINE void
394coro_times_update () 405coro_times_update ()
395{ 406{
… …
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 616}
606 617
607/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
608 619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
609static void 671static void
610on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
611 673
612static void 674static void
613load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
659 int i; 721 int i;
660 722
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 725 }
726
727 SWAP_SVS (c);
664} 728}
665 729
666static void 730static void
667save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
668{ 732{
733 SWAP_SVS (c);
734
669 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
670 { 736 {
671 int i; 737 int i;
672 738
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1047{
982 return 1; 1048 return 1;
983} 1049}
984 1050
985static UNOP coro_setup_op; 1051static UNOP init_perl_op;
986 1052
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
989{ 1055{
990 /* 1056 /*
991 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
992 */ 1058 */
993 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1068 PL_curpm = 0;
1003 PL_curpad = 0; 1069 PL_curpad = 0;
1004 PL_localizing = 0; 1070 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1071 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1073 PL_parser = 0;
1009#endif 1074#endif
1010 PL_hints = 0; 1075 PL_hints = 0;
… …
1042 */ 1107 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 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 */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1045 1110
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* 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; 1112 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
1051 1116
1052 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
1053 1118
1054 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
1121
1122 SWAP_SVS (coro);
1056 1123
1057 if (expect_false (enable_times)) 1124 if (expect_false (enable_times))
1058 { 1125 {
1059 coro_times_update (); 1126 coro_times_update ();
1060 coro_times_sub (coro); 1127 coro_times_sub (coro);
… …
1081 dounwind (-1); 1148 dounwind (-1);
1082 } 1149 }
1083} 1150}
1084 1151
1085static void 1152static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
1087{ 1154{
1088 SV *svf [9]; 1155 SV *svf [9];
1089 1156
1090 { 1157 {
1091 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
… …
1095 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1096 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1097 1164
1098 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1100 1170
1101 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1331 /* 1401 /*
1332 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1405 */
1335 1406
1336 /* 1407 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1408 * 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) 1409 * fell off the end, which seems to be the only valid (non-bug)
… …
1545 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1546 { 1617 {
1547 /* need to start coroutine */ 1618 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1620 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1551 } 1622 }
1552 else 1623 else
1553 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1554 1625
1555 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1618 1689
1619 if (coro->mainstack 1690 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1621 && coro->slot 1692 && coro->slot
1622 && !PL_dirty) 1693 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1695
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1624 1699
1625 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1704 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 1705
1634 return 1; 1706 return 1;
1635} 1707}
1636 1708
1637static int 1709static int
… …
1687 1759
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1690} 1762}
1691 1763
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 ********************************************************************/ 1764/** Coro ********************************************************************/
1716 1765
1717INLINE void 1766INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1719{ 1768{
… …
1744 } 1793 }
1745 1794
1746 return 0; 1795 return 0;
1747} 1796}
1748 1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1813}
1814
1749static int 1815static int
1750api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1751{ 1817{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1757 1819
1758 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1759 return 0; 1821 return 0;
1760 1822
1761 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1762 1824
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1826
1769 if (sv_hook) 1827 if (!coro_nready++)
1770 { 1828 if (coroapi.readyhook)
1771 dSP; 1829 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 1830
1787 return 1; 1831 return 1;
1788} 1832}
1789 1833
1790static int 1834static int
… …
1835 { 1879 {
1836 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1839 { 1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1889 --coro_nready;
1843 } 1890 }
1844 else 1891 else
1845 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1894 dSP;
1847 1895
1848 ENTER; 1896 ENTER;
1849 SAVETMPS; 1897 SAVETMPS;
1850 1898
… …
1960 2008
1961static void 2009static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2011{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2013
1967 if (on_destroyp) 2014 if (on_destroyp)
1968 { 2015 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1970 2019
1971 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1972 { 2021 {
1973 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
… …
1976 PUSHMARK (SP); 2025 PUSHMARK (SP);
1977 2026
1978 if (statusp) 2027 if (statusp)
1979 { 2028 {
1980 int i; 2029 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1983 2031
1984 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1986 } 2034 }
… …
1990 } 2038 }
1991 } 2039 }
1992} 2040}
1993 2041
1994static void 2042static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2043coro_set_status (HV *coro_hv, SV **arg, int items)
1996{ 2044{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 2045 AV *av = newAV ();
2000 2046
2047 /* items are actually not so common, so optimise for this case */
2048 if (items)
2049 {
2050 int i;
2051
2001 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
2002 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
2004 2057
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2059}
2006 2060
2061static void
2062slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2063{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2064 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2065 api_ready (aTHX_ sv_manager);
2009 2066
2010 frame->prepare = prepare_schedule; 2067 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2068 frame->check = slf_check_repeat;
2012 2069
2013 /* as a minor optimisation, we could unwind all stacks here */ 2070 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2071 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2072 /*coro_unwind_stacks (aTHX);*/
2073}
2074
2075static void
2076slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2077{
2078 HV *coro_hv = (HV *)SvRV (coro_current);
2079
2080 coro_set_status (coro_hv, arg, items);
2081 slf_init_terminate_cancel_common (frame, coro_hv);
2082}
2083
2084static void
2085slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv;
2088 struct coro *coro;
2089
2090 if (items <= 0)
2091 croak ("Coro::cancel called without coro object,");
2092
2093 coro = SvSTATE (arg [0]);
2094 coro_hv = coro->hv;
2095
2096 coro_set_status (coro_hv, arg + 1, items - 1);
2097
2098 /* cancelling the current coro is allowed, and equals terminate */
2099 if (coro_hv == (HV *)SvRV (coro_current))
2100 slf_init_terminate_cancel_common (frame, coro_hv);
2101 else
2102 {
2103 /* otherwise we cancel ourselves */
2104 coro_state_destroy (aTHX_ coro);
2105 coro_call_on_destroy (aTHX_ coro);
2106
2107 frame->prepare = prepare_nop;
2108 frame->check = slf_check_nop;
2109 }
2016} 2110}
2017 2111
2018/*****************************************************************************/ 2112/*****************************************************************************/
2019/* async pool handler */ 2113/* async pool handler */
2020 2114
… …
2098 2192
2099static void 2193static void
2100coro_rouse_callback (pTHX_ CV *cv) 2194coro_rouse_callback (pTHX_ CV *cv)
2101{ 2195{
2102 dXSARGS; 2196 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2197 SV *data = (SV *)S_GENSUB_ARG;
2104 2198
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2199 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2200 {
2107 /* first call, set args */ 2201 /* first call, set args */
2108 SV *coro = SvRV (data); 2202 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2268 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2269 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2270 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2271
2178 { 2272 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2273 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2274 SV *data = (SV *)S_GENSUB_ARG;
2181 2275
2182 frame->data = (void *)data; 2276 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2277 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2278 frame->check = slf_check_rouse_wait;
2185 } 2279 }
… …
2189coro_new_rouse_cb (pTHX) 2283coro_new_rouse_cb (pTHX)
2190{ 2284{
2191 HV *hv = (HV *)SvRV (coro_current); 2285 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2286 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2287 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2288 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2289
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2290 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2291 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2292
2199 SvREFCNT_dec (coro->rouse_cb); 2293 SvREFCNT_dec (coro->rouse_cb);
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2518 if (PL_op->op_flags & OPf_STACKED)
2425 { 2519 {
2426 if (items > slf_arga) 2520 if (items > slf_arga)
2427 { 2521 {
2428 slf_arga = items; 2522 slf_arga = items;
2429 free (slf_argv); 2523 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2524 New (0, slf_argv, slf_arga, SV *);
2431 } 2525 }
2432 2526
2433 slf_argc = items; 2527 slf_argc = items;
2434 2528
2435 for (i = 0; i < items; ++i) 2529 for (i = 0; i < items; ++i)
… …
2722{ 2816{
2723 if (items >= 2) 2817 if (items >= 2)
2724 { 2818 {
2725 /* callback form */ 2819 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2820 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2821 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2822
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2823 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2824
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2825 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2826 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2886{
2793 AV *av = (AV *)SvRV (arg [0]); 2887 AV *av = (AV *)SvRV (arg [0]);
2794 2888
2795 if (items >= 2) 2889 if (items >= 2)
2796 { 2890 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2891 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2892 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2893
2800 if (SvIVX (AvARRAY (av)[0])) 2894 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2895 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 2896
2803 frame->prepare = prepare_nop; 2897 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 2898 frame->check = slf_check_nop;
2805 } 2899 }
2806 else if (SvIVX (AvARRAY (av)[0])) 2900 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 2931
2838static void 2932static void
2839coro_aio_callback (pTHX_ CV *cv) 2933coro_aio_callback (pTHX_ CV *cv)
2840{ 2934{
2841 dXSARGS; 2935 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2936 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2937 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2938 SV *data_sv = newSV (sizeof (struct io_state));
2845 2939
2846 av_extend (state, items - 1); 2940 av_extend (state, items - 1);
2847 2941
… …
2961 3055
2962 for (i = 0; i < items; ++i) 3056 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3057 PUSHs (arg [i]);
2964 3058
2965 /* now push the callback closure */ 3059 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3060 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3061
2968 /* now call the AIO function - we assume our request is uncancelable */ 3062 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3063 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3064 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3065 }
2972 3066
2973 /* now that the requets is going, we loop toll we have a result */ 3067 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3068 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3069 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3070 frame->check = slf_check_aio_req;
2977} 3071}
2978 3072
… …
2989/*****************************************************************************/ 3083/*****************************************************************************/
2990 3084
2991#if CORO_CLONE 3085#if CORO_CLONE
2992# include "clone.c" 3086# include "clone.c"
2993#endif 3087#endif
3088
3089/*****************************************************************************/
3090
3091static SV *
3092coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3093{
3094 SV *coro_sv;
3095 struct coro *coro;
3096 MAGIC *mg;
3097 HV *hv;
3098 SV *cb;
3099 int i;
3100
3101 if (argc > 0)
3102 {
3103 cb = s_get_cv_croak (argv [0]);
3104
3105 if (!is_coro)
3106 {
3107 if (CvISXSUB (cb))
3108 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3109
3110 if (!CvROOT (cb))
3111 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3112 }
3113 }
3114
3115 Newz (0, coro, 1, struct coro);
3116 coro->args = newAV ();
3117 coro->flags = CF_NEW;
3118
3119 if (coro_first) coro_first->prev = coro;
3120 coro->next = coro_first;
3121 coro_first = coro;
3122
3123 coro->hv = hv = newHV ();
3124 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3125 mg->mg_flags |= MGf_DUP;
3126 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3127
3128 if (argc > 0)
3129 {
3130 av_extend (coro->args, argc + is_coro - 1);
3131
3132 if (is_coro)
3133 {
3134 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3135 cb = (SV *)cv_coro_run;
3136 }
3137
3138 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3139
3140 for (i = 1; i < argc; i++)
3141 av_push (coro->args, newSVsv (argv [i]));
3142 }
3143
3144 return coro_sv;
3145}
2994 3146
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3147MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3148
2997PROTOTYPES: DISABLE 3149PROTOTYPES: DISABLE
2998 3150
… …
3051 coroapi.prepare_nop = prepare_nop; 3203 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3204 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3205 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3206 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3207
3056 { 3208 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3209
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3210 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3211}
3070 3212
3071SV * 3213SV *
3072new (char *klass, ...) 3214new (SV *klass, ...)
3073 ALIAS: 3215 ALIAS:
3074 Coro::new = 1 3216 Coro::new = 1
3075 CODE: 3217 CODE:
3076{ 3218 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3219 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 3220 RETVAL
3128 3221
3129void 3222void
3130transfer (...) 3223transfer (...)
3131 PROTOTYPE: $$ 3224 PROTOTYPE: $$
3132 CODE: 3225 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3226 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141 3227
3142void 3228void
3143_exit (int code) 3229_exit (int code)
3144 PROTOTYPE: $ 3230 PROTOTYPE: $
3145 CODE: 3231 CODE:
… …
3268 RETVAL = boolSV (coro->flags & ix); 3354 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3355 OUTPUT:
3270 RETVAL 3356 RETVAL
3271 3357
3272void 3358void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3359throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3275 CODE: 3361 CODE:
3276{ 3362{
3277 struct coro *current = SvSTATE_current; 3363 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3364 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3365 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3366 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3367 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3368}
3283 3369
3284void 3370void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3371api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3372 PROTOTYPE: $;$
… …
3341 3427
3342void 3428void
3343cancel (Coro::State self) 3429cancel (Coro::State self)
3344 CODE: 3430 CODE:
3345 coro_state_destroy (aTHX_ self); 3431 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3432
3349SV * 3433SV *
3350enable_times (int enabled = enable_times) 3434enable_times (int enabled = enable_times)
3351 CODE: 3435 CODE:
3352{ 3436{
… …
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3464 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3465
3382 if (expect_false (current == self)) 3466 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3467 coro_times_sub (SvSTATE (coro_current));
3384} 3468}
3469
3470void
3471swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3472 CODE:
3473{
3474 struct coro *current = SvSTATE_current;
3475
3476 if (current == coro)
3477 SWAP_SVS (current);
3478
3479 if (!coro->swap_sv)
3480 coro->swap_sv = newAV ();
3481
3482 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3483 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3484
3485 if (current == coro)
3486 SWAP_SVS (current);
3487}
3488
3385 3489
3386MODULE = Coro::State PACKAGE = Coro 3490MODULE = Coro::State PACKAGE = Coro
3387 3491
3388BOOT: 3492BOOT:
3389{ 3493{
… …
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3502 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3503
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3504 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); 3505 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); 3506 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); 3507 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3508
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3509 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3510
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3511 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3512 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3513 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3531 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3532 SvREADONLY_on (sv);
3429 } 3533 }
3430} 3534}
3431 3535
3536SV *
3537async (...)
3538 PROTOTYPE: &@
3539 CODE:
3540 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3541 api_ready (aTHX_ RETVAL);
3542 OUTPUT:
3543 RETVAL
3544
3545void
3546_destroy (Coro::State coro)
3547 CODE:
3548 /* used by the manager thread */
3549 coro_state_destroy (aTHX_ coro);
3550 coro_call_on_destroy (aTHX_ coro);
3551
3432void 3552void
3433terminate (...) 3553terminate (...)
3434 CODE: 3554 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3555 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3556
3557void
3558cancel (...)
3559 CODE:
3560 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3436 3561
3437void 3562void
3438schedule (...) 3563schedule (...)
3439 CODE: 3564 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3565 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3595_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3596 PROTOTYPE: $
3472 CODE: 3597 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3598 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3599 SvGETMAGIC (hook);
3600 if (SvOK (hook))
3601 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3602 coro_readyhook = newSVsv (hook);
3603 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3604 }
3605 else
3606 {
3607 coro_readyhook = 0;
3608 CORO_READYHOOK = 0;
3609 }
3476 3610
3477int 3611int
3478prio (Coro::State coro, int newprio = 0) 3612prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3613 PROTOTYPE: $;$
3480 ALIAS: 3614 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3678 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3679 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3680
3547 if ((SV *)hv == &PL_sv_undef) 3681 if ((SV *)hv == &PL_sv_undef)
3548 { 3682 {
3549 PUSHMARK (SP); 3683 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)); 3684 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3685 SvREFCNT_dec (sv);
3558 } 3686 }
3559 3687
3560 { 3688 {
3561 struct coro *coro = SvSTATE_hv (hv); 3689 struct coro *coro = SvSTATE_hv (hv);
3562 3690
… …
3596 CODE: 3724 CODE:
3597{ 3725{
3598 struct coro *coro = SvSTATE_current; 3726 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3727 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3728
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3729 block = s_get_cv_croak (block);
3602 3730
3603 if (!*avp) 3731 if (!*avp)
3604 *avp = newAV (); 3732 *avp = newAV ();
3605 3733
3606 av_push (*avp, SvREFCNT_inc (block)); 3734 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3934
3807void 3935void
3808_register (char *target, char *proto, SV *req) 3936_register (char *target, char *proto, SV *req)
3809 CODE: 3937 CODE:
3810{ 3938{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3939 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3940 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3941 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3942 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3943 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3944}
3817 3945
3946MODULE = Coro::State PACKAGE = Coro::Select
3947
3948void
3949patch_pp_sselect ()
3950 CODE:
3951 if (!coro_old_pp_sselect)
3952 {
3953 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3954 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3955 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3956 }
3957
3958void
3959unpatch_pp_sselect ()
3960 CODE:
3961 if (coro_old_pp_sselect)
3962 {
3963 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3964 coro_old_pp_sselect = 0;
3965 }
3966

Diff Legend

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