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.398 by root, Sat May 7 14:11:10 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
175static void (*u2time)(pTHX_ UV ret[2]); 126static void (*u2time)(pTHX_ UV ret[2]);
176 127
177/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
180 132
181static U32 cctx_gen; 133static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
201static SV *sv_pool_size; 153static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 157static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 158
208/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
209static SV *sv_activity; 160static SV *sv_activity;
210 161
211/* enable processtime/realtime profiling */ 162/* enable processtime/realtime profiling */
246 int valgrind_id; 197 int valgrind_id;
247#endif 198#endif
248 unsigned char flags; 199 unsigned char flags;
249} coro_cctx; 200} coro_cctx;
250 201
251coro_cctx *cctx_current; /* the currently running cctx */ 202static coro_cctx *cctx_current; /* the currently running cctx */
252 203
253/*****************************************************************************/ 204/*****************************************************************************/
254 205
255enum { 206enum {
256 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 213};
262 214
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 216typedef struct
265{ 217{
271#define VAR(name,type) type name; 223#define VAR(name,type) type name;
272# include "state.h" 224# include "state.h"
273#undef VAR 225#undef VAR
274} perl_slots; 226} perl_slots;
275 227
228// how many context stack entries do we need for perl_slots
276#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 230
278/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
279struct coro { 232struct coro {
280 /* the C coroutine allocated to this perl coroutine, if any */ 233 /* the C coroutine allocated to this perl coroutine, if any */
291 CV *startcv; /* the CV to execute */ 244 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 245 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */ 246 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 249
298 /* statistics */ 250 /* statistics */
299 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
300 252
301 /* coro process data */ 253 /* coro process data */
310 262
311 /* on_enter/on_leave */ 263 /* on_enter/on_leave */
312 AV *on_enter; 264 AV *on_enter;
313 AV *on_leave; 265 AV *on_leave;
314 266
267 /* swap_sv */
268 AV *swap_sv;
269
315 /* times */ 270 /* times */
316 coro_ts t_cpu, t_real; 271 coro_ts t_cpu, t_real;
317 272
318 /* linked list */ 273 /* linked list */
319 struct coro *next, *prev; 274 struct coro *next, *prev;
322typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
324 279
325/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
329 284
330/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
331 286
332#define CORO_PRIO_MAX 3 287#define CORO_PRIO_MAX 3
338 293
339/* for Coro.pm */ 294/* for Coro.pm */
340static SV *coro_current; 295static SV *coro_current;
341static SV *coro_readyhook; 296static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
344static struct coro *coro_first; 299static struct coro *coro_first;
345#define coro_nready coroapi.nready 300#define coro_nready coroapi.nready
301
302/** Coro::Select ************************************************************/
303
304static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select;
306
307/* horrible hack, but if it works... */
308static OP *
309coro_pp_sselect (pTHX)
310{
311 dSP;
312 PUSHMARK (SP - 4); /* fake argument list */
313 XPUSHs (coro_select_select);
314 PUTBACK;
315
316 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
317 PL_op->op_flags |= OPf_STACKED;
318 PL_op->op_private = 0;
319 return PL_ppaddr [OP_ENTERSUB](aTHX);
320}
321
322/** time stuff **************************************************************/
323
324#ifdef HAS_GETTIMEOFDAY
325
326static void
327coro_u2time (pTHX_ UV ret[2])
328{
329 struct timeval tv;
330 gettimeofday (&tv, 0);
331
332 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec;
334}
335
336static double
337coro_nvtime ()
338{
339 struct timeval tv;
340 gettimeofday (&tv, 0);
341
342 return tv.tv_sec + tv.tv_usec * 1e-6;
343}
344
345static void
346time_init (pTHX)
347{
348 nvtime = coro_nvtime;
349 u2time = coro_u2time;
350}
351
352#else
353
354static void
355time_init (pTHX)
356{
357 SV **svp;
358
359 require_pv ("Time/HiRes.pm");
360
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365
366 nvtime = INT2PTR (double (*)(), SvIV (*svp));
367
368 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
369 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
370}
371
372#endif
346 373
347/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
348 375
349static SV * 376static SV *
350coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
372#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 401 get_hv (name, create);
375#endif 402#endif
376 return get_hv (name, create); 403 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} 404}
392 405
393INLINE void 406INLINE void
394coro_times_update () 407coro_times_update ()
395{ 408{
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 618}
606 619
607/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
608 621
622/* swap sv heads, at least logically */
623static void
624swap_svs (pTHX_ Coro__State c)
625{
626 int i;
627
628 for (i = 0; i <= AvFILLp (c->swap_sv); )
629 {
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667}
668
669#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro))
672
609static void 673static void
610on_enterleave_call (pTHX_ SV *cb); 674on_enterleave_call (pTHX_ SV *cb);
611 675
612static void 676static void
613load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
659 int i; 723 int i;
660 724
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 727 }
728
729 SWAP_SVS (c);
664} 730}
665 731
666static void 732static void
667save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
668{ 734{
735 SWAP_SVS (c);
736
669 if (expect_false (c->on_leave)) 737 if (expect_false (c->on_leave))
670 { 738 {
671 int i; 739 int i;
672 740
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 741 for (i = AvFILLp (c->on_leave); i >= 0; --i)
731 799
732 PUTBACK; 800 PUTBACK;
733 } 801 }
734 802
735 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
737 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC;
740 { 805 {
741 unsigned int i; 806 unsigned int i;
807
742 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 809 CXINC;
744 } 810
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
746 813
747 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
748 815
749 { 816 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
771# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
772#else 839#else
773static void 840static void
774coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
775{ 842{
776 PL_curstackinfo = new_stackinfo(32, 8); 843 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 847
781 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1048{
982 return 1; 1049 return 1;
983} 1050}
984 1051
985static UNOP coro_setup_op; 1052static UNOP init_perl_op;
986 1053
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
989{ 1056{
990 /* 1057 /*
991 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
992 */ 1059 */
993 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
1000 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1069 PL_curpm = 0;
1003 PL_curpad = 0; 1070 PL_curpad = 0;
1004 PL_localizing = 0; 1071 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1072 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1074 PL_parser = 0;
1009#endif 1075#endif
1010 PL_hints = 0; 1076 PL_hints = 0;
1042 */ 1108 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 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 */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1045 1111
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* 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; 1113 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
1051 1117
1052 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
1053 1119
1054 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1056 1124
1057 if (expect_false (enable_times)) 1125 if (expect_false (enable_times))
1058 { 1126 {
1059 coro_times_update (); 1127 coro_times_update ();
1060 coro_times_sub (coro); 1128 coro_times_sub (coro);
1081 dounwind (-1); 1149 dounwind (-1);
1082 } 1150 }
1083} 1151}
1084 1152
1085static void 1153static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1087{ 1155{
1088 SV *svf [9]; 1156 SV *svf [9];
1089 1157
1090 { 1158 {
1159 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1092 1161
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1163
1095 save_perl (aTHX_ current); 1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1096 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1097 1170
1098 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1172 coro_destruct_stacks (aTHX);
1173
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1100 1176
1101 // now save some sv's to be free'd later 1177 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1178 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1179 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1180 svf [2] = GvSV (PL_errgv);
1107 svf [5] = GvSV (irsgv); 1183 svf [5] = GvSV (irsgv);
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1184 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1185 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1186 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1187 assert (9 == sizeof (svf) / sizeof (*svf));
1188
1189 SvRV_set (coro_current, old_current);
1112 1190
1113 load_perl (aTHX_ current); 1191 load_perl (aTHX_ current);
1114 } 1192 }
1115 1193
1116 { 1194 {
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1406 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1331 /* 1409 /*
1332 * Unfortunately, there is no way to get at the return values of the 1410 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1411 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1412 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1413 */
1335 1414
1336 /* 1415 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1416 * 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) 1417 * fell off the end, which seems to be the only valid (non-bug)
1425cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1426{ 1505{
1427 if (!cctx) 1506 if (!cctx)
1428 return; 1507 return;
1429 1508
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1510
1432 --cctx_count; 1511 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1434 1513
1435 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
1545 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1546 { 1625 {
1547 /* need to start coroutine */ 1626 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1628 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1551 } 1630 }
1552 else 1631 else
1553 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1554 1633
1555 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1675
1597/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1598 1677
1599static int 1678static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1680{
1602 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1603 return 0; 1682 return;
1604 1683
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1607 1685
1608 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1609 1687
1610 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1611 { 1689 {
1618 1696
1619 if (coro->mainstack 1697 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1698 && coro->mainstack != main_mainstack
1621 && coro->slot 1699 && coro->slot
1622 && !PL_dirty) 1700 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1624 1706
1625 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1711 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
1634 return 1;
1635} 1712}
1636 1713
1637static int 1714static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1716{
1687 1764
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1690} 1767}
1691 1768
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 ********************************************************************/ 1769/** Coro ********************************************************************/
1716 1770
1717INLINE void 1771INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1719{ 1773{
1744 } 1798 }
1745 1799
1746 return 0; 1800 return 0;
1747} 1801}
1748 1802
1803static void
1804invoke_sv_ready_hook_helper (void)
1805{
1806 dTHX;
1807 dSP;
1808
1809 ENTER;
1810 SAVETMPS;
1811
1812 PUSHMARK (SP);
1813 PUTBACK;
1814 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1815
1816 FREETMPS;
1817 LEAVE;
1818}
1819
1749static int 1820static int
1750api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1751{ 1822{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1757 1824
1758 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1759 return 0; 1826 return 0;
1760 1827
1761 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1762 1829
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1831
1769 if (sv_hook) 1832 if (!coro_nready++)
1770 { 1833 if (coroapi.readyhook)
1771 dSP; 1834 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 1835
1787 return 1; 1836 return 1;
1788} 1837}
1789 1838
1790static int 1839static int
1835 { 1884 {
1836 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1886 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1887 && SvOBJECT (SvRV (sv_idle)))
1839 { 1888 {
1889 if (SvRV (sv_idle) == SvRV (coro_current))
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1891
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1893 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1894 --coro_nready;
1843 } 1895 }
1844 else 1896 else
1845 { 1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1899 dSP;
1847 1900
1848 ENTER; 1901 ENTER;
1849 SAVETMPS; 1902 SAVETMPS;
1850 1903
1960 2013
1961static void 2014static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2016{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2017 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 2018
1967 if (on_destroyp) 2019 if (on_destroyp)
1968 { 2020 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1970 2024
1971 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1972 { 2026 {
1973 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
1976 PUSHMARK (SP); 2030 PUSHMARK (SP);
1977 2031
1978 if (statusp) 2032 if (statusp)
1979 { 2033 {
1980 int i; 2034 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1983 2036
1984 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1986 } 2039 }
1990 } 2043 }
1991 } 2044 }
1992} 2045}
1993 2046
1994static void 2047static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
1996{ 2049{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 2050 AV *av = newAV ();
2000 2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
2001 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
2058
2002 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
2004 2062
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064}
2006 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2069 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
2009 2071
2010 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
2012 2074
2013 /* as a minor optimisation, we could unwind all stacks here */ 2075 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2076 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2077 /*coro_unwind_stacks (aTHX);*/
2078}
2079
2080static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 HV *coro_hv = (HV *)SvRV (coro_current);
2084
2085 coro_set_status (aTHX_ coro_hv, arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087}
2088
2089static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 HV *coro_hv;
2093 struct coro *coro;
2094
2095 if (items <= 0)
2096 croak ("Coro::cancel called without coro object,");
2097
2098 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv;
2100
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1);
2102
2103 if (expect_false (coro->flags & CF_NOCANCEL))
2104 {
2105 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro;
2107
2108 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop;
2110 }
2111 else if (coro_hv == (HV *)SvRV (coro_current))
2112 {
2113 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 }
2116 else
2117 {
2118 struct coro *self = SvSTATE_current;
2119
2120 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working...
2125 */
2126 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL;
2133
2134 if (slf_frame.data)
2135 {
2136 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 }
2139 else
2140 {
2141 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop;
2143 }
2144 }
2145}
2146
2147static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{
2150 frame->prepare = 0;
2151 coro_unwind_stacks (aTHX);
2152
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154
2155 return 1;
2156}
2157
2158static int
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{
2161 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught");
2163
2164 if (coro->flags & CF_NEW)
2165 {
2166 coro_set_status (aTHX_ coro->hv, arg, items);
2167 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 }
2170 else
2171 {
2172 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174
2175 slf_destroy (aTHX_ coro);
2176
2177 coro_set_status (aTHX_ coro->hv, arg, items);
2178 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel;
2180
2181 api_ready (aTHX_ coro->hv);
2182 }
2183
2184 return 1;
2016} 2185}
2017 2186
2018/*****************************************************************************/ 2187/*****************************************************************************/
2019/* async pool handler */ 2188/* async pool handler */
2020 2189
2060 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
2061 2230
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2233 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2235 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2236 }
2070 else 2237 else
2071 { 2238 {
2072 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2098 2265
2099static void 2266static void
2100coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
2101{ 2268{
2102 dXSARGS; 2269 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
2104 2271
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2273 {
2107 /* first call, set args */ 2274 /* first call, set args */
2108 SV *coro = SvRV (data); 2275 SV *coro = SvRV (data);
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2344
2178 { 2345 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
2181 2348
2182 frame->data = (void *)data; 2349 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
2185 } 2352 }
2189coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
2190{ 2357{
2191 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2362
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2363 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2365
2199 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
2296static void 2463static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2464slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2465{
2299 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2467 frame->check = slf_check_nop;
2468}
2469
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void
2472slf_destroy (pTHX_ struct coro *coro)
2473{
2474 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477
2478 /*
2479 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions.
2483 */
2484 coro->slf_frame.prepare = 0;
2301} 2485}
2302 2486
2303/* 2487/*
2304 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2489 * function to increase chances that they all will call transfer with the same
2424 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2425 { 2609 {
2426 if (items > slf_arga) 2610 if (items > slf_arga)
2427 { 2611 {
2428 slf_arga = items; 2612 slf_arga = items;
2429 free (slf_argv); 2613 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2431 } 2615 }
2432 2616
2433 slf_argc = items; 2617 slf_argc = items;
2434 2618
2435 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
2631 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2632 } 2816 }
2633} 2817}
2634 2818
2635static void 2819static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2637{ 2821{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2640} 2824}
2641 2825
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2832 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2833 if (CORO_THROW)
2650 return 0; 2834 return 0;
2651 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2652 { 2836 {
2653 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2654 2838
2655 if (acquire) 2839 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2841 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
2701 { 2885 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2887
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2710 } 2893 }
2711} 2894}
2712 2895
2713static void 2896static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2897slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2722{ 2905{
2723 if (items >= 2) 2906 if (items >= 2)
2724 { 2907 {
2725 /* callback form */ 2908 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2911
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2913
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2792{ 2975{
2793 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2794 2977
2795 if (items >= 2) 2978 if (items >= 2)
2796 { 2979 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2982
2800 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 2985
2803 frame->prepare = prepare_nop; 2986 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 2987 frame->check = slf_check_nop;
2805 } 2988 }
2806 else if (SvIVX (AvARRAY (av)[0])) 2989 else if (SvIVX (AvARRAY (av)[0]))
2837 3020
2838static void 3021static void
2839coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2840{ 3023{
2841 dXSARGS; 3024 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2845 3028
2846 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2847 3030
2961 3144
2962 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2964 3147
2965 /* now push the callback closure */ 3148 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3149 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3150
2968 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3152 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3154 }
2972 3155
2973 /* now that the requets is going, we loop toll we have a result */ 3156 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3157 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2977} 3160}
2978 3161
2989/*****************************************************************************/ 3172/*****************************************************************************/
2990 3173
2991#if CORO_CLONE 3174#if CORO_CLONE
2992# include "clone.c" 3175# include "clone.c"
2993#endif 3176#endif
3177
3178/*****************************************************************************/
3179
3180static SV *
3181coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3182{
3183 SV *coro_sv;
3184 struct coro *coro;
3185 MAGIC *mg;
3186 HV *hv;
3187 SV *cb;
3188 int i;
3189
3190 if (argc > 0)
3191 {
3192 cb = s_get_cv_croak (argv [0]);
3193
3194 if (!is_coro)
3195 {
3196 if (CvISXSUB (cb))
3197 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3198
3199 if (!CvROOT (cb))
3200 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3201 }
3202 }
3203
3204 Newz (0, coro, 1, struct coro);
3205 coro->args = newAV ();
3206 coro->flags = CF_NEW;
3207
3208 if (coro_first) coro_first->prev = coro;
3209 coro->next = coro_first;
3210 coro_first = coro;
3211
3212 coro->hv = hv = newHV ();
3213 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3214 mg->mg_flags |= MGf_DUP;
3215 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3216
3217 if (argc > 0)
3218 {
3219 av_extend (coro->args, argc + is_coro - 1);
3220
3221 if (is_coro)
3222 {
3223 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3224 cb = (SV *)cv_coro_run;
3225 }
3226
3227 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3228
3229 for (i = 1; i < argc; i++)
3230 av_push (coro->args, newSVsv (argv [i]));
3231 }
3232
3233 return coro_sv;
3234}
2994 3235
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3237
2997PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2998 3239
3051 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3296
3056 { 3297 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 3298
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3300}
3070 3301
3071SV * 3302SV *
3072new (char *klass, ...) 3303new (SV *klass, ...)
3073 ALIAS: 3304 ALIAS:
3074 Coro::new = 1 3305 Coro::new = 1
3075 CODE: 3306 CODE:
3076{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3308 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 3309 RETVAL
3128 3310
3129void 3311void
3130transfer (...) 3312transfer (...)
3131 PROTOTYPE: $$ 3313 PROTOTYPE: $$
3132 CODE: 3314 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 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 3316
3142void 3317void
3143_exit (int code) 3318_exit (int code)
3144 PROTOTYPE: $ 3319 PROTOTYPE: $
3145 CODE: 3320 CODE:
3221 CODE: 3396 CODE:
3222{ 3397{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3399 {
3225 struct coro *current = SvSTATE_current; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
3226 3402
3227 if (current != coro) 3403 if (current != coro)
3228 { 3404 {
3229 PUTBACK; 3405 PUTBACK;
3230 save_perl (aTHX_ current); 3406 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3407 load_perl (aTHX_ coro);
3408 /* the coro is most likely in an active SLF call.
3409 * while not strictly required (the code we execute is
3410 * not allowed to call any SLF functions), it's cleaner
3411 * to reinitialise the slf_frame and restore it later.
3412 * This might one day allow us to actually do SLF calls
3413 * from code executed here.
3414 */
3415 slf_save = slf_frame;
3416 slf_frame.prepare = 0;
3232 SPAGAIN; 3417 SPAGAIN;
3233 } 3418 }
3234 3419
3235 PUSHSTACK; 3420 PUSHSTACK;
3236 3421
3246 SPAGAIN; 3431 SPAGAIN;
3247 3432
3248 if (current != coro) 3433 if (current != coro)
3249 { 3434 {
3250 PUTBACK; 3435 PUTBACK;
3436 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3438 load_perl (aTHX_ current);
3253 SPAGAIN; 3439 SPAGAIN;
3254 } 3440 }
3255 } 3441 }
3268 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3455 OUTPUT:
3270 RETVAL 3456 RETVAL
3271 3457
3272void 3458void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3275 CODE: 3461 CODE:
3276{ 3462{
3277 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3466 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3468}
3283 3469
3284void 3470void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
3341 3527
3342void 3528void
3343cancel (Coro::State self) 3529cancel (Coro::State self)
3344 CODE: 3530 CODE:
3345 coro_state_destroy (aTHX_ self); 3531 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3532
3349SV * 3533SV *
3350enable_times (int enabled = enable_times) 3534enable_times (int enabled = enable_times)
3351 CODE: 3535 CODE:
3352{ 3536{
3381 3565
3382 if (expect_false (current == self)) 3566 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3567 coro_times_sub (SvSTATE (coro_current));
3384} 3568}
3385 3569
3570void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3572 CODE:
3573{
3574 struct coro *current = SvSTATE_current;
3575
3576 if (current == coro)
3577 SWAP_SVS (current);
3578
3579 if (!coro->swap_sv)
3580 coro->swap_sv = newAV ();
3581
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3584
3585 if (current == coro)
3586 SWAP_SVS (current);
3587}
3588
3589
3386MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3387 3591
3388BOOT: 3592BOOT:
3389{ 3593{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3394 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3602
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3603 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); 3604 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); 3605 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); 3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3607
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3609
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3427 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3429 } 3632 }
3430} 3633}
3431 3634
3635SV *
3636async (...)
3637 PROTOTYPE: &@
3638 CODE:
3639 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3640 api_ready (aTHX_ RETVAL);
3641 OUTPUT:
3642 RETVAL
3643
3644void
3645_destroy (Coro::State coro)
3646 CODE:
3647 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro);
3649 coro_call_on_destroy (aTHX_ coro);
3650
3432void 3651void
3433terminate (...) 3652terminate (...)
3434 CODE: 3653 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3655
3656void
3657cancel (...)
3658 CODE:
3659 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3660
3661int
3662safe_cancel (Coro::State self, ...)
3663 C_ARGS: aTHX_ self, &ST (1), items - 1
3436 3664
3437void 3665void
3438schedule (...) 3666schedule (...)
3439 CODE: 3667 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3470_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3699 PROTOTYPE: $
3472 CODE: 3700 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3705 coro_readyhook = newSVsv (hook);
3706 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3707 }
3708 else
3709 {
3710 coro_readyhook = 0;
3711 CORO_READYHOOK = 0;
3712 }
3476 3713
3477int 3714int
3478prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3480 ALIAS: 3717 ALIAS:
3544 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3783
3547 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3548 { 3785 {
3549 PUSHMARK (SP); 3786 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)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3558 } 3789 }
3559 3790
3560 { 3791 {
3561 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3562 3793
3596 CODE: 3827 CODE:
3597{ 3828{
3598 struct coro *coro = SvSTATE_current; 3829 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3831
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3832 block = s_get_cv_croak (block);
3602 3833
3603 if (!*avp) 3834 if (!*avp)
3604 *avp = newAV (); 3835 *avp = newAV ();
3605 3836
3606 av_push (*avp, SvREFCNT_inc (block)); 3837 av_push (*avp, SvREFCNT_inc (block));
3806 4037
3807void 4038void
3808_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3809 CODE: 4040 CODE:
3810{ 4041{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4046 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 4047}
3817 4048
4049MODULE = Coro::State PACKAGE = Coro::Select
4050
4051void
4052patch_pp_sselect ()
4053 CODE:
4054 if (!coro_old_pp_sselect)
4055 {
4056 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4057 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4058 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4059 }
4060
4061void
4062unpatch_pp_sselect ()
4063 CODE:
4064 if (coro_old_pp_sselect)
4065 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0;
4068 }
4069

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines