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.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
117#endif 64#endif
118 65
119#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 118# endif
172#endif 119#endif
173 120
174static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
175 123
176/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
179 127
… …
200static SV *sv_pool_size; 148static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 152static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 153
207/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
208static SV *sv_activity; 155static SV *sv_activity;
209 156
210/* enable processtime/realtime profiling */ 157/* enable processtime/realtime profiling */
211static char profile_times; 158static char enable_times;
212typedef U32 coro_ts[2]; 159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
213 162
214static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
216 165
217enum { 166enum {
… …
307 256
308 /* on_enter/on_leave */ 257 /* on_enter/on_leave */
309 AV *on_enter; 258 AV *on_enter;
310 AV *on_leave; 259 AV *on_leave;
311 260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
312 /* linked list */ 267 /* linked list */
313 struct coro *next, *prev; 268 struct coro *next, *prev;
314}; 269};
315 270
316typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
… …
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
338static struct coro *coro_first; 293static struct coro *coro_first;
339#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
340 295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
315
341/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
342 317
343static SV * 318static SV *
344coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
345{ 320{
… …
368 get_hv (name, create); 343 get_hv (name, create);
369#endif 344#endif
370 return get_hv (name, create); 345 return get_hv (name, create);
371} 346}
372 347
373/* may croak */ 348INLINE void
374INLINE CV * 349coro_times_update ()
375coro_sv_2cv (pTHX_ SV *sv)
376{ 350{
377 HV *st; 351#ifdef coro_clock_gettime
378 GV *gvp; 352 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 353
381 if (!cv) 354 ts.tv_sec = ts.tv_nsec = 0;
382 croak ("code reference expected"); 355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
383 357
384 return cv; 358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
385} 393}
386 394
387/*****************************************************************************/ 395/*****************************************************************************/
388/* magic glue */ 396/* magic glue */
389 397
… …
492 AV *padlist; 500 AV *padlist;
493 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
494 502
495 /* perl manages to free our internal AV and _then_ call us */ 503 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 504 if (IN_DESTRUCT)
497 return; 505 return 0;
498 506
499 /* casting is fun. */ 507 /* casting is fun. */
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
502 510
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 560}
553 561
554/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
555 563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
556static void 615static void
557on_enterleave_call (pTHX_ SV *cb); 616on_enterleave_call (pTHX_ SV *cb);
558 617
559static void 618static void
560load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
… …
591 } 650 }
592 651
593 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 653 CORO_THROW = c->except;
595 654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
596 if (expect_false (c->on_enter)) 663 if (expect_false (c->on_enter))
597 { 664 {
598 int i; 665 int i;
599 666
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 669 }
670
671 SWAP_SVS (c);
603} 672}
604 673
605static void 674static void
606save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
607{ 676{
677 SWAP_SVS (c);
678
608 if (expect_false (c->on_leave)) 679 if (expect_false (c->on_leave))
609 { 680 {
610 int i; 681 int i;
611 682
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
614 } 693 }
615 694
616 c->except = CORO_THROW; 695 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
618 697
… …
639 { 718 {
640 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
641 720
642 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
643 { 722 {
644 EXTEND (SP, 3);
645 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
646 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
647 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
648 726
649 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
… …
667 /* we manually unroll here, as usually 2 slots is enough */ 745 /* we manually unroll here, as usually 2 slots is enough */
668 if (SLOT_COUNT >= 1) CXINC; 746 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC; 747 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC; 748 if (SLOT_COUNT >= 3) CXINC;
671 { 749 {
672 int i; 750 unsigned int i;
673 for (i = 3; i < SLOT_COUNT; ++i) 751 for (i = 3; i < SLOT_COUNT; ++i)
674 CXINC; 752 CXINC;
675 } 753 }
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 754 cxstack_ix -= SLOT_COUNT; /* undo allocation */
677 755
… …
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 989slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 990{
913 return 1; 991 return 1;
914} 992}
915 993
916static UNOP coro_setup_op; 994static UNOP init_perl_op;
917 995
918static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
919coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
920{ 998{
921 /* 999 /*
922 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
923 */ 1001 */
924 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
… …
973 */ 1051 */
974 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
975 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
976 1054
977 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
978 coro_setup_op.op_next = PL_op; 1056 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1057 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
981 /* no flags etc. required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
982 1060
983 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
984 1062
985 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
986 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
1065
1066 SWAP_SVS (coro);
1067
1068 if (expect_false (enable_times))
1069 {
1070 coro_times_update ();
1071 coro_times_sub (coro);
1072 }
987} 1073}
988 1074
989static void 1075static void
990coro_unwind_stacks (pTHX) 1076coro_unwind_stacks (pTHX)
991{ 1077{
… …
1006 dounwind (-1); 1092 dounwind (-1);
1007 } 1093 }
1008} 1094}
1009 1095
1010static void 1096static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1097destroy_perl (pTHX_ struct coro *coro)
1012{ 1098{
1013 SV *svf [9]; 1099 SV *svf [9];
1014 1100
1015 { 1101 {
1016 struct coro *current = SvSTATE_current; 1102 struct coro *current = SvSTATE_current;
… …
1020 save_perl (aTHX_ current); 1106 save_perl (aTHX_ current);
1021 load_perl (aTHX_ coro); 1107 load_perl (aTHX_ coro);
1022 1108
1023 coro_unwind_stacks (aTHX); 1109 coro_unwind_stacks (aTHX);
1024 coro_destruct_stacks (aTHX); 1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1025 1114
1026 // now save some sv's to be free'd later 1115 // now save some sv's to be free'd later
1027 svf [0] = GvSV (PL_defgv); 1116 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1117 svf [1] = (SV *)GvAV (PL_defgv);
1029 svf [2] = GvSV (PL_errgv); 1118 svf [2] = GvSV (PL_errgv);
… …
1037 1126
1038 load_perl (aTHX_ current); 1127 load_perl (aTHX_ current);
1039 } 1128 }
1040 1129
1041 { 1130 {
1042 int i; 1131 unsigned int i;
1043 1132
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1133 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1134 SvREFCNT_dec (svf [i]);
1046 1135
1047 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
… …
1253 /* somebody or something will hit me for both perl_run and PL_restartop */ 1342 /* somebody or something will hit me for both perl_run and PL_restartop */
1254 PL_restartop = PL_op; 1343 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1344 perl_run (PL_curinterp);
1256 /* 1345 /*
1257 * Unfortunately, there is no way to get at the return values of the 1346 * Unfortunately, there is no way to get at the return values of the
1258 * coro body here, as perl_run destroys these 1347 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1348 * runtime errors here, as this is just a random interpreter, not a thread.
1259 */ 1349 */
1260 1350
1261 /* 1351 /*
1262 * If perl-run returns we assume exit() was being called or the coro 1352 * If perl-run returns we assume exit() was being called or the coro
1263 * fell off the end, which seems to be the only valid (non-bug) 1353 * fell off the end, which seems to be the only valid (non-bug)
… …
1470 if (expect_false (next->flags & CF_NEW)) 1560 if (expect_false (next->flags & CF_NEW))
1471 { 1561 {
1472 /* need to start coroutine */ 1562 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1563 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1564 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1565 init_perl (aTHX_ next);
1476 } 1566 }
1477 else 1567 else
1478 load_perl (aTHX_ next); 1568 load_perl (aTHX_ next);
1479 1569
1480 /* possibly untie and reuse the cctx */ 1570 /* possibly untie and reuse the cctx */
… …
1543 1633
1544 if (coro->mainstack 1634 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1635 && coro->mainstack != main_mainstack
1546 && coro->slot 1636 && coro->slot
1547 && !PL_dirty) 1637 && !PL_dirty)
1548 coro_destruct_perl (aTHX_ coro); 1638 destroy_perl (aTHX_ coro);
1639
1640 if (coro->next) coro->next->prev = coro->prev;
1641 if (coro->prev) coro->prev->next = coro->next;
1642 if (coro == coro_first) coro_first = coro->next;
1549 1643
1550 cctx_destroy (coro->cctx); 1644 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1645 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1646 SvREFCNT_dec (coro->args);
1647 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1648 SvREFCNT_dec (CORO_THROW);
1554
1555 if (coro->next) coro->next->prev = coro->prev;
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1649
1559 return 1; 1650 return 1;
1560} 1651}
1561 1652
1562static int 1653static int
… …
1612 1703
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1615} 1706}
1616 1707
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1708/** Coro ********************************************************************/
1641 1709
1642INLINE void 1710INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1644{ 1712{
… …
1669 } 1737 }
1670 1738
1671 return 0; 1739 return 0;
1672} 1740}
1673 1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1757}
1758
1674static int 1759static int
1675api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1676{ 1761{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1682 1763
1683 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1684 return 0; 1765 return 0;
1685 1766
1686 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1687 1768
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1770
1694 if (sv_hook) 1771 if (!coro_nready++)
1695 { 1772 if (coroapi.readyhook)
1696 dSP; 1773 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1774
1712 return 1; 1775 return 1;
1713} 1776}
1714 1777
1715static int 1778static int
… …
1766 api_ready (aTHX_ SvRV (sv_idle)); 1829 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1830 --coro_nready;
1768 } 1831 }
1769 else 1832 else
1770 { 1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1835 dSP;
1772 1836
1773 ENTER; 1837 ENTER;
1774 SAVETMPS; 1838 SAVETMPS;
1775 1839
… …
1921{ 1985{
1922 int i; 1986 int i;
1923 HV *hv = (HV *)SvRV (coro_current); 1987 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV (); 1988 AV *av = newAV ();
1925 1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
1926 av_extend (av, items - 1); 1993 av_extend (av, items - 1);
1994
1927 for (i = 0; i < items; ++i) 1995 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
1929 1998
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1931 2000
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2002 api_ready (aTHX_ sv_manager);
… …
2023 2092
2024static void 2093static void
2025coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
2026{ 2095{
2027 dXSARGS; 2096 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
2029 2098
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2100 {
2032 /* first call, set args */ 2101 /* first call, set args */
2033 SV *coro = SvRV (data); 2102 SV *coro = SvRV (data);
… …
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2171
2103 { 2172 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
2106 2175
2107 frame->data = (void *)data; 2176 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
2110 } 2179 }
… …
2114coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
2115{ 2184{
2116 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2189
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2192
2124 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
… …
2647{ 2716{
2648 if (items >= 2) 2717 if (items >= 2)
2649 { 2718 {
2650 /* callback form */ 2719 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 2720 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 2722
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 2724
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 2726 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 2786{
2718 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2719 2788
2720 if (items >= 2) 2789 if (items >= 2)
2721 { 2790 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2793
2725 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727 2796
… …
2762 2831
2763static void 2832static void
2764coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2765{ 2834{
2766 dXSARGS; 2835 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2770 2839
2771 av_extend (state, items - 1); 2840 av_extend (state, items - 1);
2772 2841
… …
2886 2955
2887 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2889 2958
2890 /* now push the callback closure */ 2959 /* now push the callback closure */
2891 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2892 2961
2893 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 2963 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 2965 }
… …
2914/*****************************************************************************/ 2983/*****************************************************************************/
2915 2984
2916#if CORO_CLONE 2985#if CORO_CLONE
2917# include "clone.c" 2986# include "clone.c"
2918#endif 2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2919 3046
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3048
2922PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2923 3050
… …
2983 3110
2984 if (!svp) croak ("Time::HiRes is required"); 3111 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986 3113
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2988 } 3118 }
2989 3119
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2991} 3121}
2992 3122
2993SV * 3123SV *
2994new (char *klass, ...) 3124new (SV *klass, ...)
2995 ALIAS: 3125 ALIAS:
2996 Coro::new = 1 3126 Coro::new = 1
2997 CODE: 3127 CODE:
2998{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3129 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3130 RETVAL
3050 3131
3051void 3132void
3052transfer (...) 3133transfer (...)
3053 PROTOTYPE: $$ 3134 PROTOTYPE: $$
… …
3266 CODE: 3347 CODE:
3267 coro_state_destroy (aTHX_ self); 3348 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3269 3350
3270 3351
3352SV *
3353enable_times (int enabled = enable_times)
3354 CODE:
3355{
3356 RETVAL = boolSV (enable_times);
3357
3358 if (enabled != enable_times)
3359 {
3360 enable_times = enabled;
3361
3362 coro_times_update ();
3363 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3364 }
3365}
3366 OUTPUT:
3367 RETVAL
3368
3369void
3370times (Coro::State self)
3371 PPCODE:
3372{
3373 struct coro *current = SvSTATE (coro_current);
3374
3375 if (expect_false (current == self))
3376 {
3377 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current));
3379 }
3380
3381 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384
3385 if (expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current));
3387}
3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
3408
3271MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
3272 3410
3273BOOT: 3411BOOT:
3274{ 3412{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3422
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3427
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3429
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
3314 } 3452 }
3315} 3453}
3316 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3317void 3464void
3318terminate (...) 3465terminate (...)
3319 CODE: 3466 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3321 3468
… …
3355_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3503 PROTOTYPE: $
3357 CODE: 3504 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
3361 3517
3362int 3518int
3363prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
3365 ALIAS: 3521 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 3585 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3587
3432 if ((SV *)hv == &PL_sv_undef) 3588 if ((SV *)hv == &PL_sv_undef)
3433 { 3589 {
3434 PUSHMARK (SP); 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3592 SvREFCNT_dec (sv);
3443 } 3593 }
3444 3594
3445 { 3595 {
3446 struct coro *coro = SvSTATE_hv (hv); 3596 struct coro *coro = SvSTATE_hv (hv);
3447 3597
… …
3481 CODE: 3631 CODE:
3482{ 3632{
3483 struct coro *coro = SvSTATE_current; 3633 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 3635
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 3636 block = s_get_cv_croak (block);
3487 3637
3488 if (!*avp) 3638 if (!*avp)
3489 *avp = newAV (); 3639 *avp = newAV ();
3490 3640
3491 av_push (*avp, SvREFCNT_inc (block)); 3641 av_push (*avp, SvREFCNT_inc (block));
… …
3691 3841
3692void 3842void
3693_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3694 CODE: 3844 CODE:
3695{ 3845{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 3846 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 3851}
3702 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

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