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.254 by root, Fri Nov 7 20:27:47 2008 UTC vs.
Revision 1.295 by root, Tue Nov 18 10:35:01 2008 UTC

46# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
47#endif 47#endif
48 48
49#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
51# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
52#else
53# define REGISTER_STACK(cctx,start,end)
54#endif 51#endif
55 52
56/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
57static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
58 55
98# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
99#endif 96#endif
100#ifndef newSV 97#ifndef newSV
101# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
102#endif 99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103 103
104/* 5.8.7 */ 104/* 5.8.7 */
105#ifndef SvRV_set 105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 107#endif
119# define CORO_PREFER_PERL_FUNCTIONS 0 119# define CORO_PREFER_PERL_FUNCTIONS 0
120#endif 120#endif
121 121
122/* The next macros try to return the current stack pointer, in an as 122/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 123 * portable way as possible. */
124#if __GNUC__ >= 4
125# define dSTACKLEVEL int stacklevel_dummy
126# define STACKLEVEL __builtin_frame_address (0)
127#else
124#define dSTACKLEVEL volatile char stacklevel 128# define dSTACKLEVEL volatile void *stacklevel
125#define STACKLEVEL ((void *)&stacklevel) 129# define STACKLEVEL ((void *)&stacklevel)
130#endif
126 131
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 132#define IN_DESTRUCT (PL_main_cv == Nullcv)
128 133
129#if __GNUC__ >= 3 134#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 135# define attribute(x) __attribute__(x)
131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value)) 136# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline
133#else 138#else
134# define attribute(x) 139# define attribute(x)
135# define BARRIER
136# define expect(expr,value) (expr) 140# define expect(expr,value) (expr)
141# define INLINE static
137#endif 142#endif
138 143
139#define expect_false(expr) expect ((expr) != 0, 0) 144#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1) 145#define expect_true(expr) expect ((expr) != 0, 1)
141 146
142#define NOINLINE attribute ((noinline)) 147#define NOINLINE attribute ((noinline))
143 148
144#include "CoroAPI.h" 149#include "CoroAPI.h"
145 150
146#ifdef USE_ITHREADS 151#ifdef USE_ITHREADS
147static perl_mutex coro_lock; 152# if CORO_PTHREAD
148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0) 153static void *coro_thx;
149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
150#else
151# define LOCK (void)0
152# define UNLOCK (void)0
153#endif 154# endif
154 155#endif
155/* helper storage struct for Coro::AIO */
156struct io_state
157{
158 AV *res;
159 int errorno;
160 I32 laststype;
161 int laststatval;
162 Stat_t statcache;
163};
164 156
165static double (*nvtime)(); /* so why doesn't it take void? */ 157static double (*nvtime)(); /* so why doesn't it take void? */
158
159/* we hijack an hopefully unused CV flag for our purposes */
160#define CVf_SLF 0x4000
161static OP *pp_slf (pTHX);
166 162
167static U32 cctx_gen; 163static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 164static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 165static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 166static AV *main_mainstack; /* used to differentiate between $main and others */
197 CC_TRACE_LINE = 0x10, /* trace each statement */ 193 CC_TRACE_LINE = 0x10, /* trace each statement */
198 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 194 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
199}; 195};
200 196
201/* this is a structure representing a c-level coroutine */ 197/* this is a structure representing a c-level coroutine */
202typedef struct coro_cctx { 198typedef struct coro_cctx
199{
203 struct coro_cctx *next; 200 struct coro_cctx *next;
204 201
205 /* the stack */ 202 /* the stack */
206 void *sptr; 203 void *sptr;
207 size_t ssize; 204 size_t ssize;
225 CF_NEW = 0x0004, /* has never been switched to */ 222 CF_NEW = 0x0004, /* has never been switched to */
226 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 223 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
227}; 224};
228 225
229/* the structure where most of the perl state is stored, overlaid on the cxstack */ 226/* the structure where most of the perl state is stored, overlaid on the cxstack */
230typedef struct { 227typedef struct
228{
231 SV *defsv; 229 SV *defsv;
232 AV *defav; 230 AV *defav;
233 SV *errsv; 231 SV *errsv;
234 SV *irsgv; 232 SV *irsgv;
235#define VAR(name,type) type name; 233#define VAR(name,type) type name;
239 237
240#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 238#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
241 239
242/* this is a structure representing a perl-level coroutine */ 240/* this is a structure representing a perl-level coroutine */
243struct coro { 241struct coro {
244 /* the c coroutine allocated to this perl coroutine, if any */ 242 /* the C coroutine allocated to this perl coroutine, if any */
245 coro_cctx *cctx; 243 coro_cctx *cctx;
246 244
247 /* process data */ 245 /* state data */
246 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 247 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 248 perl_slots *slot; /* basically the saved sp */
250 249
251 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 251 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 252 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 253 HV *hv; /* the perl hash associated with this coro, if any */
254 void (*on_destroy)(pTHX_ struct coro *coro);
255 255
256 /* statistics */ 256 /* statistics */
257 int usecount; /* number of transfers to this coro */ 257 int usecount; /* number of transfers to this coro */
258 258
259 /* coro process data */ 259 /* coro process data */
267 struct coro *next, *prev; 267 struct coro *next, *prev;
268}; 268};
269 269
270typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
271typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
272
273/* the following variables are effectively part of the perl context */
274/* and get copied between struct coro and these variables */
275/* the mainr easonw e don't support windows process emulation */
276static struct CoroSLF slf_frame; /* the current slf frame */
277static SV *coro_throw;
272 278
273/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
274 280
275#define PRIO_MAX 3 281#define PRIO_MAX 3
276#define PRIO_HIGH 1 282#define PRIO_HIGH 1
280#define PRIO_MIN -4 286#define PRIO_MIN -4
281 287
282/* for Coro.pm */ 288/* for Coro.pm */
283static SV *coro_current; 289static SV *coro_current;
284static SV *coro_readyhook; 290static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 291static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
286static int coro_nready;
287static struct coro *coro_first; 292static struct coro *coro_first;
293#define coro_nready coroapi.nready
288 294
289/** lowlevel stuff **********************************************************/ 295/** lowlevel stuff **********************************************************/
290 296
291static SV * 297static SV *
292coro_get_sv (pTHX_ const char *name, int create) 298coro_get_sv (pTHX_ const char *name, int create)
377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
378 384
379 return 0; 385 return 0;
380} 386}
381 387
382#define CORO_MAGIC_type_cv PERL_MAGIC_ext 388#define CORO_MAGIC_type_cv 26
383#define CORO_MAGIC_type_state PERL_MAGIC_ext 389#define CORO_MAGIC_type_state PERL_MAGIC_ext
384 390
385static MGVTBL coro_cv_vtbl = { 391static MGVTBL coro_cv_vtbl = {
386 0, 0, 0, 0, 392 0, 0, 0, 0,
387 coro_cv_free 393 coro_cv_free
388}; 394};
389 395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
390#define CORO_MAGIC(sv, type) \ 401#define CORO_MAGIC(sv, type) \
391 SvMAGIC (sv) \ 402 (expect_true (SvMAGIC (sv)) \
392 ? SvMAGIC (sv)->mg_type == type \ 403 ? CORO_MAGIC_NN (sv, type) \
393 ? SvMAGIC (sv) \
394 : mg_find (sv, type) \
395 : 0 404 : 0)
396 405
397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
398#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
399 408
400static struct coro * 409INLINE struct coro *
401SvSTATE_ (pTHX_ SV *coro) 410SvSTATE_ (pTHX_ SV *coro)
402{ 411{
403 HV *stash; 412 HV *stash;
404 MAGIC *mg; 413 MAGIC *mg;
405 414
420 mg = CORO_MAGIC_state (coro); 429 mg = CORO_MAGIC_state (coro);
421 return (struct coro *)mg->mg_ptr; 430 return (struct coro *)mg->mg_ptr;
422} 431}
423 432
424#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
425 438
426/* the next two functions merely cache the padlists */ 439/* the next two functions merely cache the padlists */
427static void 440static void
428get_padlist (pTHX_ CV *cv) 441get_padlist (pTHX_ CV *cv)
429{ 442{
496 CvPADLIST (cv) = (AV *)POPs; 509 CvPADLIST (cv) = (AV *)POPs;
497 } 510 }
498 511
499 PUTBACK; 512 PUTBACK;
500 } 513 }
514
515 slf_frame = c->slf_frame;
516 coro_throw = c->throw;
501} 517}
502 518
503static void 519static void
504save_perl (pTHX_ Coro__State c) 520save_perl (pTHX_ Coro__State c)
505{ 521{
522 c->throw = coro_throw;
523 c->slf_frame = slf_frame;
524
506 { 525 {
507 dSP; 526 dSP;
508 I32 cxix = cxstack_ix; 527 I32 cxix = cxstack_ix;
509 PERL_CONTEXT *ccstk = cxstack; 528 PERL_CONTEXT *ccstk = cxstack;
510 PERL_SI *top_si = PL_curstackinfo; 529 PERL_SI *top_si = PL_curstackinfo;
577 #undef VAR 596 #undef VAR
578 } 597 }
579} 598}
580 599
581/* 600/*
582 * allocate various perl stacks. This is an exact copy 601 * allocate various perl stacks. This is almost an exact copy
583 * of perl.c:init_stacks, except that it uses less memory 602 * of perl.c:init_stacks, except that it uses less memory
584 * on the (sometimes correct) assumption that coroutines do 603 * on the (sometimes correct) assumption that coroutines do
585 * not usually need a lot of stackspace. 604 * not usually need a lot of stackspace.
586 */ 605 */
587#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
789 808
790 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 809 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
791} 810}
792 811
793static void 812static void
813prepare_nop (pTHX_ struct coro_transfer_args *ta)
814{
815 /* kind of mega-hacky, but works */
816 ta->next = ta->prev = (struct coro *)ta;
817}
818
819static int
820slf_check_nop (pTHX_ struct CoroSLF *frame)
821{
822 return 0;
823}
824
825static UNOP coro_setup_op;
826
827static void NOINLINE /* noinline to keep it out of the transfer fast path */
794coro_setup (pTHX_ struct coro *coro) 828coro_setup (pTHX_ struct coro *coro)
795{ 829{
796 /* 830 /*
797 * emulate part of the perl startup here. 831 * emulate part of the perl startup here.
798 */ 832 */
822 PL_rs = newSVsv (GvSV (irsgv)); 856 PL_rs = newSVsv (GvSV (irsgv));
823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
824 858
825 { 859 {
826 dSP; 860 dSP;
827 LOGOP myop; 861 UNOP myop;
828 862
829 Zero (&myop, 1, LOGOP); 863 Zero (&myop, 1, UNOP);
830 myop.op_next = Nullop; 864 myop.op_next = Nullop;
831 myop.op_flags = OPf_WANT_VOID; 865 myop.op_flags = OPf_WANT_VOID;
832 866
833 PUSHMARK (SP); 867 PUSHMARK (SP);
834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
835 PUTBACK; 869 PUTBACK;
837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
838 SPAGAIN; 872 SPAGAIN;
839 } 873 }
840 874
841 /* this newly created coroutine might be run on an existing cctx which most 875 /* this newly created coroutine might be run on an existing cctx which most
842 * likely was suspended in set_stacklevel, called from entersub. 876 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
843 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
844 * so we ENTER here for symmetry
845 */ 877 */
846 ENTER; 878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
879 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM;
884 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */
886
887 PL_op = (OP *)&coro_setup_op;
888
889 /* copy throw, in case it was set before coro_setup */
890 coro_throw = coro->throw;
847} 891}
848 892
849static void 893static void
850coro_destruct (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
851{ 895{
875 919
876 SvREFCNT_dec (PL_diehook); 920 SvREFCNT_dec (PL_diehook);
877 SvREFCNT_dec (PL_warnhook); 921 SvREFCNT_dec (PL_warnhook);
878 922
879 SvREFCNT_dec (coro->saved_deffh); 923 SvREFCNT_dec (coro->saved_deffh);
880 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro_throw);
881 925
882 coro_destruct_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
883} 927}
884 928
885static void 929INLINE void
886free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
887{ 931{
888 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
889 { 933 {
890 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
895static int 939static int
896runops_trace (pTHX) 940runops_trace (pTHX)
897{ 941{
898 COP *oldcop = 0; 942 COP *oldcop = 0;
899 int oldcxix = -2; 943 int oldcxix = -2;
900 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */ 944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
901 coro_cctx *cctx = coro->cctx; 945 coro_cctx *cctx = coro->cctx;
902 946
903 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
904 { 948 {
905 PERL_ASYNC_CHECK (); 949 PERL_ASYNC_CHECK ();
1014 1058
1015 TAINT_NOT; 1059 TAINT_NOT;
1016 return 0; 1060 return 0;
1017} 1061}
1018 1062
1019/* inject a fake call to Coro::State::_cctx_init into the execution */ 1063static struct coro_cctx *cctx_ssl_cctx;
1020/* _cctx_init should be careful, as it could be called at almost any time */ 1064static struct CoroSLF cctx_ssl_frame;
1021/* during execution of a perl program */ 1065
1066static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0;
1071}
1072
1073static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{
1076 *frame = cctx_ssl_frame;
1077
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079}
1080
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1022static void NOINLINE 1082static void NOINLINE
1023cctx_prepare (pTHX_ coro_cctx *cctx) 1083cctx_prepare (pTHX_ coro_cctx *cctx)
1024{ 1084{
1025 dSP;
1026 LOGOP myop;
1027
1028 PL_top_env = &PL_start_env; 1085 PL_top_env = &PL_start_env;
1029 1086
1030 if (cctx->flags & CC_TRACE) 1087 if (cctx->flags & CC_TRACE)
1031 PL_runops = runops_trace; 1088 PL_runops = runops_trace;
1032 1089
1033 Zero (&myop, 1, LOGOP); 1090 /* we already must be executing an SLF op, there is no other valid way
1034 myop.op_next = PL_op; 1091 * that can lead to creation of a new cctx */
1035 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1036 1094
1037 PUSHMARK (SP); 1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1038 EXTEND (SP, 2); 1096 cctx_ssl_cctx = cctx;
1039 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1097 cctx_ssl_frame = slf_frame;
1040 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1098
1041 PUTBACK; 1099 slf_frame.prepare = slf_prepare_set_stacklevel;
1042 PL_op = (OP *)&myop; 1100 slf_frame.check = slf_check_set_stacklevel;
1043 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1101}
1044 SPAGAIN; 1102
1103/* the tail of transfer: execute stuff we can only do after a transfer */
1104INLINE void
1105transfer_tail (pTHX)
1106{
1107 free_coro_mortal (aTHX);
1045} 1108}
1046 1109
1047/* 1110/*
1048 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
1049 */ 1112 */
1050static void 1113static void
1051cctx_run (void *arg) 1114cctx_run (void *arg)
1052{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
1053 dTHX; 1122 dTHX;
1054 1123
1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
1056 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
1057
1058 /* we now skip the entersub that lead to transfer() */
1059 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1060 1127
1061 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1062 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1063 1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX);
1133
1064 /* somebody or something will hit me for both perl_run and PL_restartop */ 1134 /* somebody or something will hit me for both perl_run and PL_restartop */
1065 PL_restartop = PL_op; 1135 PL_restartop = PL_op;
1066 perl_run (PL_curinterp); 1136 perl_run (PL_curinterp);
1067 1137
1068 /* 1138 /*
1069 * If perl-run returns we assume exit() was being called or the coro 1139 * If perl-run returns we assume exit() was being called or the coro
1070 * fell off the end, which seems to be the only valid (non-bug) 1140 * fell off the end, which seems to be the only valid (non-bug)
1071 * reason for perl_run to return. We try to exit by jumping to the 1141 * reason for perl_run to return. We try to exit by jumping to the
1072 * bootstrap-time "top" top_env, as we cannot restore the "main" 1142 * bootstrap-time "top" top_env, as we cannot restore the "main"
1073 * coroutine as Coro has no such concept 1143 * coroutine as Coro has no such concept
1074 */ 1144 */
1075 PL_top_env = main_top_env; 1145 PL_top_env = main_top_env;
1076 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 }
1077} 1148}
1078 1149
1079static coro_cctx * 1150static coro_cctx *
1080cctx_new () 1151cctx_new ()
1081{ 1152{
1082 coro_cctx *cctx; 1153 coro_cctx *cctx;
1154
1155 ++cctx_count;
1156 New (0, cctx, 1, coro_cctx);
1157
1158 cctx->gen = cctx_gen;
1159 cctx->flags = 0;
1160 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1161
1162 return cctx;
1163}
1164
1165/* create a new cctx only suitable as source */
1166static coro_cctx *
1167cctx_new_empty ()
1168{
1169 coro_cctx *cctx = cctx_new ();
1170
1171 cctx->sptr = 0;
1172 coro_create (&cctx->cctx, 0, 0, 0, 0);
1173
1174 return cctx;
1175}
1176
1177/* create a new cctx suitable as destination/running a perl interpreter */
1178static coro_cctx *
1179cctx_new_run ()
1180{
1181 coro_cctx *cctx = cctx_new ();
1083 void *stack_start; 1182 void *stack_start;
1084 size_t stack_size; 1183 size_t stack_size;
1085
1086 ++cctx_count;
1087 Newz (0, cctx, 1, coro_cctx);
1088
1089 cctx->gen = cctx_gen;
1090 1184
1091#if HAVE_MMAP 1185#if HAVE_MMAP
1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1186 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1093 /* mmap supposedly does allocate-on-write for us */ 1187 /* mmap supposedly does allocate-on-write for us */
1094 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1188 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1095 1189
1096 if (cctx->sptr != (void *)-1) 1190 if (cctx->sptr != (void *)-1)
1097 { 1191 {
1098# if CORO_STACKGUARD 1192 #if CORO_STACKGUARD
1099 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1193 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1100# endif 1194 #endif
1101 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1195 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1102 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1196 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1103 cctx->flags |= CC_MAPPED; 1197 cctx->flags |= CC_MAPPED;
1104 } 1198 }
1105 else 1199 else
1106#endif 1200#endif
1107 { 1201 {
1108 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1202 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1109 New (0, cctx->sptr, cctx_stacksize, long); 1203 New (0, cctx->sptr, cctx_stacksize, long);
1110 1204
1111 if (!cctx->sptr) 1205 if (!cctx->sptr)
1112 { 1206 {
1113 perror ("FATAL: unable to allocate stack for coroutine"); 1207 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1114 _exit (EXIT_FAILURE); 1208 _exit (EXIT_FAILURE);
1115 } 1209 }
1116 1210
1117 stack_start = cctx->sptr; 1211 stack_start = cctx->sptr;
1118 stack_size = cctx->ssize; 1212 stack_size = cctx->ssize;
1119 } 1213 }
1120 1214
1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1215 #if CORO_USE_VALGRIND
1216 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1217 #endif
1218
1122 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1219 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1123 1220
1124 return cctx; 1221 return cctx;
1125} 1222}
1126 1223
1134 coro_destroy (&cctx->cctx); 1231 coro_destroy (&cctx->cctx);
1135 1232
1136 /* coro_transfer creates new, empty cctx's */ 1233 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr) 1234 if (cctx->sptr)
1138 { 1235 {
1139#if CORO_USE_VALGRIND 1236 #if CORO_USE_VALGRIND
1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1237 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1141#endif 1238 #endif
1142 1239
1143#if HAVE_MMAP 1240#if HAVE_MMAP
1144 if (cctx->flags & CC_MAPPED) 1241 if (cctx->flags & CC_MAPPED)
1145 munmap (cctx->sptr, cctx->ssize); 1242 munmap (cctx->sptr, cctx->ssize);
1146 else 1243 else
1167 return cctx; 1264 return cctx;
1168 1265
1169 cctx_destroy (cctx); 1266 cctx_destroy (cctx);
1170 } 1267 }
1171 1268
1172 return cctx_new (); 1269 return cctx_new_run ();
1173} 1270}
1174 1271
1175static void 1272static void
1176cctx_put (coro_cctx *cctx) 1273cctx_put (coro_cctx *cctx)
1177{ 1274{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1275 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1179 1276
1180 /* free another cctx if overlimit */ 1277 /* free another cctx if overlimit */
1181 if (expect_false (cctx_idle >= cctx_max_idle)) 1278 if (expect_false (cctx_idle >= cctx_max_idle))
1182 { 1279 {
1183 coro_cctx *first = cctx_first; 1280 coro_cctx *first = cctx_first;
1195/** coroutine switching *****************************************************/ 1292/** coroutine switching *****************************************************/
1196 1293
1197static void 1294static void
1198transfer_check (pTHX_ struct coro *prev, struct coro *next) 1295transfer_check (pTHX_ struct coro *prev, struct coro *next)
1199{ 1296{
1297 /* TODO: throwing up here is considered harmful */
1298
1200 if (expect_true (prev != next)) 1299 if (expect_true (prev != next))
1201 { 1300 {
1202 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1203 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1302 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1204 1303
1205 if (expect_false (next->flags & CF_RUNNING)) 1304 if (expect_false (next->flags & CF_RUNNING))
1206 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1207 1306
1208 if (expect_false (next->flags & CF_DESTROYED)) 1307 if (expect_false (next->flags & CF_DESTROYED))
1209 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1308 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1210 1309
1211#if !PERL_VERSION_ATLEAST (5,10,0) 1310#if !PERL_VERSION_ATLEAST (5,10,0)
1212 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1311 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1213 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version"); 1312 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1214#endif 1313#endif
1215 } 1314 }
1216} 1315}
1217 1316
1218/* always use the TRANSFER macro */ 1317/* always use the TRANSFER macro */
1219static void NOINLINE 1318static void NOINLINE /* noinline so we have a fixed stackframe */
1220transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1221{ 1320{
1222 dSTACKLEVEL; 1321 dSTACKLEVEL;
1223 1322
1224 /* sometimes transfer is only called to set idle_sp */ 1323 /* sometimes transfer is only called to set idle_sp */
1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1228 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1229 } 1328 }
1230 else if (expect_true (prev != next)) 1329 else if (expect_true (prev != next))
1231 { 1330 {
1232 static volatile int has_throw;
1233 coro_cctx *prev__cctx; 1331 coro_cctx *prev__cctx;
1234 1332
1235 if (expect_false (prev->flags & CF_NEW)) 1333 if (expect_false (prev->flags & CF_NEW))
1236 { 1334 {
1237 /* create a new empty/source context */ 1335 /* create a new empty/source context */
1238 ++cctx_count; 1336 prev->cctx = cctx_new_empty ();
1239 New (0, prev->cctx, 1, coro_cctx);
1240 prev->cctx->sptr = 0;
1241 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1242
1243 prev->flags &= ~CF_NEW; 1337 prev->flags &= ~CF_NEW;
1244 prev->flags |= CF_RUNNING; 1338 prev->flags |= CF_RUNNING;
1245 } 1339 }
1246 1340
1247 prev->flags &= ~CF_RUNNING; 1341 prev->flags &= ~CF_RUNNING;
1248 next->flags |= CF_RUNNING; 1342 next->flags |= CF_RUNNING;
1249
1250 LOCK;
1251 1343
1252 /* first get rid of the old state */ 1344 /* first get rid of the old state */
1253 save_perl (aTHX_ prev); 1345 save_perl (aTHX_ prev);
1254 1346
1255 if (expect_false (next->flags & CF_NEW)) 1347 if (expect_false (next->flags & CF_NEW))
1262 else 1354 else
1263 load_perl (aTHX_ next); 1355 load_perl (aTHX_ next);
1264 1356
1265 prev__cctx = prev->cctx; 1357 prev__cctx = prev->cctx;
1266 1358
1267 /* possibly "free" the cctx */ 1359 /* possibly untie and reuse the cctx */
1268 if (expect_true ( 1360 if (expect_true (
1269 prev__cctx->idle_sp == STACKLEVEL 1361 prev__cctx->idle_sp == STACKLEVEL
1270 && !(prev__cctx->flags & CC_TRACE) 1362 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx 1363 && !force_cctx
1272 )) 1364 ))
1273 { 1365 {
1274 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1275 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1276 1368
1277 prev->cctx = 0; 1369 prev->cctx = 0;
1278 1370
1279 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1371 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1280 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1372 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1287 1379
1288 ++next->usecount; 1380 ++next->usecount;
1289 1381
1290 if (expect_true (!next->cctx)) 1382 if (expect_true (!next->cctx))
1291 next->cctx = cctx_get (aTHX); 1383 next->cctx = cctx_get (aTHX);
1292
1293 has_throw = !!next->throw;
1294 1384
1295 if (expect_false (prev__cctx != next->cctx)) 1385 if (expect_false (prev__cctx != next->cctx))
1296 { 1386 {
1297 prev__cctx->top_env = PL_top_env; 1387 prev__cctx->top_env = PL_top_env;
1298 PL_top_env = next->cctx->top_env; 1388 PL_top_env = next->cctx->top_env;
1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1300 } 1390 }
1301 1391
1302 free_coro_mortal (aTHX); 1392 transfer_tail (aTHX);
1303 UNLOCK;
1304
1305 if (expect_false (has_throw))
1306 {
1307 struct coro *coro = SvSTATE (coro_current);
1308
1309 if (coro->throw)
1310 {
1311 SV *exception = coro->throw;
1312 coro->throw = 0;
1313 sv_setsv (ERRSV, exception);
1314 croak (0);
1315 }
1316 }
1317 } 1393 }
1318} 1394}
1319
1320struct transfer_args
1321{
1322 struct coro *prev, *next;
1323};
1324 1395
1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1396#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1397#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1327 1398
1328/** high level stuff ********************************************************/ 1399/** high level stuff ********************************************************/
1330static int 1401static int
1331coro_state_destroy (pTHX_ struct coro *coro) 1402coro_state_destroy (pTHX_ struct coro *coro)
1332{ 1403{
1333 if (coro->flags & CF_DESTROYED) 1404 if (coro->flags & CF_DESTROYED)
1334 return 0; 1405 return 0;
1406
1407 if (coro->on_destroy)
1408 coro->on_destroy (aTHX_ coro);
1335 1409
1336 coro->flags |= CF_DESTROYED; 1410 coro->flags |= CF_DESTROYED;
1337 1411
1338 if (coro->flags & CF_READY) 1412 if (coro->flags & CF_READY)
1339 { 1413 {
1340 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1414 /* reduce nready, as destroying a ready coro effectively unreadies it */
1341 /* alternative: look through all ready queues and remove the coro */ 1415 /* alternative: look through all ready queues and remove the coro */
1342 LOCK;
1343 --coro_nready; 1416 --coro_nready;
1344 UNLOCK;
1345 } 1417 }
1346 else 1418 else
1347 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1348 1420
1349 if (coro->mainstack && coro->mainstack != main_mainstack) 1421 if (coro->mainstack && coro->mainstack != main_mainstack)
1350 { 1422 {
1351 struct coro temp; 1423 struct coro temp;
1352 1424
1353 if (coro->flags & CF_RUNNING) 1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1354 croak ("FATAL: tried to destroy currently running coroutine");
1355 1426
1356 save_perl (aTHX_ &temp); 1427 save_perl (aTHX_ &temp);
1357 load_perl (aTHX_ coro); 1428 load_perl (aTHX_ coro);
1358 1429
1359 coro_destruct (aTHX_ coro); 1430 coro_destruct (aTHX_ coro);
1410# define MGf_DUP 0 1481# define MGf_DUP 0
1411#endif 1482#endif
1412}; 1483};
1413 1484
1414static void 1485static void
1415prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1486prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1416{ 1487{
1417 ta->prev = SvSTATE (prev_sv); 1488 ta->prev = SvSTATE (prev_sv);
1418 ta->next = SvSTATE (next_sv); 1489 ta->next = SvSTATE (next_sv);
1419 TRANSFER_CHECK (*ta); 1490 TRANSFER_CHECK (*ta);
1420} 1491}
1421 1492
1422static void 1493static void
1423api_transfer (SV *prev_sv, SV *next_sv) 1494api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1424{ 1495{
1425 dTHX;
1426 struct transfer_args ta; 1496 struct coro_transfer_args ta;
1427 1497
1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1429 TRANSFER (ta, 1); 1499 TRANSFER (ta, 1);
1430} 1500}
1431 1501
1432/** Coro ********************************************************************/ 1502/** Coro ********************************************************************/
1433 1503
1434static void 1504INLINE void
1435coro_enq (pTHX_ SV *coro_sv) 1505coro_enq (pTHX_ struct coro *coro)
1436{ 1506{
1437 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv));
1438} 1508}
1439 1509
1440static SV * 1510INLINE SV *
1441coro_deq (pTHX) 1511coro_deq (pTHX)
1442{ 1512{
1443 int prio; 1513 int prio;
1444 1514
1445 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1448 1518
1449 return 0; 1519 return 0;
1450} 1520}
1451 1521
1452static int 1522static int
1453api_ready (SV *coro_sv) 1523api_ready (pTHX_ SV *coro_sv)
1454{ 1524{
1455 dTHX;
1456 struct coro *coro; 1525 struct coro *coro;
1457 SV *sv_hook; 1526 SV *sv_hook;
1458 void (*xs_hook)(void); 1527 void (*xs_hook)(void);
1459 1528
1460 if (SvROK (coro_sv)) 1529 if (SvROK (coro_sv))
1465 if (coro->flags & CF_READY) 1534 if (coro->flags & CF_READY)
1466 return 0; 1535 return 0;
1467 1536
1468 coro->flags |= CF_READY; 1537 coro->flags |= CF_READY;
1469 1538
1470 LOCK;
1471
1472 sv_hook = coro_nready ? 0 : coro_readyhook; 1539 sv_hook = coro_nready ? 0 : coro_readyhook;
1473 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1540 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1474 1541
1475 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv)); 1542 coro_enq (aTHX_ coro);
1476 ++coro_nready; 1543 ++coro_nready;
1477 1544
1478 UNLOCK;
1479
1480 if (sv_hook) 1545 if (sv_hook)
1481 { 1546 {
1482 dSP; 1547 dSP;
1483 1548
1484 ENTER; 1549 ENTER;
1485 SAVETMPS; 1550 SAVETMPS;
1486 1551
1487 PUSHMARK (SP); 1552 PUSHMARK (SP);
1488 PUTBACK; 1553 PUTBACK;
1489 call_sv (sv_hook, G_DISCARD); 1554 call_sv (sv_hook, G_VOID | G_DISCARD);
1490 SPAGAIN;
1491 1555
1492 FREETMPS; 1556 FREETMPS;
1493 LEAVE; 1557 LEAVE;
1494 } 1558 }
1495 1559
1498 1562
1499 return 1; 1563 return 1;
1500} 1564}
1501 1565
1502static int 1566static int
1503api_is_ready (SV *coro_sv) 1567api_is_ready (pTHX_ SV *coro_sv)
1504{ 1568{
1505 dTHX;
1506 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1569 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1507} 1570}
1508 1571
1509static void 1572INLINE void
1510prepare_schedule (pTHX_ struct transfer_args *ta) 1573prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1511{ 1574{
1512 SV *prev_sv, *next_sv; 1575 SV *prev_sv, *next_sv;
1513 1576
1514 for (;;) 1577 for (;;)
1515 { 1578 {
1516 LOCK;
1517 next_sv = coro_deq (aTHX); 1579 next_sv = coro_deq (aTHX);
1518 1580
1519 /* nothing to schedule: call the idle handler */ 1581 /* nothing to schedule: call the idle handler */
1520 if (expect_false (!next_sv)) 1582 if (expect_false (!next_sv))
1521 { 1583 {
1522 dSP; 1584 dSP;
1523 UNLOCK;
1524 1585
1525 ENTER; 1586 ENTER;
1526 SAVETMPS; 1587 SAVETMPS;
1527 1588
1528 PUSHMARK (SP); 1589 PUSHMARK (SP);
1529 PUTBACK; 1590 PUTBACK;
1530 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1531 SPAGAIN;
1532 1592
1533 FREETMPS; 1593 FREETMPS;
1534 LEAVE; 1594 LEAVE;
1535 continue; 1595 continue;
1536 } 1596 }
1537 1597
1538 ta->next = SvSTATE (next_sv); 1598 ta->next = SvSTATE_hv (next_sv);
1539 1599
1540 /* cannot transfer to destroyed coros, skip and look for next */ 1600 /* cannot transfer to destroyed coros, skip and look for next */
1541 if (expect_false (ta->next->flags & CF_DESTROYED)) 1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1542 { 1602 {
1543 UNLOCK;
1544 SvREFCNT_dec (next_sv); 1603 SvREFCNT_dec (next_sv);
1545 /* coro_nready is already taken care of by destroy */ 1604 /* coro_nready has already been taken care of by destroy */
1546 continue; 1605 continue;
1547 } 1606 }
1548 1607
1549 --coro_nready; 1608 --coro_nready;
1550 UNLOCK;
1551 break; 1609 break;
1552 } 1610 }
1553 1611
1554 /* free this only after the transfer */ 1612 /* free this only after the transfer */
1555 prev_sv = SvRV (coro_current); 1613 prev_sv = SvRV (coro_current);
1556 ta->prev = SvSTATE (prev_sv); 1614 ta->prev = SvSTATE_hv (prev_sv);
1557 TRANSFER_CHECK (*ta); 1615 TRANSFER_CHECK (*ta);
1558 assert (ta->next->flags & CF_READY); 1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1559 ta->next->flags &= ~CF_READY; 1617 ta->next->flags &= ~CF_READY;
1560 SvRV_set (coro_current, next_sv); 1618 SvRV_set (coro_current, next_sv);
1561 1619
1562 LOCK;
1563 free_coro_mortal (aTHX); 1620 free_coro_mortal (aTHX);
1564 coro_mortal = prev_sv; 1621 coro_mortal = prev_sv;
1565 UNLOCK;
1566} 1622}
1567 1623
1568static void 1624INLINE void
1569prepare_cede (pTHX_ struct transfer_args *ta) 1625prepare_cede (pTHX_ struct coro_transfer_args *ta)
1570{ 1626{
1571 api_ready (coro_current); 1627 api_ready (aTHX_ coro_current);
1572 prepare_schedule (aTHX_ ta); 1628 prepare_schedule (aTHX_ ta);
1573} 1629}
1574 1630
1631INLINE void
1632prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1633{
1634 SV *prev = SvRV (coro_current);
1635
1636 if (coro_nready)
1637 {
1638 prepare_schedule (aTHX_ ta);
1639 api_ready (aTHX_ prev);
1640 }
1641 else
1642 prepare_nop (aTHX_ ta);
1643}
1644
1645static void
1646api_schedule (pTHX)
1647{
1648 struct coro_transfer_args ta;
1649
1650 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1);
1652}
1653
1575static int 1654static int
1576prepare_cede_notself (pTHX_ struct transfer_args *ta) 1655api_cede (pTHX)
1577{ 1656{
1578 if (coro_nready) 1657 struct coro_transfer_args ta;
1579 { 1658
1580 SV *prev = SvRV (coro_current);
1581 prepare_schedule (aTHX_ ta); 1659 prepare_cede (aTHX_ &ta);
1582 api_ready (prev); 1660
1661 if (expect_true (ta.prev != ta.next))
1662 {
1663 TRANSFER (ta, 1);
1583 return 1; 1664 return 1;
1584 } 1665 }
1585 else 1666 else
1586 return 0; 1667 return 0;
1587} 1668}
1588 1669
1589static void
1590api_schedule (void)
1591{
1592 dTHX;
1593 struct transfer_args ta;
1594
1595 prepare_schedule (aTHX_ &ta);
1596 TRANSFER (ta, 1);
1597}
1598
1599static int 1670static int
1600api_cede (void) 1671api_cede_notself (pTHX)
1601{ 1672{
1602 dTHX; 1673 if (coro_nready)
1674 {
1603 struct transfer_args ta; 1675 struct coro_transfer_args ta;
1604 1676
1605 prepare_cede (aTHX_ &ta); 1677 prepare_cede_notself (aTHX_ &ta);
1606
1607 if (expect_true (ta.prev != ta.next))
1608 {
1609 TRANSFER (ta, 1); 1678 TRANSFER (ta, 1);
1610 return 1; 1679 return 1;
1611 } 1680 }
1612 else 1681 else
1613 return 0; 1682 return 0;
1614} 1683}
1615 1684
1616static int 1685static void
1617api_cede_notself (void)
1618{
1619 dTHX;
1620 struct transfer_args ta;
1621
1622 if (prepare_cede_notself (aTHX_ &ta))
1623 {
1624 TRANSFER (ta, 1);
1625 return 1;
1626 }
1627 else
1628 return 0;
1629}
1630
1631static void
1632api_trace (SV *coro_sv, int flags) 1686api_trace (pTHX_ SV *coro_sv, int flags)
1633{ 1687{
1634 dTHX;
1635 struct coro *coro = SvSTATE (coro_sv); 1688 struct coro *coro = SvSTATE (coro_sv);
1636 1689
1637 if (flags & CC_TRACE) 1690 if (flags & CC_TRACE)
1638 { 1691 {
1639 if (!coro->cctx) 1692 if (!coro->cctx)
1640 coro->cctx = cctx_new (); 1693 coro->cctx = cctx_new_run ();
1641 else if (!(coro->cctx->flags & CC_TRACE)) 1694 else if (!(coro->cctx->flags & CC_TRACE))
1642 croak ("cannot enable tracing on coroutine with custom stack"); 1695 croak ("cannot enable tracing on coroutine with custom stack,");
1643 1696
1644 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1645 } 1698 }
1646 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1647 { 1700 {
1652 else 1705 else
1653 coro->slot->runops = RUNOPS_DEFAULT; 1706 coro->slot->runops = RUNOPS_DEFAULT;
1654 } 1707 }
1655} 1708}
1656 1709
1710/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */
1712
1713static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1714static const CV *slf_cv;
1715static SV **slf_argv;
1716static int slf_argc, slf_arga; /* count, allocated */
1717static I32 slf_ax; /* top of stack, for restore */
1718
1719/* this restores the stack in the case we patched the entersub, to */
1720/* recreate the stack frame as perl will on following calls */
1721/* since entersub cleared the stack */
1722static OP *
1723pp_restore (pTHX)
1724{
1725 int i;
1726 SV **SP = PL_stack_base + slf_ax;
1727
1728 PUSHMARK (SP);
1729
1730 EXTEND (SP, slf_argc + 1);
1731
1732 for (i = 0; i < slf_argc; ++i)
1733 PUSHs (sv_2mortal (slf_argv [i]));
1734
1735 PUSHs ((SV *)CvGV (slf_cv));
1736
1737 RETURNOP (slf_restore.op_first);
1738}
1739
1657static int 1740static void
1658coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1741slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1659{ 1742{
1660 AV *padlist; 1743 SV **arg = (SV **)slf_frame.data;
1661 AV *av = (AV *)mg->mg_obj;
1662 1744
1663 abort (); 1745 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
1664
1665 return 0;
1666} 1746}
1667 1747
1668static MGVTBL coro_gensub_vtbl = { 1748static void
1669 0, 0, 0, 0, 1749slf_init_transfer (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1670 coro_gensub_free 1750{
1671}; 1751 if (items != 2)
1752 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1753
1754 frame->prepare = slf_prepare_transfer;
1755 frame->check = slf_check_nop;
1756 frame->data = (void *)arg; /* let's hope it will stay valid */
1757}
1758
1759static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{
1762 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop;
1764}
1765
1766static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{
1769 frame->prepare = prepare_cede;
1770 frame->check = slf_check_nop;
1771}
1772
1773static void
1774slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1775{
1776 frame->prepare = prepare_cede_notself;
1777 frame->check = slf_check_nop;
1778}
1779
1780/*
1781 * these not obviously related functions are all rolled into one
1782 * function to increase chances that they all will call transfer with the same
1783 * stack offset
1784 * SLF stands for "schedule-like-function".
1785 */
1786static OP *
1787pp_slf (pTHX)
1788{
1789 I32 checkmark; /* mark SP to see how many elements check has pushed */
1790
1791 /* set up the slf frame, unless it has already been set-up */
1792 /* the latter happens when a new coro has been started */
1793 /* or when a new cctx was attached to an existing coroutine */
1794 if (expect_true (!slf_frame.prepare))
1795 {
1796 /* first iteration */
1797 dSP;
1798 SV **arg = PL_stack_base + TOPMARK + 1;
1799 int items = SP - arg; /* args without function object */
1800 SV *gv = *sp;
1801
1802 /* do a quick consistency check on the "function" object, and if it isn't */
1803 /* for us, divert to the real entersub */
1804 if (SvTYPE (gv) != SVt_PVGV
1805 || !GvCV (gv)
1806 || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1807 return PL_ppaddr[OP_ENTERSUB](aTHX);
1808
1809 if (!(PL_op->op_flags & OPf_STACKED))
1810 {
1811 /* ampersand-form of call, use @_ instead of stack */
1812 AV *av = GvAV (PL_defgv);
1813 arg = AvARRAY (av);
1814 items = AvFILLp (av) + 1;
1815 }
1816
1817 /* now call the init function, which needs to set up slf_frame */
1818 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr)
1819 (aTHX_ &slf_frame, GvCV (gv), arg, items);
1820
1821 /* pop args */
1822 SP = PL_stack_base + POPMARK;
1823
1824 PUTBACK;
1825 }
1826
1827 /* now that we have a slf_frame, interpret it! */
1828 /* we use a callback system not to make the code needlessly */
1829 /* complicated, but so we can run multiple perl coros from one cctx */
1830
1831 do
1832 {
1833 struct coro_transfer_args ta;
1834
1835 slf_frame.prepare (aTHX_ &ta);
1836 TRANSFER (ta, 0);
1837
1838 checkmark = PL_stack_sp - PL_stack_base;
1839 }
1840 while (slf_frame.check (aTHX_ &slf_frame));
1841
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843
1844 /* return value handling - mostly like entersub */
1845 /* make sure we put something on the stack in scalar context */
1846 if (GIMME_V == G_SCALAR)
1847 {
1848 dSP;
1849 SV **bot = PL_stack_base + checkmark;
1850
1851 if (sp == bot) /* too few, push undef */
1852 bot [1] = &PL_sv_undef;
1853 else if (sp != bot + 1) /* too many, take last one */
1854 bot [1] = *sp;
1855
1856 SP = bot + 1;
1857
1858 PUTBACK;
1859 }
1860
1861 /* exception handling */
1862 if (expect_false (coro_throw))
1863 {
1864 SV *exception = sv_2mortal (coro_throw);
1865
1866 coro_throw = 0;
1867 sv_setsv (ERRSV, exception);
1868 croak (0);
1869 }
1870
1871 return NORMAL;
1872}
1873
1874static void
1875api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, I32 ax)
1876{
1877 int i;
1878 SV **arg = PL_stack_base + ax;
1879 int items = PL_stack_sp - arg + 1;
1880
1881 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1882
1883 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1884 && PL_op->op_ppaddr != pp_slf)
1885 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1886
1887 CvFLAGS (cv) |= CVf_SLF;
1888 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1889 slf_cv = cv;
1890
1891 /* we patch the op, and then re-run the whole call */
1892 /* we have to put the same argument on the stack for this to work */
1893 /* and this will be done by pp_restore */
1894 slf_restore.op_next = (OP *)&slf_restore;
1895 slf_restore.op_type = OP_CUSTOM;
1896 slf_restore.op_ppaddr = pp_restore;
1897 slf_restore.op_first = PL_op;
1898
1899 slf_ax = ax - 1; /* undo the ax++ inside dAXMARK */
1900
1901 if (PL_op->op_flags & OPf_STACKED)
1902 {
1903 if (items > slf_arga)
1904 {
1905 slf_arga = items;
1906 free (slf_argv);
1907 slf_argv = malloc (slf_arga * sizeof (SV *));
1908 }
1909
1910 slf_argc = items;
1911
1912 for (i = 0; i < items; ++i)
1913 slf_argv [i] = SvREFCNT_inc (arg [i]);
1914 }
1915 else
1916 slf_argc = 0;
1917
1918 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */
1920
1921 PL_op = (OP *)&slf_restore;
1922}
1672 1923
1673/*****************************************************************************/ 1924/*****************************************************************************/
1674/* PerlIO::cede */ 1925/* PerlIO::cede */
1675 1926
1676typedef struct 1927typedef struct
1704 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1955 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1705 double now = nvtime (); 1956 double now = nvtime ();
1706 1957
1707 if (now >= self->next) 1958 if (now >= self->next)
1708 { 1959 {
1709 api_cede (); 1960 api_cede (aTHX);
1710 self->next = now + self->every; 1961 self->next = now + self->every;
1711 } 1962 }
1712 1963
1713 return PerlIOBuf_flush (aTHX_ f); 1964 return PerlIOBuf_flush (aTHX_ f);
1714} 1965}
1743 PerlIOBuf_get_ptr, 1994 PerlIOBuf_get_ptr,
1744 PerlIOBuf_get_cnt, 1995 PerlIOBuf_get_cnt,
1745 PerlIOBuf_set_ptrcnt, 1996 PerlIOBuf_set_ptrcnt,
1746}; 1997};
1747 1998
1999/*****************************************************************************/
2000/* Coro::Semaphore */
2001
2002static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{
2005 SV *count_sv = AvARRAY (av)[0];
2006 IV count = SvIVX (count_sv);
2007
2008 count += adjust;
2009 SvIVX (count_sv) = count;
2010
2011 /* now wake up as many waiters as are expected to lock */
2012 while (count > 0 && AvFILLp (av) > 0)
2013 {
2014 SV *cb;
2015
2016 /* swap first two elements so we can shift a waiter */
2017 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av);
2020
2021 if (SvOBJECT (cb))
2022 api_ready (aTHX_ cb);
2023 else
2024 croak ("callbacks not yet supported");
2025
2026 SvREFCNT_dec (cb);
2027
2028 --count;
2029 }
2030}
2031
2032static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2034{
2035 /* call $sem->adjust (0) to possibly wake up some other waiters */
2036 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2037}
2038
2039static int
2040slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2041{
2042 AV *av = (AV *)frame->data;
2043 SV *count_sv = AvARRAY (av)[0];
2044
2045 /* if we are about to throw, don't actually acquire the lock, just throw */
2046 if (coro_throw && 0)//D
2047 return 0;
2048 else if (SvIVX (count_sv) > 0)
2049 {
2050 SvSTATE_current->on_destroy = 0;
2051 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2052 return 0;
2053 }
2054 else
2055 {
2056 int i;
2057 /* if we were woken up but can't down, we look through the whole */
2058 /* waiters list and only add us if we aren't in there already */
2059 /* this avoids some degenerate memory usage cases */
2060
2061 for (i = 1; i <= AvFILLp (av); ++i)
2062 if (AvARRAY (av)[i] == SvRV (coro_current))
2063 return 1;
2064
2065 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2066 return 1;
2067 }
2068}
2069
2070static void
2071slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2072{
2073 AV *av = (AV *)SvRV (arg [0]);
2074
2075 if (SvIVX (AvARRAY (av)[0]) > 0)
2076 {
2077 frame->data = (void *)av;
2078 frame->prepare = prepare_nop;
2079 }
2080 else
2081 {
2082 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2083
2084 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2085 frame->prepare = prepare_schedule;
2086
2087 /* to avoid race conditions when a woken-up coro gets terminated */
2088 /* we arrange for a temporary on_destroy that calls adjust (0) */
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 }
2091
2092 frame->check = slf_check_semaphore_down;
2093
2094}
2095
2096/*****************************************************************************/
2097/* gensub: simple closure generation utility */
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{
2107 CV *cv = (CV *)newSV (0);
2108
2109 sv_upgrade ((SV *)cv, SVt_PVCV);
2110
2111 CvANON_on (cv);
2112 CvISXSUB_on (cv);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115
2116 return newRV_noinc ((SV *)cv);
2117}
2118
2119/*****************************************************************************/
2120/* Coro::AIO */
2121
2122#define CORO_MAGIC_type_aio PERL_MAGIC_ext
2123
2124/* helper storage struct */
2125struct io_state
2126{
2127 int errorno;
2128 I32 laststype; /* U16 in 5.10.0 */
2129 int laststatval;
2130 Stat_t statcache;
2131};
2132
2133static void
2134coro_aio_callback (pTHX_ CV *cv)
2135{
2136 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG;
2138 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state));
2140
2141 av_extend (state, items);
2142
2143 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv);
2146
2147 {
2148 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2149
2150 data->errorno = errno;
2151 data->laststype = PL_laststype;
2152 data->laststatval = PL_laststatval;
2153 data->statcache = PL_statcache;
2154 }
2155
2156 /* now build the result vector out of all the parameters and the data_sv */
2157 {
2158 int i;
2159
2160 for (i = 0; i < items; ++i)
2161 av_push (state, SvREFCNT_inc_NN (ST (i)));
2162 }
2163
2164 av_push (state, data_sv);
2165
2166 api_ready (aTHX_ coro);
2167 SvREFCNT_dec (coro);
2168 SvREFCNT_dec ((AV *)state);
2169}
2170
2171static int
2172slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2173{
2174 AV *state = (AV *)frame->data;
2175
2176 /* one element that is an RV? repeat! */
2177 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2178 return 1;
2179
2180 /* restore status */
2181 {
2182 SV *data_sv = av_pop (state);
2183 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2184
2185 errno = data->errorno;
2186 PL_laststype = data->laststype;
2187 PL_laststatval = data->laststatval;
2188 PL_statcache = data->statcache;
2189
2190 SvREFCNT_dec (data_sv);
2191 }
2192
2193 /* push result values */
2194 {
2195 dSP;
2196 int i;
2197
2198 EXTEND (SP, AvFILLp (state) + 1);
2199 for (i = 0; i <= AvFILLp (state); ++i)
2200 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (state)[i])));
2201
2202 PUTBACK;
2203 }
2204
2205 return 0;
2206}
2207
2208static void
2209slf_init_aio_req (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2210{
2211 AV *state = (AV *)sv_2mortal ((SV *)newAV ());
2212 SV *coro_hv = SvRV (coro_current);
2213 struct coro *coro = SvSTATE_hv (coro_hv);
2214
2215 /* put our coroutine id on the state arg */
2216 av_push (state, SvREFCNT_inc_NN (coro_hv));
2217
2218 /* first see whether we have a non-zero priority and set it as AIO prio */
2219 if (coro->prio)
2220 {
2221 dSP;
2222
2223 static SV *prio_cv;
2224 static SV *prio_sv;
2225
2226 if (expect_false (!prio_cv))
2227 {
2228 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2229 prio_sv = newSViv (0);
2230 }
2231
2232 PUSHMARK (SP);
2233 sv_setiv (prio_sv, coro->prio);
2234 XPUSHs (prio_sv);
2235
2236 PUTBACK;
2237 call_sv (prio_cv, G_VOID | G_DISCARD);
2238 }
2239
2240 /* now call the original request */
2241 {
2242 dSP;
2243 CV *req = (CV *)CORO_MAGIC_NN ((SV *)cv, CORO_MAGIC_type_aio)->mg_obj;
2244 int i;
2245
2246 PUSHMARK (SP);
2247
2248 /* first push all args to the stack */
2249 EXTEND (SP, items + 1);
2250
2251 for (i = 0; i < items; ++i)
2252 PUSHs (arg [i]);
2253
2254 /* now push the callback closure */
2255 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2256
2257 /* now call the AIO function - we assume our request is uncancelable */
2258 PUTBACK;
2259 call_sv ((SV *)req, G_VOID | G_DISCARD);
2260 }
2261
2262 /* now that the requets is going, we loop toll we have a result */
2263 frame->data = (void *)state;
2264 frame->prepare = prepare_schedule;
2265 frame->check = slf_check_aio_req;
2266}
2267
2268static void
2269coro_aio_req_xs (pTHX_ CV *cv)
2270{
2271 dXSARGS;
2272
2273 CORO_EXECUTE_SLF_XS (slf_init_aio_req);
2274
2275 XSRETURN_EMPTY;
2276}
2277
2278/*****************************************************************************/
1748 2279
1749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2280MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1750 2281
1751PROTOTYPES: DISABLE 2282PROTOTYPES: DISABLE
1752 2283
1753BOOT: 2284BOOT:
1754{ 2285{
1755#ifdef USE_ITHREADS 2286#ifdef USE_ITHREADS
1756 MUTEX_INIT (&coro_lock); 2287# if CORO_PTHREAD
2288 coro_thx = PERL_GET_CONTEXT;
2289# endif
1757#endif 2290#endif
1758 BOOT_PAGESIZE; 2291 BOOT_PAGESIZE;
1759 2292
1760 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2293 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1761 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2294 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1779 main_top_env = PL_top_env; 2312 main_top_env = PL_top_env;
1780 2313
1781 while (main_top_env->je_prev) 2314 while (main_top_env->je_prev)
1782 main_top_env = main_top_env->je_prev; 2315 main_top_env = main_top_env->je_prev;
1783 2316
2317 {
2318 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2319
2320 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2321 hv_store_ent (PL_custom_op_names, slf,
2322 newSVpv ("coro_slf", 0), 0);
2323
2324 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2325 hv_store_ent (PL_custom_op_descs, slf,
2326 newSVpv ("coro schedule like function", 0), 0);
2327 }
2328
1784 coroapi.ver = CORO_API_VERSION; 2329 coroapi.ver = CORO_API_VERSION;
1785 coroapi.rev = CORO_API_REVISION; 2330 coroapi.rev = CORO_API_REVISION;
2331
1786 coroapi.transfer = api_transfer; 2332 coroapi.transfer = api_transfer;
2333
2334 coroapi.sv_state = SvSTATE_;
2335 coroapi.execute_slf = api_execute_slf;
2336 coroapi.prepare_nop = prepare_nop;
2337 coroapi.prepare_schedule = prepare_schedule;
2338 coroapi.prepare_cede = prepare_cede;
2339 coroapi.prepare_cede_notself = prepare_cede_notself;
1787 2340
1788 { 2341 {
1789 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2342 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1790 2343
1791 if (!svp) croak ("Time::HiRes is required"); 2344 if (!svp) croak ("Time::HiRes is required");
1824 av_push (coro->args, newSVsv (ST (i))); 2377 av_push (coro->args, newSVsv (ST (i)));
1825} 2378}
1826 OUTPUT: 2379 OUTPUT:
1827 RETVAL 2380 RETVAL
1828 2381
1829# these not obviously related functions are all rolled into the same xs
1830# function to increase chances that they all will call transfer with the same
1831# stack offset
1832void 2382void
1833_set_stacklevel (...) 2383transfer (...)
1834 ALIAS: 2384 PROTOTYPE: $$
1835 Coro::State::transfer = 1 2385 CODE:
1836 Coro::schedule = 2 2386 CORO_EXECUTE_SLF_XS (slf_init_transfer);
1837 Coro::cede = 3
1838 Coro::cede_notself = 4
1839 CODE:
1840{
1841 struct transfer_args ta;
1842
1843 PUTBACK;
1844 switch (ix)
1845 {
1846 case 0:
1847 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1848 ta.next = 0;
1849 break;
1850
1851 case 1:
1852 if (items != 2)
1853 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1854
1855 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1856 break;
1857
1858 case 2:
1859 prepare_schedule (aTHX_ &ta);
1860 break;
1861
1862 case 3:
1863 prepare_cede (aTHX_ &ta);
1864 break;
1865
1866 case 4:
1867 if (!prepare_cede_notself (aTHX_ &ta))
1868 XSRETURN_EMPTY;
1869
1870 break;
1871 }
1872 SPAGAIN;
1873
1874 BARRIER;
1875 PUTBACK;
1876 TRANSFER (ta, 0);
1877 SPAGAIN; /* might be the sp of a different coroutine now */
1878 /* be extra careful not to ever do anything after TRANSFER */
1879}
1880 2387
1881bool 2388bool
1882_destroy (SV *coro_sv) 2389_destroy (SV *coro_sv)
1883 CODE: 2390 CODE:
1884 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2391 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1891 CODE: 2398 CODE:
1892 _exit (code); 2399 _exit (code);
1893 2400
1894int 2401int
1895cctx_stacksize (int new_stacksize = 0) 2402cctx_stacksize (int new_stacksize = 0)
2403 PROTOTYPE: ;$
1896 CODE: 2404 CODE:
1897 RETVAL = cctx_stacksize; 2405 RETVAL = cctx_stacksize;
1898 if (new_stacksize) 2406 if (new_stacksize)
1899 { 2407 {
1900 cctx_stacksize = new_stacksize; 2408 cctx_stacksize = new_stacksize;
1903 OUTPUT: 2411 OUTPUT:
1904 RETVAL 2412 RETVAL
1905 2413
1906int 2414int
1907cctx_max_idle (int max_idle = 0) 2415cctx_max_idle (int max_idle = 0)
2416 PROTOTYPE: ;$
1908 CODE: 2417 CODE:
1909 RETVAL = cctx_max_idle; 2418 RETVAL = cctx_max_idle;
1910 if (max_idle > 1) 2419 if (max_idle > 1)
1911 cctx_max_idle = max_idle; 2420 cctx_max_idle = max_idle;
1912 OUTPUT: 2421 OUTPUT:
1913 RETVAL 2422 RETVAL
1914 2423
1915int 2424int
1916cctx_count () 2425cctx_count ()
2426 PROTOTYPE:
1917 CODE: 2427 CODE:
1918 RETVAL = cctx_count; 2428 RETVAL = cctx_count;
1919 OUTPUT: 2429 OUTPUT:
1920 RETVAL 2430 RETVAL
1921 2431
1922int 2432int
1923cctx_idle () 2433cctx_idle ()
2434 PROTOTYPE:
1924 CODE: 2435 CODE:
1925 RETVAL = cctx_idle; 2436 RETVAL = cctx_idle;
1926 OUTPUT: 2437 OUTPUT:
1927 RETVAL 2438 RETVAL
1928 2439
1929void 2440void
1930list () 2441list ()
2442 PROTOTYPE:
1931 PPCODE: 2443 PPCODE:
1932{ 2444{
1933 struct coro *coro; 2445 struct coro *coro;
1934 for (coro = coro_first; coro; coro = coro->next) 2446 for (coro = coro_first; coro; coro = coro->next)
1935 if (coro->hv) 2447 if (coro->hv)
1994 RETVAL = boolSV (coro->flags & ix); 2506 RETVAL = boolSV (coro->flags & ix);
1995 OUTPUT: 2507 OUTPUT:
1996 RETVAL 2508 RETVAL
1997 2509
1998void 2510void
2511throw (Coro::State self, SV *throw = &PL_sv_undef)
2512 PROTOTYPE: $;$
2513 CODE:
2514{
2515 struct coro *current = SvSTATE_current;
2516 SV **throwp = self == current ? &coro_throw : &self->throw;
2517 SvREFCNT_dec (*throwp);
2518 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2519}
2520
2521void
1999api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2522api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2523 PROTOTYPE: $;$
2524 C_ARGS: aTHX_ coro, flags
2000 2525
2001SV * 2526SV *
2002has_cctx (Coro::State coro) 2527has_cctx (Coro::State coro)
2003 PROTOTYPE: $ 2528 PROTOTYPE: $
2004 CODE: 2529 CODE:
2012 CODE: 2537 CODE:
2013 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2538 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
2014 OUTPUT: 2539 OUTPUT:
2015 RETVAL 2540 RETVAL
2016 2541
2017IV 2542UV
2018rss (Coro::State coro) 2543rss (Coro::State coro)
2019 PROTOTYPE: $ 2544 PROTOTYPE: $
2020 ALIAS: 2545 ALIAS:
2021 usecount = 1 2546 usecount = 1
2022 CODE: 2547 CODE:
2028 OUTPUT: 2553 OUTPUT:
2029 RETVAL 2554 RETVAL
2030 2555
2031void 2556void
2032force_cctx () 2557force_cctx ()
2558 PROTOTYPE:
2033 CODE: 2559 CODE:
2034 struct coro *coro = SvSTATE (coro_current);
2035 coro->cctx->idle_sp = 0; 2560 SvSTATE_current->cctx->idle_sp = 0;
2036 2561
2037void 2562void
2038swap_defsv (Coro::State self) 2563swap_defsv (Coro::State self)
2039 PROTOTYPE: $ 2564 PROTOTYPE: $
2040 ALIAS: 2565 ALIAS:
2041 swap_defav = 1 2566 swap_defav = 1
2042 CODE: 2567 CODE:
2043 if (!self->slot) 2568 if (!self->slot)
2044 croak ("cannot swap state with coroutine that has no saved state"); 2569 croak ("cannot swap state with coroutine that has no saved state,");
2045 else 2570 else
2046 { 2571 {
2047 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2572 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2048 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2573 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2049 2574
2050 SV *tmp = *src; *src = *dst; *dst = tmp; 2575 SV *tmp = *src; *src = *dst; *dst = tmp;
2051 } 2576 }
2577
2052 2578
2053MODULE = Coro::State PACKAGE = Coro 2579MODULE = Coro::State PACKAGE = Coro
2054 2580
2055BOOT: 2581BOOT:
2056{ 2582{
2074 2600
2075 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2601 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2076 coro_ready[i] = newAV (); 2602 coro_ready[i] = newAV ();
2077 2603
2078 { 2604 {
2079 SV *sv = perl_get_sv ("Coro::API", TRUE); 2605 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2080 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2081 2606
2082 coroapi.schedule = api_schedule; 2607 coroapi.schedule = api_schedule;
2083 coroapi.cede = api_cede; 2608 coroapi.cede = api_cede;
2084 coroapi.cede_notself = api_cede_notself; 2609 coroapi.cede_notself = api_cede_notself;
2085 coroapi.ready = api_ready; 2610 coroapi.ready = api_ready;
2086 coroapi.is_ready = api_is_ready; 2611 coroapi.is_ready = api_is_ready;
2087 coroapi.nready = &coro_nready; 2612 coroapi.nready = coro_nready;
2088 coroapi.current = coro_current; 2613 coroapi.current = coro_current;
2089 2614
2090 GCoroAPI = &coroapi; 2615 GCoroAPI = &coroapi;
2091 sv_setiv (sv, (IV)&coroapi); 2616 sv_setiv (sv, (IV)&coroapi);
2092 SvREADONLY_on (sv); 2617 SvREADONLY_on (sv);
2093 } 2618 }
2094} 2619}
2620
2621void
2622schedule (...)
2623 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2625
2626void
2627cede (...)
2628 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_cede);
2630
2631void
2632cede_notself (...)
2633 CODE:
2634 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
2095 2635
2096void 2636void
2097_set_current (SV *current) 2637_set_current (SV *current)
2098 PROTOTYPE: $ 2638 PROTOTYPE: $
2099 CODE: 2639 CODE:
2102 2642
2103void 2643void
2104_set_readyhook (SV *hook) 2644_set_readyhook (SV *hook)
2105 PROTOTYPE: $ 2645 PROTOTYPE: $
2106 CODE: 2646 CODE:
2107 LOCK;
2108 SvREFCNT_dec (coro_readyhook); 2647 SvREFCNT_dec (coro_readyhook);
2109 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 2648 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2110 UNLOCK;
2111 2649
2112int 2650int
2113prio (Coro::State coro, int newprio = 0) 2651prio (Coro::State coro, int newprio = 0)
2652 PROTOTYPE: $;$
2114 ALIAS: 2653 ALIAS:
2115 nice = 1 2654 nice = 1
2116 CODE: 2655 CODE:
2117{ 2656{
2118 RETVAL = coro->prio; 2657 RETVAL = coro->prio;
2133 2672
2134SV * 2673SV *
2135ready (SV *self) 2674ready (SV *self)
2136 PROTOTYPE: $ 2675 PROTOTYPE: $
2137 CODE: 2676 CODE:
2138 RETVAL = boolSV (api_ready (self)); 2677 RETVAL = boolSV (api_ready (aTHX_ self));
2139 OUTPUT: 2678 OUTPUT:
2140 RETVAL 2679 RETVAL
2141 2680
2142int 2681int
2143nready (...) 2682nready (...)
2145 CODE: 2684 CODE:
2146 RETVAL = coro_nready; 2685 RETVAL = coro_nready;
2147 OUTPUT: 2686 OUTPUT:
2148 RETVAL 2687 RETVAL
2149 2688
2150void
2151throw (Coro::State self, SV *throw = &PL_sv_undef)
2152 PROTOTYPE: $;$
2153 CODE:
2154 SvREFCNT_dec (self->throw);
2155 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2156
2157# for async_pool speedup 2689# for async_pool speedup
2158void 2690void
2159_pool_1 (SV *cb) 2691_pool_1 (SV *cb)
2160 CODE: 2692 CODE:
2161{ 2693{
2162 struct coro *coro = SvSTATE (coro_current);
2163 HV *hv = (HV *)SvRV (coro_current); 2694 HV *hv = (HV *)SvRV (coro_current);
2695 struct coro *coro = SvSTATE_hv ((SV *)hv);
2164 AV *defav = GvAV (PL_defgv); 2696 AV *defav = GvAV (PL_defgv);
2165 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2697 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2166 AV *invoke_av; 2698 AV *invoke_av;
2167 int i, len; 2699 int i, len;
2168 2700
2189 { 2721 {
2190 av_fill (defav, len - 1); 2722 av_fill (defav, len - 1);
2191 for (i = 0; i < len; ++i) 2723 for (i = 0; i < len; ++i)
2192 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 2724 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2193 } 2725 }
2194
2195 SvREFCNT_dec (invoke);
2196} 2726}
2197 2727
2198void 2728void
2199_pool_2 (SV *cb) 2729_pool_2 (SV *cb)
2200 CODE: 2730 CODE:
2201{ 2731{
2202 struct coro *coro = SvSTATE (coro_current); 2732 HV *hv = (HV *)SvRV (coro_current);
2733 struct coro *coro = SvSTATE_hv ((SV *)hv);
2203 2734
2204 sv_setsv (cb, &PL_sv_undef); 2735 sv_setsv (cb, &PL_sv_undef);
2205 2736
2206 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2737 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2207 coro->saved_deffh = 0; 2738 coro->saved_deffh = 0;
2208 2739
2209 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2740 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2210 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2741 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2211 { 2742 {
2212 SV *old = PL_diehook; 2743 SV *old = PL_diehook;
2213 PL_diehook = 0; 2744 PL_diehook = 0;
2214 SvREFCNT_dec (old); 2745 SvREFCNT_dec (old);
2215 croak ("\3async_pool terminate\2\n"); 2746 croak ("\3async_pool terminate\2\n");
2216 } 2747 }
2217 2748
2218 av_clear (GvAV (PL_defgv)); 2749 av_clear (GvAV (PL_defgv));
2219 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2750 hv_store (hv, "desc", sizeof ("desc") - 1,
2220 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2221 2752
2222 coro->prio = 0; 2753 coro->prio = 0;
2223 2754
2224 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2755 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2225 api_trace (coro_current, 0); 2756 api_trace (aTHX_ coro_current, 0);
2226 2757
2227 av_push (av_async_pool, newSVsv (coro_current)); 2758 av_push (av_async_pool, newSVsv (coro_current));
2228} 2759}
2229 2760
2230#if 0
2231 2761
2232void 2762MODULE = Coro::State PACKAGE = PerlIO::cede
2233_generator_call (...) 2763
2234 PROTOTYPE: @ 2764BOOT:
2235 PPCODE: 2765 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2236 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr); 2766
2237 xxxx 2767
2238 abort (); 2768MODULE = Coro::State PACKAGE = Coro::Semaphore
2239 2769
2240SV * 2770SV *
2241gensub (SV *sub, ...) 2771new (SV *klass, SV *count_ = 0)
2242 PROTOTYPE: &;@ 2772 CODE:
2243 CODE:
2244{ 2773{
2245 struct coro *coro; 2774 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2246 MAGIC *mg; 2775 AV *av = newAV ();
2247 CV *xcv; 2776 SV **ary;
2248 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2249 int i;
2250 2777
2251 CvGV (ncv) = CvGV (cv); 2778 /* unfortunately, building manually saves memory */
2252 CvFILE (ncv) = CvFILE (cv); 2779 Newx (ary, 2, SV *);
2780 AvALLOC (av) = ary;
2781 AvARRAY (av) = ary;
2782 AvMAX (av) = 1;
2783 AvFILLp (av) = 0;
2784 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2253 2785
2254 Newz (0, coro, 1, struct coro); 2786 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2255 coro->args = newAV ();
2256 coro->flags = CF_NEW;
2257
2258 av_extend (coro->args, items - 1);
2259 for (i = 1; i < items; i++)
2260 av_push (coro->args, newSVsv (ST (i)));
2261
2262 CvISXSUB_on (ncv);
2263 CvXSUBANY (ncv).any_ptr = (void *)coro;
2264
2265 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2266
2267 CvXSUB (ncv) = CvXSUB (xcv);
2268 CvANON_on (ncv);
2269
2270 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2271 RETVAL = newRV_noinc ((SV *)ncv);
2272} 2787}
2273 OUTPUT: 2788 OUTPUT:
2274 RETVAL 2789 RETVAL
2275 2790
2276#endif 2791SV *
2277 2792count (SV *self)
2278 2793 CODE:
2279MODULE = Coro::State PACKAGE = Coro::AIO 2794 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2795 OUTPUT:
2796 RETVAL
2280 2797
2281void 2798void
2282_get_state (SV *self) 2799up (SV *self, int adjust = 1)
2283 PPCODE: 2800 ALIAS:
2284{ 2801 adjust = 1
2285 AV *defav = GvAV (PL_defgv); 2802 CODE:
2286 AV *av = newAV (); 2803 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2287 int i;
2288 SV *data_sv = newSV (sizeof (struct io_state));
2289 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2290 SvCUR_set (data_sv, sizeof (struct io_state));
2291 SvPOK_only (data_sv);
2292
2293 data->errorno = errno;
2294 data->laststype = PL_laststype;
2295 data->laststatval = PL_laststatval;
2296 data->statcache = PL_statcache;
2297
2298 av_extend (av, AvFILLp (defav) + 1 + 1);
2299
2300 for (i = 0; i <= AvFILLp (defav); ++i)
2301 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2302
2303 av_push (av, data_sv);
2304
2305 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2306
2307 api_ready (self);
2308}
2309 2804
2310void 2805void
2311_set_state (SV *state) 2806down (SV *self)
2312 PROTOTYPE: $ 2807 CODE:
2313 PPCODE: 2808 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2809
2810void
2811try (SV *self)
2812 PPCODE:
2314{ 2813{
2315 AV *av = (AV *)SvRV (state); 2814 AV *av = (AV *)SvRV (self);
2316 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]); 2815 SV *count_sv = AvARRAY (av)[0];
2816 IV count = SvIVX (count_sv);
2817
2818 if (count > 0)
2819 {
2820 --count;
2821 SvIVX (count_sv) = count;
2822 XSRETURN_YES;
2823 }
2824 else
2825 XSRETURN_NO;
2826}
2827
2828void
2829waiters (SV *self)
2830 CODE:
2831{
2832 AV *av = (AV *)SvRV (self);
2833
2834 if (GIMME_V == G_SCALAR)
2835 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2836 else
2837 {
2317 int i; 2838 int i;
2318
2319 errno = data->errorno;
2320 PL_laststype = data->laststype;
2321 PL_laststatval = data->laststatval;
2322 PL_statcache = data->statcache;
2323
2324 EXTEND (SP, AvFILLp (av)); 2839 EXTEND (SP, AvFILLp (av) + 1 - 1);
2325 for (i = 0; i < AvFILLp (av); ++i) 2840 for (i = 1; i <= AvFILLp (av); ++i)
2326 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i]))); 2841 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2842 }
2327} 2843}
2328 2844
2329 2845
2330MODULE = Coro::State PACKAGE = Coro::AnyEvent 2846MODULE = Coro::State PACKAGE = Coro::AnyEvent
2331 2847
2332BOOT: 2848BOOT:
2333 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE); 2849 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2334 2850
2335SV * 2851void
2336_schedule (...) 2852_schedule (...)
2337 PROTOTYPE: @
2338 CODE: 2853 CODE:
2339{ 2854{
2340 static int incede; 2855 static int incede;
2341 2856
2342 api_cede_notself (); 2857 api_cede_notself (aTHX);
2343 2858
2344 ++incede; 2859 ++incede;
2345 while (coro_nready >= incede && api_cede ()) 2860 while (coro_nready >= incede && api_cede (aTHX))
2346 ; 2861 ;
2347 2862
2348 sv_setsv (sv_activity, &PL_sv_undef); 2863 sv_setsv (sv_activity, &PL_sv_undef);
2349 if (coro_nready >= incede) 2864 if (coro_nready >= incede)
2350 { 2865 {
2351 PUSHMARK (SP); 2866 PUSHMARK (SP);
2352 PUTBACK; 2867 PUTBACK;
2353 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 2868 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2354 SPAGAIN;
2355 } 2869 }
2356 2870
2357 --incede; 2871 --incede;
2358} 2872}
2359 2873
2360 2874
2361MODULE = Coro::State PACKAGE = PerlIO::cede 2875MODULE = Coro::State PACKAGE = Coro::AIO
2362 2876
2363BOOT: 2877void
2364 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2878_register (char *target, char *proto, SV *req)
2879 CODE:
2880{
2881 HV *st;
2882 GV *gvp;
2883 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2884 /* newXSproto doesn't return the CV on 5.8 */
2885 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2886 sv_setpv ((SV *)slf_cv, proto);
2887 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2888}
2889

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines