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.360 by root, Mon Jun 29 06:14:23 2009 UTC vs.
Revision 1.388 by root, Wed Feb 23 07:14:22 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
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
17#ifdef WIN32 26#ifdef 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.");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
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{
… …
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} 402}
378 403
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}
392
393INLINE void 404INLINE void
394coro_times_update () 405coro_times_update ()
395{ 406{
396#ifdef coro_clock_gettime 407#ifdef coro_clock_gettime
397 struct timespec ts; 408 struct timespec ts;
… …
402 413
403 ts.tv_sec = ts.tv_nsec = 0; 414 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts); 415 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 416 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 417#else
418 dTHX;
407 UV tv[2]; 419 UV tv[2];
408 420
409 u2time (aTHX_ &tv); 421 u2time (aTHX_ tv);
410 time_real [0] = tv [0]; 422 time_real [0] = tv [0];
411 time_real [1] = tv [1] * 1000; 423 time_real [1] = tv [1] * 1000;
412#endif 424#endif
413} 425}
414 426
… …
544 AV *padlist; 556 AV *padlist;
545 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
546 558
547 /* perl manages to free our internal AV and _then_ call us */ 559 /* perl manages to free our internal AV and _then_ call us */
548 if (IN_DESTRUCT) 560 if (IN_DESTRUCT)
549 return; 561 return 0;
550 562
551 /* casting is fun. */ 563 /* casting is fun. */
552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
553 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
554 566
… …
603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
604} 616}
605 617
606/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
607 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
608static void 671static void
609on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
610 673
611static void 674static void
612load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
658 int i; 721 int i;
659 722
660 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
661 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
662 } 725 }
726
727 SWAP_SVS (c);
663} 728}
664 729
665static void 730static void
666save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
667{ 732{
733 SWAP_SVS (c);
734
668 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
669 { 736 {
670 int i; 737 int i;
671 738
672 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
735 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
736 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
737 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
738 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
739 { 806 {
740 int i; 807 unsigned int i;
741 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
742 CXINC; 809 CXINC;
743 } 810 }
744 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
745 812
… …
979slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
980{ 1047{
981 return 1; 1048 return 1;
982} 1049}
983 1050
984static UNOP coro_setup_op; 1051static UNOP init_perl_op;
985 1052
986static 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 */
987coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
988{ 1055{
989 /* 1056 /*
990 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
991 */ 1058 */
992 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
999 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
1001 PL_curpm = 0; 1068 PL_curpm = 0;
1002 PL_curpad = 0; 1069 PL_curpad = 0;
1003 PL_localizing = 0; 1070 PL_localizing = 0;
1004 PL_dirty = 0;
1005 PL_restartop = 0; 1071 PL_restartop = 0;
1006#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
1007 PL_parser = 0; 1073 PL_parser = 0;
1008#endif 1074#endif
1009 PL_hints = 0; 1075 PL_hints = 0;
… …
1041 */ 1107 */
1042 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 */
1043 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 */
1044 1110
1045 /* 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 */
1046 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
1047 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
1048 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
1049 /* 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 */
1050 1116
1051 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
1052 1118
1053 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
1054 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
1121
1122 SWAP_SVS (coro);
1055 1123
1056 if (expect_false (enable_times)) 1124 if (expect_false (enable_times))
1057 { 1125 {
1058 coro_times_update (); 1126 coro_times_update ();
1059 coro_times_sub (coro); 1127 coro_times_sub (coro);
… …
1080 dounwind (-1); 1148 dounwind (-1);
1081 } 1149 }
1082} 1150}
1083 1151
1084static void 1152static void
1085coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
1086{ 1154{
1087 SV *svf [9]; 1155 SV *svf [9];
1088 1156
1089 { 1157 {
1090 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
… …
1094 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1095 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1096 1164
1097 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1098 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1099 1170
1100 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1101 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1102 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1103 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
… …
1111 1182
1112 load_perl (aTHX_ current); 1183 load_perl (aTHX_ current);
1113 } 1184 }
1114 1185
1115 { 1186 {
1116 int i; 1187 unsigned int i;
1117 1188
1118 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1119 SvREFCNT_dec (svf [i]); 1190 SvREFCNT_dec (svf [i]);
1120 1191
1121 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
… …
1327 /* 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 */
1328 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1329 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1330 /* 1401 /*
1331 * 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
1332 * 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.
1333 */ 1405 */
1334 1406
1335 /* 1407 /*
1336 * 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
1337 * 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)
… …
1544 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1545 { 1617 {
1546 /* need to start coroutine */ 1618 /* need to start coroutine */
1547 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1548 /* setup coroutine call */ 1620 /* setup coroutine call */
1549 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1550 } 1622 }
1551 else 1623 else
1552 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1553 1625
1554 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1617 1689
1618 if (coro->mainstack 1690 if (coro->mainstack
1619 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1620 && coro->slot 1692 && coro->slot
1621 && !PL_dirty) 1693 && !PL_dirty)
1622 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;
1623 1699
1624 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1625 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1626 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1627 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1628
1629 if (coro->next) coro->next->prev = coro->prev;
1630 if (coro->prev) coro->prev->next = coro->next;
1631 if (coro == coro_first) coro_first = coro->next;
1632 1705
1633 return 1; 1706 return 1;
1634} 1707}
1635 1708
1636static int 1709static int
… …
1686 1759
1687 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1688 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1689} 1762}
1690 1763
1691/*****************************************************************************/
1692/* gensub: simple closure generation utility */
1693
1694#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1695
1696/* create a closure from XS, returns a code reference */
1697/* the arg can be accessed via GENSUB_ARG from the callback */
1698/* the callback must use dXSARGS/XSRETURN */
1699static SV *
1700gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1701{
1702 CV *cv = (CV *)newSV (0);
1703
1704 sv_upgrade ((SV *)cv, SVt_PVCV);
1705
1706 CvANON_on (cv);
1707 CvISXSUB_on (cv);
1708 CvXSUB (cv) = xsub;
1709 GENSUB_ARG = arg;
1710
1711 return newRV_noinc ((SV *)cv);
1712}
1713
1714/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1715 1765
1716INLINE void 1766INLINE void
1717coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1718{ 1768{
… …
1743 } 1793 }
1744 1794
1745 return 0; 1795 return 0;
1746} 1796}
1747 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
1748static int 1815static int
1749api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1750{ 1817{
1751 struct coro *coro;
1752 SV *sv_hook;
1753 void (*xs_hook)(void);
1754
1755 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1756 1819
1757 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1758 return 0; 1821 return 0;
1759 1822
1760 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1761 1824
1762 sv_hook = coro_nready ? 0 : coro_readyhook;
1763 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1764
1765 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1766 ++coro_nready;
1767 1826
1768 if (sv_hook) 1827 if (!coro_nready++)
1769 { 1828 if (coroapi.readyhook)
1770 dSP; 1829 coroapi.readyhook ();
1771
1772 ENTER;
1773 SAVETMPS;
1774
1775 PUSHMARK (SP);
1776 PUTBACK;
1777 call_sv (sv_hook, G_VOID | G_DISCARD);
1778
1779 FREETMPS;
1780 LEAVE;
1781 }
1782
1783 if (xs_hook)
1784 xs_hook ();
1785 1830
1786 return 1; 1831 return 1;
1787} 1832}
1788 1833
1789static int 1834static int
… …
1834 { 1879 {
1835 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1836 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1837 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1838 { 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
1839 ++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 */
1840 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1841 --coro_nready; 1889 --coro_nready;
1842 } 1890 }
1843 else 1891 else
1844 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1845 dSP; 1894 dSP;
1846 1895
1847 ENTER; 1896 ENTER;
1848 SAVETMPS; 1897 SAVETMPS;
1849 1898
… …
1995{ 2044{
1996 int i; 2045 int i;
1997 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1998 AV *av = newAV (); 2047 AV *av = newAV ();
1999 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
2000 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
2001 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
2003 2057
2004 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2005 2059
2006 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2007 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
… …
2097 2151
2098static void 2152static void
2099coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
2100{ 2154{
2101 dXSARGS; 2155 dXSARGS;
2102 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
2103 2157
2104 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2105 { 2159 {
2106 /* first call, set args */ 2160 /* first call, set args */
2107 SV *coro = SvRV (data); 2161 SV *coro = SvRV (data);
… …
2173 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
2174 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2175 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
2176 2230
2177 { 2231 {
2178 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2179 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
2180 2234
2181 frame->data = (void *)data; 2235 frame->data = (void *)data;
2182 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2183 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
2184 } 2238 }
… …
2188coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2189{ 2243{
2190 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2191 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2192 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2193 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2194 2248
2195 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2249 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2196 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2197 2251
2198 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
2423 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2424 { 2478 {
2425 if (items > slf_arga) 2479 if (items > slf_arga)
2426 { 2480 {
2427 slf_arga = items; 2481 slf_arga = items;
2428 free (slf_argv); 2482 Safefree (slf_argv);
2429 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2430 } 2484 }
2431 2485
2432 slf_argc = items; 2486 slf_argc = items;
2433 2487
2434 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2721{ 2775{
2722 if (items >= 2) 2776 if (items >= 2)
2723 { 2777 {
2724 /* callback form */ 2778 /* callback form */
2725 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2727 2781
2728 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2729 2783
2730 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2731 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
… …
2791{ 2845{
2792 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2793 2847
2794 if (items >= 2) 2848 if (items >= 2)
2795 { 2849 {
2796 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2797 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2798 2852
2799 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2800 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2801 2855
2802 frame->prepare = prepare_nop; 2856 frame->prepare = prepare_nop;
2803 frame->check = slf_check_nop; 2857 frame->check = slf_check_nop;
2804 } 2858 }
2805 else if (SvIVX (AvARRAY (av)[0])) 2859 else if (SvIVX (AvARRAY (av)[0]))
… …
2836 2890
2837static void 2891static void
2838coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2839{ 2893{
2840 dXSARGS; 2894 dXSARGS;
2841 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2842 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2843 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2844 2898
2845 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2846 2900
… …
2960 3014
2961 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2962 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2963 3017
2964 /* now push the callback closure */ 3018 /* now push the callback closure */
2965 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3019 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2966 3020
2967 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2968 PUTBACK; 3022 PUTBACK;
2969 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2970 } 3024 }
2971 3025
2972 /* now that the requets is going, we loop toll we have a result */ 3026 /* now that the request is going, we loop till we have a result */
2973 frame->data = (void *)state; 3027 frame->data = (void *)state;
2974 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2975 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2976} 3030}
2977 3031
… …
2988/*****************************************************************************/ 3042/*****************************************************************************/
2989 3043
2990#if CORO_CLONE 3044#if CORO_CLONE
2991# include "clone.c" 3045# include "clone.c"
2992#endif 3046#endif
3047
3048/*****************************************************************************/
3049
3050static SV *
3051coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3052{
3053 SV *coro_sv;
3054 struct coro *coro;
3055 MAGIC *mg;
3056 HV *hv;
3057 SV *cb;
3058 int i;
3059
3060 if (argc > 0)
3061 {
3062 cb = s_get_cv_croak (argv [0]);
3063
3064 if (!is_coro)
3065 {
3066 if (CvISXSUB (cb))
3067 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3068
3069 if (!CvROOT (cb))
3070 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3071 }
3072 }
3073
3074 Newz (0, coro, 1, struct coro);
3075 coro->args = newAV ();
3076 coro->flags = CF_NEW;
3077
3078 if (coro_first) coro_first->prev = coro;
3079 coro->next = coro_first;
3080 coro_first = coro;
3081
3082 coro->hv = hv = newHV ();
3083 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3084 mg->mg_flags |= MGf_DUP;
3085 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3086
3087 if (argc > 0)
3088 {
3089 av_extend (coro->args, argc + is_coro - 1);
3090
3091 if (is_coro)
3092 {
3093 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3094 cb = (SV *)cv_coro_run;
3095 }
3096
3097 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3098
3099 for (i = 1; i < argc; i++)
3100 av_push (coro->args, newSVsv (argv [i]));
3101 }
3102
3103 return coro_sv;
3104}
2993 3105
2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2995 3107
2996PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2997 3109
… …
3050 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
3051 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
3052 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
3053 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
3054 3166
3055 { 3167 time_init (aTHX);
3056 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3057
3058 if (!svp) croak ("Time::HiRes is required");
3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3060
3061 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3062
3063 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3064 u2time = INT2PTR (double (*)(), SvIV (*svp));
3065 }
3066 3168
3067 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3068} 3170}
3069 3171
3070SV * 3172SV *
3071new (char *klass, ...) 3173new (SV *klass, ...)
3072 ALIAS: 3174 ALIAS:
3073 Coro::new = 1 3175 Coro::new = 1
3074 CODE: 3176 CODE:
3075{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3076 struct coro *coro; 3178 OUTPUT:
3077 MAGIC *mg;
3078 HV *hv;
3079 CV *cb;
3080 int i;
3081
3082 if (items > 1)
3083 {
3084 cb = coro_sv_2cv (aTHX_ ST (1));
3085
3086 if (!ix)
3087 {
3088 if (CvISXSUB (cb))
3089 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3090
3091 if (!CvROOT (cb))
3092 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3093 }
3094 }
3095
3096 Newz (0, coro, 1, struct coro);
3097 coro->args = newAV ();
3098 coro->flags = CF_NEW;
3099
3100 if (coro_first) coro_first->prev = coro;
3101 coro->next = coro_first;
3102 coro_first = coro;
3103
3104 coro->hv = hv = newHV ();
3105 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3106 mg->mg_flags |= MGf_DUP;
3107 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3108
3109 if (items > 1)
3110 {
3111 av_extend (coro->args, items - 1 + ix - 1);
3112
3113 if (ix)
3114 {
3115 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3116 cb = cv_coro_run;
3117 }
3118
3119 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3120
3121 for (i = 2; i < items; i++)
3122 av_push (coro->args, newSVsv (ST (i)));
3123 }
3124}
3125 OUTPUT:
3126 RETVAL 3179 RETVAL
3127 3180
3128void 3181void
3129transfer (...) 3182transfer (...)
3130 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
3267 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
3268 OUTPUT: 3321 OUTPUT:
3269 RETVAL 3322 RETVAL
3270 3323
3271void 3324void
3272throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
3273 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
3274 CODE: 3327 CODE:
3275{ 3328{
3276 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
3277 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3278 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
3279 SvGETMAGIC (throw); 3332 SvGETMAGIC (exception);
3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3281} 3334}
3282 3335
3283void 3336void
3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3285 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
3380 3433
3381 if (expect_false (current == self)) 3434 if (expect_false (current == self))
3382 coro_times_sub (SvSTATE (coro_current)); 3435 coro_times_sub (SvSTATE (coro_current));
3383} 3436}
3384 3437
3438void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3440 CODE:
3441{
3442 struct coro *current = SvSTATE_current;
3443
3444 if (current == coro)
3445 SWAP_SVS (current);
3446
3447 if (!coro->swap_sv)
3448 coro->swap_sv = newAV ();
3449
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3452
3453 if (current == coro)
3454 SWAP_SVS (current);
3455}
3456
3457
3385MODULE = Coro::State PACKAGE = Coro 3458MODULE = Coro::State PACKAGE = Coro
3386 3459
3387BOOT: 3460BOOT:
3388{ 3461{
3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3397 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3398 3471
3399 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3472 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3400 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3401 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3474 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3402 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3403 3476
3404 coro_stash = gv_stashpv ("Coro", TRUE); 3477 coro_stash = gv_stashpv ("Coro", TRUE);
3405 3478
3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3408 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3426 sv_setiv (sv, (IV)&coroapi); 3499 sv_setiv (sv, (IV)&coroapi);
3427 SvREADONLY_on (sv); 3500 SvREADONLY_on (sv);
3428 } 3501 }
3429} 3502}
3430 3503
3504SV *
3505async (...)
3506 PROTOTYPE: &@
3507 CODE:
3508 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3509 api_ready (aTHX_ RETVAL);
3510 OUTPUT:
3511 RETVAL
3512
3431void 3513void
3432terminate (...) 3514terminate (...)
3433 CODE: 3515 CODE:
3434 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3516 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3435 3517
… …
3469_set_readyhook (SV *hook) 3551_set_readyhook (SV *hook)
3470 PROTOTYPE: $ 3552 PROTOTYPE: $
3471 CODE: 3553 CODE:
3472 SvREFCNT_dec (coro_readyhook); 3554 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook); 3555 SvGETMAGIC (hook);
3556 if (SvOK (hook))
3557 {
3474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3558 coro_readyhook = newSVsv (hook);
3559 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3560 }
3561 else
3562 {
3563 coro_readyhook = 0;
3564 CORO_READYHOOK = 0;
3565 }
3475 3566
3476int 3567int
3477prio (Coro::State coro, int newprio = 0) 3568prio (Coro::State coro, int newprio = 0)
3478 PROTOTYPE: $;$ 3569 PROTOTYPE: $;$
3479 ALIAS: 3570 ALIAS:
… …
3543 for (i = 1; i < items; ++i) 3634 for (i = 1; i < items; ++i)
3544 av_push (av, SvREFCNT_inc_NN (ST (i))); 3635 av_push (av, SvREFCNT_inc_NN (ST (i)));
3545 3636
3546 if ((SV *)hv == &PL_sv_undef) 3637 if ((SV *)hv == &PL_sv_undef)
3547 { 3638 {
3548 PUSHMARK (SP); 3639 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3549 EXTEND (SP, 2);
3550 PUSHs (sv_Coro);
3551 PUSHs ((SV *)cv_pool_handler);
3552 PUTBACK;
3553 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3554 SPAGAIN;
3555
3556 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv);
3557 } 3642 }
3558 3643
3559 { 3644 {
3560 struct coro *coro = SvSTATE_hv (hv); 3645 struct coro *coro = SvSTATE_hv (hv);
3561 3646
… …
3595 CODE: 3680 CODE:
3596{ 3681{
3597 struct coro *coro = SvSTATE_current; 3682 struct coro *coro = SvSTATE_current;
3598 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3599 3684
3600 block = (SV *)coro_sv_2cv (aTHX_ block); 3685 block = s_get_cv_croak (block);
3601 3686
3602 if (!*avp) 3687 if (!*avp)
3603 *avp = newAV (); 3688 *avp = newAV ();
3604 3689
3605 av_push (*avp, SvREFCNT_inc (block)); 3690 av_push (*avp, SvREFCNT_inc (block));
… …
3805 3890
3806void 3891void
3807_register (char *target, char *proto, SV *req) 3892_register (char *target, char *proto, SV *req)
3808 CODE: 3893 CODE:
3809{ 3894{
3810 CV *req_cv = coro_sv_2cv (aTHX_ req); 3895 SV *req_cv = s_get_cv_croak (req);
3811 /* newXSproto doesn't return the CV on 5.8 */ 3896 /* newXSproto doesn't return the CV on 5.8 */
3812 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3897 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3813 sv_setpv ((SV *)slf_cv, proto); 3898 sv_setpv ((SV *)slf_cv, proto);
3814 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3899 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3815} 3900}
3816 3901
3902MODULE = Coro::State PACKAGE = Coro::Select
3903
3904void
3905patch_pp_sselect ()
3906 CODE:
3907 if (!coro_old_pp_sselect)
3908 {
3909 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3910 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3911 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3912 }
3913
3914void
3915unpatch_pp_sselect ()
3916 CODE:
3917 if (coro_old_pp_sselect)
3918 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0;
3921 }
3922

Diff Legend

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