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.393 by root, Fri Apr 29 17:38:56 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
201static SV *sv_pool_size; 152static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 156static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 157
208/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
209static SV *sv_activity; 159static SV *sv_activity;
210 160
211/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
… …
246 int valgrind_id; 196 int valgrind_id;
247#endif 197#endif
248 unsigned char flags; 198 unsigned char flags;
249} coro_cctx; 199} coro_cctx;
250 200
251coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
252 202
253/*****************************************************************************/ 203/*****************************************************************************/
254 204
255enum { 205enum {
256 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 212};
262 213
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 215typedef struct
265{ 216{
… …
291 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
297 248
298 /* statistics */ 249 /* statistics */
299 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
300 251
301 /* coro process data */ 252 /* coro process data */
… …
310 261
311 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
312 AV *on_enter; 263 AV *on_enter;
313 AV *on_leave; 264 AV *on_leave;
314 265
266 /* swap_sv */
267 AV *swap_sv;
268
315 /* times */ 269 /* times */
316 coro_ts t_cpu, t_real; 270 coro_ts t_cpu, t_real;
317 271
318 /* linked list */ 272 /* linked list */
319 struct coro *next, *prev; 273 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
324 278
325/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
329 283
330/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
331 285
332#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
344static struct coro *coro_first; 298static struct coro *coro_first;
345#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
346 300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
347/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
348 374
349static SV * 375static SV *
350coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
351{ 377{
… …
372#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 400 get_hv (name, create);
375#endif 401#endif
376 return get_hv (name, create); 402 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} 403}
392 404
393INLINE void 405INLINE void
394coro_times_update () 406coro_times_update ()
395{ 407{
… …
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 617}
606 618
607/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
608 620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
609static void 672static void
610on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
611 674
612static void 675static void
613load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
… …
659 int i; 722 int i;
660 723
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 726 }
727
728 SWAP_SVS (c);
664} 729}
665 730
666static void 731static void
667save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
668{ 733{
734 SWAP_SVS (c);
735
669 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
670 { 737 {
671 int i; 738 int i;
672 739
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
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 {
1091 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
… …
1095 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1096 load_perl (aTHX_ coro); 1164 load_perl (aTHX_ coro);
1097 1165
1098 coro_unwind_stacks (aTHX); 1166 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1167 coro_destruct_stacks (aTHX);
1168
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1100 1171
1101 // now save some sv's to be free'd later 1172 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1173 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1174 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1175 svf [2] = GvSV (PL_errgv);
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1399 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1400 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1401 perl_run (PL_curinterp);
1331 /* 1402 /*
1332 * Unfortunately, there is no way to get at the return values of the 1403 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1404 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1405 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1406 */
1335 1407
1336 /* 1408 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1409 * 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) 1410 * fell off the end, which seems to be the only valid (non-bug)
… …
1425cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1426{ 1498{
1427 if (!cctx) 1499 if (!cctx)
1428 return; 1500 return;
1429 1501
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1503
1432 --cctx_count; 1504 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1434 1506
1435 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
… …
1545 if (expect_false (next->flags & CF_NEW)) 1617 if (expect_false (next->flags & CF_NEW))
1546 { 1618 {
1547 /* need to start coroutine */ 1619 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1620 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1621 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1622 init_perl (aTHX_ next);
1551 } 1623 }
1552 else 1624 else
1553 load_perl (aTHX_ next); 1625 load_perl (aTHX_ next);
1554 1626
1555 /* possibly untie and reuse the cctx */ 1627 /* possibly untie and reuse the cctx */
… …
1603 return 0; 1675 return 0;
1604 1676
1605 if (coro->on_destroy && !PL_dirty) 1677 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1678 coro->on_destroy (aTHX_ coro);
1607 1679
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1608 coro->flags |= CF_DESTROYED; 1688 coro->flags |= CF_DESTROYED;
1609 1689
1610 if (coro->flags & CF_READY) 1690 if (coro->flags & CF_READY)
1611 { 1691 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1692 /* reduce nready, as destroying a ready coro effectively unreadies it */
… …
1618 1698
1619 if (coro->mainstack 1699 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1700 && coro->mainstack != main_mainstack
1621 && coro->slot 1701 && coro->slot
1622 && !PL_dirty) 1702 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1703 destroy_perl (aTHX_ coro);
1704
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1624 1708
1625 cctx_destroy (coro->cctx); 1709 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1710 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1711 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1713 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 1714
1634 return 1; 1715 return 1;
1635} 1716}
1636 1717
1637static int 1718static int
… …
1687 1768
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1769 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1770 TRANSFER (ta, 1);
1690} 1771}
1691 1772
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 ********************************************************************/ 1773/** Coro ********************************************************************/
1716 1774
1717INLINE void 1775INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1776coro_enq (pTHX_ struct coro *coro)
1719{ 1777{
… …
1744 } 1802 }
1745 1803
1746 return 0; 1804 return 0;
1747} 1805}
1748 1806
1807static void
1808invoke_sv_ready_hook_helper (void)
1809{
1810 dTHX;
1811 dSP;
1812
1813 ENTER;
1814 SAVETMPS;
1815
1816 PUSHMARK (SP);
1817 PUTBACK;
1818 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1819
1820 FREETMPS;
1821 LEAVE;
1822}
1823
1749static int 1824static int
1750api_ready (pTHX_ SV *coro_sv) 1825api_ready (pTHX_ SV *coro_sv)
1751{ 1826{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1827 struct coro *coro = SvSTATE (coro_sv);
1757 1828
1758 if (coro->flags & CF_READY) 1829 if (coro->flags & CF_READY)
1759 return 0; 1830 return 0;
1760 1831
1761 coro->flags |= CF_READY; 1832 coro->flags |= CF_READY;
1762 1833
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1834 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1835
1769 if (sv_hook) 1836 if (!coro_nready++)
1770 { 1837 if (coroapi.readyhook)
1771 dSP; 1838 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 1839
1787 return 1; 1840 return 1;
1788} 1841}
1789 1842
1790static int 1843static int
… …
1835 { 1888 {
1836 /* nothing to schedule: call the idle handler */ 1889 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1890 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1891 && SvOBJECT (SvRV (sv_idle)))
1839 { 1892 {
1893 if (SvRV (sv_idle) == SvRV (coro_current))
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1895
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1897 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1898 --coro_nready;
1843 } 1899 }
1844 else 1900 else
1845 { 1901 {
1902 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1903 dSP;
1847 1904
1848 ENTER; 1905 ENTER;
1849 SAVETMPS; 1906 SAVETMPS;
1850 1907
… …
1960 2017
1961static void 2018static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2019coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2020{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2021 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 2022
1967 if (on_destroyp) 2023 if (on_destroyp)
1968 { 2024 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1970 2028
1971 while (AvFILLp (on_destroy) >= 0) 2029 while (AvFILLp (on_destroy) >= 0)
1972 { 2030 {
1973 dSP; /* don't disturb outer sp */ 2031 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy); 2032 SV *cb = av_pop (on_destroy);
… …
1976 PUSHMARK (SP); 2034 PUSHMARK (SP);
1977 2035
1978 if (statusp) 2036 if (statusp)
1979 { 2037 {
1980 int i; 2038 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1); 2039 EXTEND (SP, AvFILLp (status) + 1);
1983 2040
1984 for (i = 0; i <= AvFILLp (status); ++i) 2041 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]); 2042 PUSHs (AvARRAY (status)[i]);
1986 } 2043 }
… …
1990 } 2047 }
1991 } 2048 }
1992} 2049}
1993 2050
1994static void 2051static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2052coro_set_status (HV *coro_hv, SV **arg, int items)
1996{ 2053{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 2054 AV *av = newAV ();
2000 2055
2056 /* items are actually not so common, so optimise for this case */
2057 if (items)
2058 {
2059 int i;
2060
2001 av_extend (av, items - 1); 2061 av_extend (av, items - 1);
2062
2002 for (i = 0; i < items; ++i) 2063 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2064 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 }
2004 2066
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068}
2006 2069
2070static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2073 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2074 api_ready (aTHX_ sv_manager);
2009 2075
2010 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2077 frame->check = slf_check_repeat;
2012 2078
2013 /* as a minor optimisation, we could unwind all stacks here */ 2079 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2080 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2081 /*coro_unwind_stacks (aTHX);*/
2082}
2083
2084static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv = (HV *)SvRV (coro_current);
2088
2089 coro_set_status (coro_hv, arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv);
2091}
2092
2093static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{
2096 HV *coro_hv;
2097 struct coro *coro;
2098
2099 if (items <= 0)
2100 croak ("Coro::cancel called without coro object,");
2101
2102 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv;
2104
2105 coro_set_status (coro_hv, arg + 1, items - 1);
2106
2107 if (expect_false (coro->flags & CF_NOCANCEL))
2108 {
2109 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro;
2111
2112 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop;
2114 }
2115 else if (coro_hv == (HV *)SvRV (coro_current))
2116 {
2117 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv);
2119 }
2120 else
2121 {
2122 struct coro *self = SvSTATE_current;
2123
2124 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working...
2129 */
2130 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL;
2137
2138 if (slf_frame.data)
2139 {
2140 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv);
2142 }
2143 else
2144 {
2145 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop;
2147 }
2148 }
2016} 2149}
2017 2150
2018/*****************************************************************************/ 2151/*****************************************************************************/
2019/* async pool handler */ 2152/* async pool handler */
2020 2153
… …
2098 2231
2099static void 2232static void
2100coro_rouse_callback (pTHX_ CV *cv) 2233coro_rouse_callback (pTHX_ CV *cv)
2101{ 2234{
2102 dXSARGS; 2235 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2236 SV *data = (SV *)S_GENSUB_ARG;
2104 2237
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2238 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2239 {
2107 /* first call, set args */ 2240 /* first call, set args */
2108 SV *coro = SvRV (data); 2241 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2307 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2309 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2310
2178 { 2311 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2313 SV *data = (SV *)S_GENSUB_ARG;
2181 2314
2182 frame->data = (void *)data; 2315 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2316 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2317 frame->check = slf_check_rouse_wait;
2185 } 2318 }
… …
2189coro_new_rouse_cb (pTHX) 2322coro_new_rouse_cb (pTHX)
2190{ 2323{
2191 HV *hv = (HV *)SvRV (coro_current); 2324 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2325 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2326 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2327 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2328
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2329 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2330 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2331
2199 SvREFCNT_dec (coro->rouse_cb); 2332 SvREFCNT_dec (coro->rouse_cb);
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2557 if (PL_op->op_flags & OPf_STACKED)
2425 { 2558 {
2426 if (items > slf_arga) 2559 if (items > slf_arga)
2427 { 2560 {
2428 slf_arga = items; 2561 slf_arga = items;
2429 free (slf_argv); 2562 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2563 New (0, slf_argv, slf_arga, SV *);
2431 } 2564 }
2432 2565
2433 slf_argc = items; 2566 slf_argc = items;
2434 2567
2435 for (i = 0; i < items; ++i) 2568 for (i = 0; i < items; ++i)
… …
2722{ 2855{
2723 if (items >= 2) 2856 if (items >= 2)
2724 { 2857 {
2725 /* callback form */ 2858 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2859 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2860 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2861
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2862 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2863
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2864 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2865 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2925{
2793 AV *av = (AV *)SvRV (arg [0]); 2926 AV *av = (AV *)SvRV (arg [0]);
2794 2927
2795 if (items >= 2) 2928 if (items >= 2)
2796 { 2929 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2930 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2931 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2932
2800 if (SvIVX (AvARRAY (av)[0])) 2933 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2934 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 2935
2803 frame->prepare = prepare_nop; 2936 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 2937 frame->check = slf_check_nop;
2805 } 2938 }
2806 else if (SvIVX (AvARRAY (av)[0])) 2939 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 2970
2838static void 2971static void
2839coro_aio_callback (pTHX_ CV *cv) 2972coro_aio_callback (pTHX_ CV *cv)
2840{ 2973{
2841 dXSARGS; 2974 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2975 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2976 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2977 SV *data_sv = newSV (sizeof (struct io_state));
2845 2978
2846 av_extend (state, items - 1); 2979 av_extend (state, items - 1);
2847 2980
… …
2961 3094
2962 for (i = 0; i < items; ++i) 3095 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3096 PUSHs (arg [i]);
2964 3097
2965 /* now push the callback closure */ 3098 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3099 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3100
2968 /* now call the AIO function - we assume our request is uncancelable */ 3101 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3102 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3103 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3104 }
2972 3105
2973 /* now that the requets is going, we loop toll we have a result */ 3106 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3107 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3108 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3109 frame->check = slf_check_aio_req;
2977} 3110}
2978 3111
… …
2989/*****************************************************************************/ 3122/*****************************************************************************/
2990 3123
2991#if CORO_CLONE 3124#if CORO_CLONE
2992# include "clone.c" 3125# include "clone.c"
2993#endif 3126#endif
3127
3128/*****************************************************************************/
3129
3130static SV *
3131coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3132{
3133 SV *coro_sv;
3134 struct coro *coro;
3135 MAGIC *mg;
3136 HV *hv;
3137 SV *cb;
3138 int i;
3139
3140 if (argc > 0)
3141 {
3142 cb = s_get_cv_croak (argv [0]);
3143
3144 if (!is_coro)
3145 {
3146 if (CvISXSUB (cb))
3147 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3148
3149 if (!CvROOT (cb))
3150 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3151 }
3152 }
3153
3154 Newz (0, coro, 1, struct coro);
3155 coro->args = newAV ();
3156 coro->flags = CF_NEW;
3157
3158 if (coro_first) coro_first->prev = coro;
3159 coro->next = coro_first;
3160 coro_first = coro;
3161
3162 coro->hv = hv = newHV ();
3163 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3164 mg->mg_flags |= MGf_DUP;
3165 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3166
3167 if (argc > 0)
3168 {
3169 av_extend (coro->args, argc + is_coro - 1);
3170
3171 if (is_coro)
3172 {
3173 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3174 cb = (SV *)cv_coro_run;
3175 }
3176
3177 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3178
3179 for (i = 1; i < argc; i++)
3180 av_push (coro->args, newSVsv (argv [i]));
3181 }
3182
3183 return coro_sv;
3184}
2994 3185
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3187
2997PROTOTYPES: DISABLE 3188PROTOTYPES: DISABLE
2998 3189
… …
3051 coroapi.prepare_nop = prepare_nop; 3242 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3243 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3244 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3245 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3246
3056 { 3247 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 3248
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3250}
3070 3251
3071SV * 3252SV *
3072new (char *klass, ...) 3253new (SV *klass, ...)
3073 ALIAS: 3254 ALIAS:
3074 Coro::new = 1 3255 Coro::new = 1
3075 CODE: 3256 CODE:
3076{ 3257 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3258 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 3259 RETVAL
3128 3260
3129void 3261void
3130transfer (...) 3262transfer (...)
3131 PROTOTYPE: $$ 3263 PROTOTYPE: $$
3132 CODE: 3264 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3265 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 3266
3142void 3267void
3143_exit (int code) 3268_exit (int code)
3144 PROTOTYPE: $ 3269 PROTOTYPE: $
3145 CODE: 3270 CODE:
… …
3221 CODE: 3346 CODE:
3222{ 3347{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3349 {
3225 struct coro *current = SvSTATE_current; 3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save;
3226 3352
3227 if (current != coro) 3353 if (current != coro)
3228 { 3354 {
3229 PUTBACK; 3355 PUTBACK;
3230 save_perl (aTHX_ current); 3356 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3357 load_perl (aTHX_ coro);
3358 /* the coro is most likely in an active SLF call.
3359 * while not strictly required (the code we execute is
3360 * not allowed to call any SLF functions), it's cleaner
3361 * to reinitialise the slf_frame and restore it later.
3362 * This might one day allow us to actually do SLF calls
3363 * from code executed here.
3364 */
3365 slf_save = slf_frame;
3366 slf_frame.prepare = 0;
3232 SPAGAIN; 3367 SPAGAIN;
3233 } 3368 }
3234 3369
3235 PUSHSTACK; 3370 PUSHSTACK;
3236 3371
… …
3246 SPAGAIN; 3381 SPAGAIN;
3247 3382
3248 if (current != coro) 3383 if (current != coro)
3249 { 3384 {
3250 PUTBACK; 3385 PUTBACK;
3386 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3387 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3388 load_perl (aTHX_ current);
3253 SPAGAIN; 3389 SPAGAIN;
3254 } 3390 }
3255 } 3391 }
… …
3268 RETVAL = boolSV (coro->flags & ix); 3404 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3405 OUTPUT:
3270 RETVAL 3406 RETVAL
3271 3407
3272void 3408void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3409throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3410 PROTOTYPE: $;$
3275 CODE: 3411 CODE:
3276{ 3412{
3277 struct coro *current = SvSTATE_current; 3413 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3415 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3416 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3418}
3283 3419
3284void 3420void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3422 PROTOTYPE: $;$
… …
3341 3477
3342void 3478void
3343cancel (Coro::State self) 3479cancel (Coro::State self)
3344 CODE: 3480 CODE:
3345 coro_state_destroy (aTHX_ self); 3481 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3482
3349SV * 3483SV *
3350enable_times (int enabled = enable_times) 3484enable_times (int enabled = enable_times)
3351 CODE: 3485 CODE:
3352{ 3486{
… …
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3515
3382 if (expect_false (current == self)) 3516 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3517 coro_times_sub (SvSTATE (coro_current));
3384} 3518}
3519
3520void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3522 CODE:
3523{
3524 struct coro *current = SvSTATE_current;
3525
3526 if (current == coro)
3527 SWAP_SVS (current);
3528
3529 if (!coro->swap_sv)
3530 coro->swap_sv = newAV ();
3531
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3534
3535 if (current == coro)
3536 SWAP_SVS (current);
3537}
3538
3385 3539
3386MODULE = Coro::State PACKAGE = Coro 3540MODULE = Coro::State PACKAGE = Coro
3387 3541
3388BOOT: 3542BOOT:
3389{ 3543{
… …
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3553
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3554 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); 3555 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); 3556 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); 3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3558
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3559 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3560
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3581 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3582 SvREADONLY_on (sv);
3429 } 3583 }
3430} 3584}
3431 3585
3586SV *
3587async (...)
3588 PROTOTYPE: &@
3589 CODE:
3590 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3591 api_ready (aTHX_ RETVAL);
3592 OUTPUT:
3593 RETVAL
3594
3595void
3596_destroy (Coro::State coro)
3597 CODE:
3598 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro);
3600 coro_call_on_destroy (aTHX_ coro);
3601
3432void 3602void
3433terminate (...) 3603terminate (...)
3434 CODE: 3604 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3605 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606
3607void
3608cancel (...)
3609 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3436 3611
3437void 3612void
3438schedule (...) 3613schedule (...)
3439 CODE: 3614 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3615 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3645_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3646 PROTOTYPE: $
3472 CODE: 3647 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3648 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3649 SvGETMAGIC (hook);
3650 if (SvOK (hook))
3651 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3652 coro_readyhook = newSVsv (hook);
3653 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3654 }
3655 else
3656 {
3657 coro_readyhook = 0;
3658 CORO_READYHOOK = 0;
3659 }
3476 3660
3477int 3661int
3478prio (Coro::State coro, int newprio = 0) 3662prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3663 PROTOTYPE: $;$
3480 ALIAS: 3664 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3728 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3729 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3730
3547 if ((SV *)hv == &PL_sv_undef) 3731 if ((SV *)hv == &PL_sv_undef)
3548 { 3732 {
3549 PUSHMARK (SP); 3733 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)); 3734 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3735 SvREFCNT_dec (sv);
3558 } 3736 }
3559 3737
3560 { 3738 {
3561 struct coro *coro = SvSTATE_hv (hv); 3739 struct coro *coro = SvSTATE_hv (hv);
3562 3740
… …
3596 CODE: 3774 CODE:
3597{ 3775{
3598 struct coro *coro = SvSTATE_current; 3776 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3778
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3779 block = s_get_cv_croak (block);
3602 3780
3603 if (!*avp) 3781 if (!*avp)
3604 *avp = newAV (); 3782 *avp = newAV ();
3605 3783
3606 av_push (*avp, SvREFCNT_inc (block)); 3784 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3984
3807void 3985void
3808_register (char *target, char *proto, SV *req) 3986_register (char *target, char *proto, SV *req)
3809 CODE: 3987 CODE:
3810{ 3988{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3989 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3990 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3991 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3992 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3993 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3994}
3817 3995
3996MODULE = Coro::State PACKAGE = Coro::Select
3997
3998void
3999patch_pp_sselect ()
4000 CODE:
4001 if (!coro_old_pp_sselect)
4002 {
4003 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4004 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4005 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4006 }
4007
4008void
4009unpatch_pp_sselect ()
4010 CODE:
4011 if (coro_old_pp_sselect)
4012 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0;
4015 }
4016

Diff Legend

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