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.246 by root, Wed Sep 24 21:20:05 2008 UTC vs.
Revision 1.272 by root, Fri Nov 14 20:35:49 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 */
57#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
58 55
59#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
60 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
61 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
62 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
81# ifndef IS_PADCONST 78# ifndef IS_PADCONST
82# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
83# endif 80# endif
84#endif 81#endif
85 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
86/* 5.8.8 */ 93/* 5.8.8 */
87#ifndef GV_NOTQUAL 94#ifndef GV_NOTQUAL
88# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
89#endif 96#endif
90#ifndef newSV 97#ifndef newSV
91# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
92#endif 99#endif
93 100
94/* 5.11 */
95#ifndef CxHASARGS
96# define CxHASARGS(cx) (cx)->blk_sub.hasargs
97#endif
98
99/* 5.8.7 */ 101/* 5.8.7 */
100#ifndef SvRV_set 102#ifndef SvRV_set
101# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
102#endif 104#endif
103 105
… …
114# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
115#endif 117#endif
116 118
117/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
118 * portable way as possible. */ 120 * portable way as possible. */
119#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
120#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
121 126
122#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
123 128
124#if __GNUC__ >= 3 129#if __GNUC__ >= 3
125# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
126# define BARRIER __asm__ __volatile__ ("" : : : "memory")
127# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
128#else 133#else
129# define attribute(x) 134# define attribute(x)
130# define BARRIER
131# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
132#endif 137#endif
133 138
134#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
135#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
136 141
137#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
138 143
139#include "CoroAPI.h" 144#include "CoroAPI.h"
140 145
141#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
142static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
143# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
144# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
145#else 155#else
156
146# define LOCK (void)0 157# define LOCK (void)0
147# define UNLOCK (void)0 158# define UNLOCK (void)0
159
148#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
149 166
150/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
151struct io_state 168struct io_state
152{ 169{
170 AV *res;
153 int errorno; 171 int errorno;
154 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
155 int laststatval; 173 int laststatval;
156 Stat_t statcache; 174 Stat_t statcache;
157}; 175};
158 176
159static double (*nvtime)(); /* so why doesn't it take void? */ 177static double (*nvtime)(); /* so why doesn't it take void? */
160 178
179static U32 cctx_gen;
161static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
162static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
163static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
164static JMPENV *main_top_env; 183static JMPENV *main_top_env;
165static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
166static volatile SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
167 187
168static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
169static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
170static SV *rv_diehook; 190static SV *rv_diehook;
171static SV *rv_warnhook; 191static SV *rv_warnhook;
… …
190 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
191 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
192}; 212};
193 213
194/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
195typedef struct coro_cctx { 215typedef struct coro_cctx
216{
196 struct coro_cctx *next; 217 struct coro_cctx *next;
197 218
198 /* the stack */ 219 /* the stack */
199 void *sptr; 220 void *sptr;
200 size_t ssize; 221 size_t ssize;
… …
203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
205 JMPENV *top_env; 226 JMPENV *top_env;
206 coro_context cctx; 227 coro_context cctx;
207 228
229 U32 gen;
208#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
209 int valgrind_id; 231 int valgrind_id;
210#endif 232#endif
211 unsigned char flags; 233 unsigned char flags;
212} coro_cctx; 234} coro_cctx;
… …
217 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
218 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
219}; 241};
220 242
221/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
222typedef struct { 244typedef struct
245{
223 SV *defsv; 246 SV *defsv;
224 AV *defav; 247 AV *defav;
225 SV *errsv; 248 SV *errsv;
226 SV *irsgv; 249 SV *irsgv;
227#define VAR(name,type) type name; 250#define VAR(name,type) type name;
… …
229#undef VAR 252#undef VAR
230} perl_slots; 253} perl_slots;
231 254
232#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
233 256
257/* this is the per-perl-coro slf frame info */
258/* it is treated like other "global" interpreter data */
259/* and unfortunately is copied around, so kepe it small */
260struct slf_frame
261{
262 void (*prepare) (struct coro_transfer_args *ta); /* 0 means not yet initialised */
263 int (*check) (pTHX);
264};
265
234/* this is a structure representing a perl-level coroutine */ 266/* this is a structure representing a perl-level coroutine */
235struct coro { 267struct coro {
236 /* the c coroutine allocated to this perl coroutine, if any */ 268 /* the C coroutine allocated to this perl coroutine, if any */
237 coro_cctx *cctx; 269 coro_cctx *cctx;
238 270
239 /* process data */ 271 /* process data */
272 struct slf_frame slf_frame; /* saved slf frame */
273 void *slf_data;
240 AV *mainstack; 274 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
242 276
243 AV *args; /* data associated with this coroutine (initial args) */ 277 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */ 278 int refcnt; /* coroutines are refcounted, yes */
… …
259 struct coro *next, *prev; 293 struct coro *next, *prev;
260}; 294};
261 295
262typedef struct coro *Coro__State; 296typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 297typedef struct coro *Coro__State_or_hashref;
298
299static struct slf_frame slf_frame; /* the current slf frame */
264 300
265/** Coro ********************************************************************/ 301/** Coro ********************************************************************/
266 302
267#define PRIO_MAX 3 303#define PRIO_MAX 3
268#define PRIO_HIGH 1 304#define PRIO_HIGH 1
… …
272#define PRIO_MIN -4 308#define PRIO_MIN -4
273 309
274/* for Coro.pm */ 310/* for Coro.pm */
275static SV *coro_current; 311static SV *coro_current;
276static SV *coro_readyhook; 312static SV *coro_readyhook;
277static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 313static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
278static int coro_nready;
279static struct coro *coro_first; 314static struct coro *coro_first;
315#define coro_nready coroapi.nready
280 316
281/** lowlevel stuff **********************************************************/ 317/** lowlevel stuff **********************************************************/
282 318
283static SV * 319static SV *
284coro_get_sv (pTHX_ const char *name, int create) 320coro_get_sv (pTHX_ const char *name, int create)
… …
324 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 360 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
325#endif 361#endif
326 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 362 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
327 --AvFILLp (padlist); 363 --AvFILLp (padlist);
328 364
329 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 365 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
330 av_store (newpadlist, 1, (SV *)newpad); 366 av_store (newpadlist, 1, (SV *)newpad);
331 367
332 return newpadlist; 368 return newpadlist;
333} 369}
334 370
… …
377static MGVTBL coro_cv_vtbl = { 413static MGVTBL coro_cv_vtbl = {
378 0, 0, 0, 0, 414 0, 0, 0, 0,
379 coro_cv_free 415 coro_cv_free
380}; 416};
381 417
382#define CORO_MAGIC(sv,type) \ 418#define CORO_MAGIC(sv, type) \
383 SvMAGIC (sv) \ 419 SvMAGIC (sv) \
384 ? SvMAGIC (sv)->mg_type == type \ 420 ? SvMAGIC (sv)->mg_type == type \
385 ? SvMAGIC (sv) \ 421 ? SvMAGIC (sv) \
386 : mg_find (sv, type) \ 422 : mg_find (sv, type) \
387 : 0 423 : 0
388 424
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 425#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 426#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
391 427
392static struct coro * 428INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro) 429SvSTATE_ (pTHX_ SV *coro)
394{ 430{
395 HV *stash; 431 HV *stash;
396 MAGIC *mg; 432 MAGIC *mg;
397 433
… …
488 CvPADLIST (cv) = (AV *)POPs; 524 CvPADLIST (cv) = (AV *)POPs;
489 } 525 }
490 526
491 PUTBACK; 527 PUTBACK;
492 } 528 }
529
530 slf_frame = c->slf_frame;
531 coroapi.slf_data = c->slf_data;
493} 532}
494 533
495static void 534static void
496save_perl (pTHX_ Coro__State c) 535save_perl (pTHX_ Coro__State c)
497{ 536{
537 c->slf_data = coroapi.slf_data;
538 c->slf_frame = slf_frame;
539
498 { 540 {
499 dSP; 541 dSP;
500 I32 cxix = cxstack_ix; 542 I32 cxix = cxstack_ix;
501 PERL_CONTEXT *ccstk = cxstack; 543 PERL_CONTEXT *ccstk = cxstack;
502 PERL_SI *top_si = PL_curstackinfo; 544 PERL_SI *top_si = PL_curstackinfo;
… …
569 #undef VAR 611 #undef VAR
570 } 612 }
571} 613}
572 614
573/* 615/*
574 * allocate various perl stacks. This is an exact copy 616 * allocate various perl stacks. This is almost an exact copy
575 * of perl.c:init_stacks, except that it uses less memory 617 * of perl.c:init_stacks, except that it uses less memory
576 * on the (sometimes correct) assumption that coroutines do 618 * on the (sometimes correct) assumption that coroutines do
577 * not usually need a lot of stackspace. 619 * not usually need a lot of stackspace.
578 */ 620 */
579#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
… …
622 664
623/* 665/*
624 * destroy the stacks, the callchain etc... 666 * destroy the stacks, the callchain etc...
625 */ 667 */
626static void 668static void
627coro_destroy_stacks (pTHX) 669coro_destruct_stacks (pTHX)
628{ 670{
629 while (PL_curstackinfo->si_next) 671 while (PL_curstackinfo->si_next)
630 PL_curstackinfo = PL_curstackinfo->si_next; 672 PL_curstackinfo = PL_curstackinfo->si_next;
631 673
632 while (PL_curstackinfo) 674 while (PL_curstackinfo)
… …
781 823
782 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 824 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
783} 825}
784 826
785static void 827static void
828prepare_nop (aTHX_ struct coro_transfer_args *ta)
829{
830 /* kind of mega-hacky, but works */
831 ta->next = ta->prev = (struct coro *)ta;
832}
833
834static int
835slf_check_nop (aTHX)
836{
837 return 0;
838}
839
840static void
786coro_setup (pTHX_ struct coro *coro) 841coro_setup (pTHX_ struct coro *coro)
787{ 842{
788 /* 843 /*
789 * emulate part of the perl startup here. 844 * emulate part of the perl startup here.
790 */ 845 */
… …
810 GvSV (PL_defgv) = newSV (0); 865 GvSV (PL_defgv) = newSV (0);
811 GvAV (PL_defgv) = coro->args; coro->args = 0; 866 GvAV (PL_defgv) = coro->args; coro->args = 0;
812 GvSV (PL_errgv) = newSV (0); 867 GvSV (PL_errgv) = newSV (0);
813 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 868 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
814 PL_rs = newSVsv (GvSV (irsgv)); 869 PL_rs = newSVsv (GvSV (irsgv));
815 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 870 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
816 871
817 { 872 {
818 dSP; 873 dSP;
819 LOGOP myop; 874 UNOP myop;
820 875
821 Zero (&myop, 1, LOGOP); 876 Zero (&myop, 1, UNOP);
822 myop.op_next = Nullop; 877 myop.op_next = Nullop;
823 myop.op_flags = OPf_WANT_VOID; 878 myop.op_flags = OPf_WANT_VOID;
824 879
825 PUSHMARK (SP); 880 PUSHMARK (SP);
826 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 881 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
829 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 884 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
830 SPAGAIN; 885 SPAGAIN;
831 } 886 }
832 887
833 /* this newly created coroutine might be run on an existing cctx which most 888 /* this newly created coroutine might be run on an existing cctx which most
834 * likely was suspended in set_stacklevel, called from entersub. 889 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
835 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
836 * so we ENTER here for symmetry
837 */ 890 */
838 ENTER; 891 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
892 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
839} 893}
840 894
841static void 895static void
842coro_destroy (pTHX_ struct coro *coro) 896coro_destruct (pTHX_ struct coro *coro)
843{ 897{
844 if (!IN_DESTRUCT) 898 if (!IN_DESTRUCT)
845 { 899 {
846 /* restore all saved variables and stuff */ 900 /* restore all saved variables and stuff */
847 LEAVE_SCOPE (0); 901 LEAVE_SCOPE (0);
… …
869 SvREFCNT_dec (PL_warnhook); 923 SvREFCNT_dec (PL_warnhook);
870 924
871 SvREFCNT_dec (coro->saved_deffh); 925 SvREFCNT_dec (coro->saved_deffh);
872 SvREFCNT_dec (coro->throw); 926 SvREFCNT_dec (coro->throw);
873 927
874 coro_destroy_stacks (aTHX); 928 coro_destruct_stacks (aTHX);
875} 929}
876 930
877static void 931INLINE void
878free_coro_mortal (pTHX) 932free_coro_mortal (pTHX)
879{ 933{
880 if (expect_true (coro_mortal)) 934 if (expect_true (coro_mortal))
881 { 935 {
882 SvREFCNT_dec (coro_mortal); 936 SvREFCNT_dec (coro_mortal);
… …
916 : cx->blk_gimme == G_SCALAR ? bot + 1 970 : cx->blk_gimme == G_SCALAR ? bot + 1
917 : bot; 971 : bot;
918 972
919 av_extend (av, top - bot); 973 av_extend (av, top - bot);
920 while (bot < top) 974 while (bot < top)
921 av_push (av, SvREFCNT_inc (*bot++)); 975 av_push (av, SvREFCNT_inc_NN (*bot++));
922 976
923 PL_runops = RUNOPS_DEFAULT; 977 PL_runops = RUNOPS_DEFAULT;
924 ENTER; 978 ENTER;
925 SAVETMPS; 979 SAVETMPS;
926 EXTEND (SP, 3); 980 EXTEND (SP, 3);
… …
1006 1060
1007 TAINT_NOT; 1061 TAINT_NOT;
1008 return 0; 1062 return 0;
1009} 1063}
1010 1064
1065static void
1066prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1067{
1068 ta->prev = (struct coro *)cctx;
1069 ta->next = 0;
1070}
1071
1011/* inject a fake call to Coro::State::_cctx_init into the execution */ 1072/* inject a fake call to Coro::State::_cctx_init into the execution */
1012/* _cctx_init should be careful, as it could be called at almost any time */ 1073/* _cctx_init should be careful, as it could be called at almost any time */
1013/* during execution of a perl program */ 1074/* during execution of a perl program */
1075/* also initialises PL_top_env */
1014static void NOINLINE 1076static void NOINLINE
1015cctx_prepare (pTHX_ coro_cctx *cctx) 1077cctx_prepare (pTHX_ coro_cctx *cctx)
1016{ 1078{
1017 dSP; 1079 dSP;
1018 LOGOP myop; 1080 UNOP myop;
1019 1081
1020 PL_top_env = &PL_start_env; 1082 PL_top_env = &PL_start_env;
1021 1083
1022 if (cctx->flags & CC_TRACE) 1084 if (cctx->flags & CC_TRACE)
1023 PL_runops = runops_trace; 1085 PL_runops = runops_trace;
1024 1086
1025 Zero (&myop, 1, LOGOP); 1087 Zero (&myop, 1, UNOP);
1026 myop.op_next = PL_op; 1088 myop.op_next = PL_op;
1027 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1089 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1028 1090
1029 PUSHMARK (SP); 1091 PUSHMARK (SP);
1030 EXTEND (SP, 2); 1092 EXTEND (SP, 2);
1031 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1093 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1032 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1094 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1033 PUTBACK; 1095 PUTBACK;
1034 PL_op = (OP *)&myop; 1096 PL_op = (OP *)&myop;
1035 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1097 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1036 SPAGAIN; 1098 SPAGAIN;
1037} 1099}
1038 1100
1101/* the tail of transfer: execute stuff we can only do after a transfer */
1102INLINE void
1103transfer_tail (pTHX)
1104{
1105 struct coro *next = (struct coro *)transfer_next;
1106 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1107 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1108
1109 free_coro_mortal (aTHX);
1110 UNLOCK;
1111
1112 if (expect_false (next->throw))
1113 {
1114 SV *exception = sv_2mortal (next->throw);
1115
1116 next->throw = 0;
1117 sv_setsv (ERRSV, exception);
1118 croak (0);
1119 }
1120}
1121
1039/* 1122/*
1040 * this is a _very_ stripped down perl interpreter ;) 1123 * this is a _very_ stripped down perl interpreter ;)
1041 */ 1124 */
1042static void 1125static void
1043cctx_run (void *arg) 1126cctx_run (void *arg)
1044{ 1127{
1128#ifdef USE_ITHREADS
1129# if CORO_PTHREAD
1130 PERL_SET_CONTEXT (coro_thx);
1131# endif
1132#endif
1133 {
1045 dTHX; 1134 dTHX;
1046 1135
1047 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1136 /* normally we would need to skip the entersub here */
1048 UNLOCK; 1137 /* not doing so will re-execute it, which is exactly what we want */
1049
1050 /* we now skip the entersub that lead to transfer() */
1051 PL_op = PL_op->op_next; 1138 /* PL_nop = PL_nop->op_next */
1052 1139
1053 /* inject a fake subroutine call to cctx_init */ 1140 /* inject a fake subroutine call to cctx_init */
1054 cctx_prepare (aTHX_ (coro_cctx *)arg); 1141 cctx_prepare (aTHX_ (coro_cctx *)arg);
1055 1142
1143 /* cctx_run is the alternative tail of transfer() */
1144 /* TODO: throwing an exception here might be deadly, VERIFY */
1145 transfer_tail (aTHX);
1146
1056 /* somebody or something will hit me for both perl_run and PL_restartop */ 1147 /* somebody or something will hit me for both perl_run and PL_restartop */
1057 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1058 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1059 1150
1060 /* 1151 /*
1061 * If perl-run returns we assume exit() was being called or the coro 1152 * If perl-run returns we assume exit() was being called or the coro
1062 * fell off the end, which seems to be the only valid (non-bug) 1153 * fell off the end, which seems to be the only valid (non-bug)
1063 * reason for perl_run to return. We try to exit by jumping to the 1154 * reason for perl_run to return. We try to exit by jumping to the
1064 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1065 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1066 */ 1157 */
1067 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1068 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1159 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1160 }
1069} 1161}
1070 1162
1071static coro_cctx * 1163static coro_cctx *
1072cctx_new () 1164cctx_new ()
1073{ 1165{
1074 coro_cctx *cctx; 1166 coro_cctx *cctx;
1167
1168 ++cctx_count;
1169 New (0, cctx, 1, coro_cctx);
1170
1171 cctx->gen = cctx_gen;
1172 cctx->flags = 0;
1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx only suitable as source */
1179static coro_cctx *
1180cctx_new_empty ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1183
1184 cctx->sptr = 0;
1185 coro_create (&cctx->cctx, 0, 0, 0, 0);
1186
1187 return cctx;
1188}
1189
1190/* create a new cctx suitable as destination/running a perl interpreter */
1191static coro_cctx *
1192cctx_new_run ()
1193{
1194 coro_cctx *cctx = cctx_new ();
1075 void *stack_start; 1195 void *stack_start;
1076 size_t stack_size; 1196 size_t stack_size;
1077 1197
1078 ++cctx_count;
1079
1080 Newz (0, cctx, 1, coro_cctx);
1081
1082#if HAVE_MMAP 1198#if HAVE_MMAP
1083 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1199 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1084 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1085 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1086 1202
1087 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1088 { 1204 {
1089# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1090 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1091# endif 1207 #endif
1092 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1093 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1094 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1095 } 1211 }
1096 else 1212 else
1097#endif 1213#endif
1098 { 1214 {
1099 cctx->ssize = coro_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1100 New (0, cctx->sptr, coro_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1101 1217
1102 if (!cctx->sptr) 1218 if (!cctx->sptr)
1103 { 1219 {
1104 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1105 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1106 } 1222 }
1107 1223
1108 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1109 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1110 } 1226 }
1111 1227
1112 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1228 #if CORO_USE_VALGRIND
1229 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1230 #endif
1231
1113 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1232 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1114 1233
1115 return cctx; 1234 return cctx;
1116} 1235}
1117 1236
… …
1120{ 1239{
1121 if (!cctx) 1240 if (!cctx)
1122 return; 1241 return;
1123 1242
1124 --cctx_count; 1243 --cctx_count;
1244 coro_destroy (&cctx->cctx);
1125 1245
1246 /* coro_transfer creates new, empty cctx's */
1247 if (cctx->sptr)
1248 {
1126#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1127 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1128#endif 1251 #endif
1129 1252
1130#if HAVE_MMAP 1253#if HAVE_MMAP
1131 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1132 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1133 else 1256 else
1134#endif 1257#endif
1135 Safefree (cctx->sptr); 1258 Safefree (cctx->sptr);
1259 }
1136 1260
1137 Safefree (cctx); 1261 Safefree (cctx);
1138} 1262}
1139 1263
1140/* wether this cctx should be destructed */ 1264/* wether this cctx should be destructed */
1141#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1265#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1142 1266
1143static coro_cctx * 1267static coro_cctx *
1144cctx_get (pTHX) 1268cctx_get (pTHX)
1145{ 1269{
1146 while (expect_true (cctx_first)) 1270 while (expect_true (cctx_first))
… …
1153 return cctx; 1277 return cctx;
1154 1278
1155 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1156 } 1280 }
1157 1281
1158 return cctx_new (); 1282 return cctx_new_run ();
1159} 1283}
1160 1284
1161static void 1285static void
1162cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1163{ 1287{
1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1289
1164 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1165 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1166 { 1292 {
1167 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1168 cctx_first = first->next; 1294 cctx_first = first->next;
1169 --cctx_idle; 1295 --cctx_idle;
1170 1296
… …
1202/* always use the TRANSFER macro */ 1328/* always use the TRANSFER macro */
1203static void NOINLINE 1329static void NOINLINE
1204transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1330transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1205{ 1331{
1206 dSTACKLEVEL; 1332 dSTACKLEVEL;
1207 static volatile int has_throw;
1208 1333
1209 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1210 if (expect_false (!next)) 1335 if (expect_false (!next))
1211 { 1336 {
1212 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1213 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1214 } 1339 }
1215 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1216 { 1341 {
1217 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1218 1343
1219 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1220 { 1345 {
1221 /* create a new empty context */ 1346 /* create a new empty/source context */
1222 Newz (0, prev->cctx, 1, coro_cctx); 1347 prev->cctx = cctx_new_empty ();
1223 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1224 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1225 } 1350 }
1226 1351
1227 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
… …
1242 else 1367 else
1243 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1244 1369
1245 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1246 1371
1247 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1248 if (expect_true ( 1373 if (expect_true (
1249 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1250 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1251 && !force_cctx 1376 && !force_cctx
1252 )) 1377 ))
1253 { 1378 {
1254 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1379 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1255 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1380 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1256 1381
1257 prev->cctx = 0; 1382 prev->cctx = 0;
1258 1383
1259 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1384 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1260 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1385 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1268 ++next->usecount; 1393 ++next->usecount;
1269 1394
1270 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1271 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1272 1397
1273 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1274 1400
1275 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1276 { 1402 {
1277 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1278 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1279 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1280 } 1406 }
1281 1407
1282 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1283 UNLOCK;
1284
1285 if (expect_false (has_throw))
1286 {
1287 struct coro *coro = SvSTATE (coro_current);
1288
1289 if (coro->throw)
1290 {
1291 SV *exception = coro->throw;
1292 coro->throw = 0;
1293 sv_setsv (ERRSV, exception);
1294 croak (0);
1295 }
1296 }
1297 } 1409 }
1298} 1410}
1299
1300struct transfer_args
1301{
1302 struct coro *prev, *next;
1303};
1304 1411
1305#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1412#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1306#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1307 1414
1308/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1334 croak ("FATAL: tried to destroy currently running coroutine"); 1441 croak ("FATAL: tried to destroy currently running coroutine");
1335 1442
1336 save_perl (aTHX_ &temp); 1443 save_perl (aTHX_ &temp);
1337 load_perl (aTHX_ coro); 1444 load_perl (aTHX_ coro);
1338 1445
1339 coro_destroy (aTHX_ coro); 1446 coro_destruct (aTHX_ coro);
1340 1447
1341 load_perl (aTHX_ &temp); 1448 load_perl (aTHX_ &temp);
1342 1449
1343 coro->slot = 0; 1450 coro->slot = 0;
1344 } 1451 }
… …
1390# define MGf_DUP 0 1497# define MGf_DUP 0
1391#endif 1498#endif
1392}; 1499};
1393 1500
1394static void 1501static void
1395prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1502prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1396{ 1503{
1397 ta->prev = SvSTATE (prev_sv); 1504 ta->prev = SvSTATE (prev_sv);
1398 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1399 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1400} 1507}
1401 1508
1402static void 1509static void
1403api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1404{ 1511{
1405 dTHX;
1406 struct transfer_args ta; 1512 struct coro_transfer_args ta;
1407 1513
1408 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1409 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1410} 1516}
1411 1517
… …
1428 1534
1429 return 0; 1535 return 0;
1430} 1536}
1431 1537
1432static int 1538static int
1433api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1434{ 1540{
1435 dTHX;
1436 struct coro *coro; 1541 struct coro *coro;
1437 SV *sv_hook; 1542 SV *sv_hook;
1438 void (*xs_hook)(void); 1543 void (*xs_hook)(void);
1439 1544
1440 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
… …
1450 LOCK; 1555 LOCK;
1451 1556
1452 sv_hook = coro_nready ? 0 : coro_readyhook; 1557 sv_hook = coro_nready ? 0 : coro_readyhook;
1453 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1558 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1454 1559
1455 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1560 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1456 ++coro_nready; 1561 ++coro_nready;
1457 1562
1458 UNLOCK; 1563 UNLOCK;
1459 1564
1460 if (sv_hook) 1565 if (sv_hook)
… …
1478 1583
1479 return 1; 1584 return 1;
1480} 1585}
1481 1586
1482static int 1587static int
1483api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1484{ 1589{
1485 dTHX;
1486 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1487} 1591}
1488 1592
1489static void 1593INLINE void
1490prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1491{ 1595{
1492 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1493 1597
1494 for (;;) 1598 for (;;)
1495 { 1599 {
… …
1520 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1521 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1522 { 1626 {
1523 UNLOCK; 1627 UNLOCK;
1524 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1525 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1526 continue; 1630 continue;
1527 } 1631 }
1528 1632
1529 --coro_nready; 1633 --coro_nready;
1530 UNLOCK; 1634 UNLOCK;
… …
1533 1637
1534 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1535 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1536 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1537 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1538 assert (ta->next->flags & CF_READY); 1642 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1539 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1540 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1541 1645
1542 LOCK; 1646 LOCK;
1543 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1544 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1545 UNLOCK; 1649 UNLOCK;
1546} 1650}
1547 1651
1652INLINE void
1653prepare_cede (pTHX_ struct coro_transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1659INLINE void
1660prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1661{
1662 SV *prev = SvRV (coro_current);
1663
1664 if (coro_nready)
1665 {
1666 prepare_schedule (aTHX_ ta);
1667 api_ready (aTHX_ prev);
1668 }
1669 else
1670 prepare_nop (aTHX_ ta);
1671}
1672
1548static void 1673static void
1549prepare_cede (pTHX_ struct transfer_args *ta) 1674api_schedule (pTHX)
1550{ 1675{
1551 api_ready (coro_current); 1676 struct coro_transfer_args ta;
1677
1552 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1553} 1680}
1554 1681
1555static int 1682static int
1556prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1557{ 1684{
1558 if (coro_nready) 1685 struct coro_transfer_args ta;
1559 { 1686
1560 SV *prev = SvRV (coro_current);
1561 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1562 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1563 return 1; 1692 return 1;
1564 } 1693 }
1565 else 1694 else
1566 return 0; 1695 return 0;
1567} 1696}
1568 1697
1569static void
1570api_schedule (void)
1571{
1572 dTHX;
1573 struct transfer_args ta;
1574
1575 prepare_schedule (aTHX_ &ta);
1576 TRANSFER (ta, 1);
1577}
1578
1579static int 1698static int
1580api_cede (void) 1699api_cede_notself (pTHX)
1581{ 1700{
1582 dTHX; 1701 if (coro_nready)
1702 {
1583 struct transfer_args ta; 1703 struct coro_transfer_args ta;
1584 1704
1585 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1586
1587 if (expect_true (ta.prev != ta.next))
1588 {
1589 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1590 return 1; 1707 return 1;
1591 } 1708 }
1592 else 1709 else
1593 return 0; 1710 return 0;
1594} 1711}
1595 1712
1596static int
1597api_cede_notself (void)
1598{
1599 dTHX;
1600 struct transfer_args ta;
1601
1602 if (prepare_cede_notself (aTHX_ &ta))
1603 {
1604 TRANSFER (ta, 1);
1605 return 1;
1606 }
1607 else
1608 return 0;
1609}
1610
1611static void 1713static void
1612api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1613{ 1715{
1614 dTHX;
1615 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1616 1717
1617 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1618 { 1719 {
1619 if (!coro->cctx) 1720 if (!coro->cctx)
1620 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1621 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1622 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1623 1724
1624 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1625 } 1726 }
… …
1632 else 1733 else
1633 coro->slot->runops = RUNOPS_DEFAULT; 1734 coro->slot->runops = RUNOPS_DEFAULT;
1634 } 1735 }
1635} 1736}
1636 1737
1738#if 0
1637static int 1739static int
1638coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1740coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1741{
1640 AV *padlist; 1742 AV *padlist;
1641 AV *av = (AV *)mg->mg_obj; 1743 AV *av = (AV *)mg->mg_obj;
… …
1647 1749
1648static MGVTBL coro_gensub_vtbl = { 1750static MGVTBL coro_gensub_vtbl = {
1649 0, 0, 0, 0, 1751 0, 0, 0, 0,
1650 coro_gensub_free 1752 coro_gensub_free
1651}; 1753};
1754#endif
1652 1755
1653/*****************************************************************************/ 1756/*****************************************************************************/
1654/* PerlIO::cede */ 1757/* PerlIO::cede */
1655 1758
1656typedef struct 1759typedef struct
… …
1662static IV 1765static IV
1663PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 1766PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1664{ 1767{
1665 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1768 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1666 1769
1667 self->every = SvNV (arg); 1770 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1668 self->next = nvtime () + self->every; 1771 self->next = nvtime () + self->every;
1669 1772
1670 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 1773 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1671} 1774}
1672 1775
… …
1684 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1685 double now = nvtime (); 1788 double now = nvtime ();
1686 1789
1687 if (now >= self->next) 1790 if (now >= self->next)
1688 { 1791 {
1689 api_cede (); 1792 api_cede (aTHX);
1690 self->next = now + self->every; 1793 self->next = now + self->every;
1691 } 1794 }
1692 1795
1693 return PerlIOBuf_flush (f); 1796 return PerlIOBuf_flush (aTHX_ f);
1694} 1797}
1695 1798
1696static PerlIO_funcs PerlIO_cede = 1799static PerlIO_funcs PerlIO_cede =
1697{ 1800{
1698 sizeof(PerlIO_funcs), 1801 sizeof(PerlIO_funcs),
… …
1723 PerlIOBuf_get_ptr, 1826 PerlIOBuf_get_ptr,
1724 PerlIOBuf_get_cnt, 1827 PerlIOBuf_get_cnt,
1725 PerlIOBuf_set_ptrcnt, 1828 PerlIOBuf_set_ptrcnt,
1726}; 1829};
1727 1830
1831/*****************************************************************************/
1832
1833static const CV *slf_cv; /* for quick consistency check */
1834
1835static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1836static SV *slf_arg0;
1837static SV *slf_arg1;
1838
1839/* this restores the stack in the case we patched the entersub, to */
1840/* recreate the stack frame as perl will on following calls */
1841/* since entersub cleared the stack */
1842static OP *
1843pp_restore (pTHX)
1844{
1845 dSP;
1846
1847 PUSHMARK (SP);
1848
1849 EXTEND (SP, 3);
1850 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1851 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1852 PUSHs ((SV *)CvGV (slf_cv));
1853
1854 RETURNOP (slf_restore.op_first);
1855}
1856
1857static void
1858slf_init_set_stacklevel (pTHX_ SV **arg, int items)
1859{
1860 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1861 CORO_SLF_DATA = (void *)SvIV (arg [0]);
1862}
1863
1864static void
1865slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1866{
1867 prepare_set_stacklevel (ta, (struct coro_cctx *)CORO_SLF_DATA);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1875
1876 CORO_SLF_DATA = (void *)arg; /* let's hope it will stay valid */
1877}
1878
1879static void
1880slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1881{
1882 SV **arg = (SV **)CORO_SLF_DATA;
1883
1884 prepare_transfer (ta, arg [0], arg [1]);
1885}
1886
1887static void
1888slf_init_nop (pTHX_ SV **arg, int items)
1889{
1890}
1891
1892/* slf_prepare_schedule == prepare_schedule */
1893/* slf_prepare_cede == prepare_cede */
1894/* slf_prepare_notself == prepare_notself */
1895
1896/* we hijack an hopefully unused CV flag for our purposes */
1897#define CVf_SLF 0x4000
1898
1899/*
1900 * these not obviously related functions are all rolled into one
1901 * function to increase chances that they all will call transfer with the same
1902 * stack offset
1903 * SLF stands for "schedule-like-function".
1904 */
1905static OP *
1906pp_slf (pTHX)
1907{
1908 I32 checkmark; /* mark SP to see how many elements check has pushed */
1909
1910 if (expect_true (!slf_frame.prepare))
1911 {
1912 /* first iteration */
1913 dSP;
1914 SV **arg = PL_stack_base + TOPMARK + 1;
1915 int items = SP - arg; /* args without function object */
1916 SV *gv = *sp;
1917 struct CoroSLF *slf;
1918
1919 /* do a quick consistency check on the "function" object, and if it isn't */
1920 /* for us, divert to the real entersub */
1921 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1922 return PL_ppaddr[OP_ENTERSUB](aTHX);
1923
1924 /* pop args */
1925 SP = PL_stack_base + POPMARK;
1926
1927 if (!(PL_op->op_flags & OPf_STACKED))
1928 {
1929 /* ampersand-form of call, use @_ instead of stack */
1930 AV *av = GvAV (PL_defgv);
1931 arg = AvARRAY (av);
1932 items = AvFILLp (av) + 1;
1933 }
1934
1935 PUTBACK;
1936
1937 slf = (struct CoroSLF *)CvXSUBANY (GvCV (gv)).any_ptr;
1938 slf_frame.prepare = slf->prepare;
1939 slf_frame.check = slf->check;
1940 slf->init (aTHX_ arg, items);
1941 }
1942
1943 /* now interpret the slf_frame */
1944 /* we use a callback system not to make the code needlessly */
1945 /* complicated, but so we can run multiple perl coros from one cctx */
1946
1947 do
1948 {
1949 struct coro_transfer_args ta;
1950
1951 slf_frame.prepare (aTHX_ &ta);
1952 TRANSFER (ta, 0);
1953
1954 checkmark = PL_stack_sp - PL_stack_base;
1955 }
1956 while (slf_frame.check (aTHX));
1957
1958 {
1959 dSP;
1960 SV **bot = PL_stack_base + checkmark;
1961 int gimme = GIMME_V;
1962
1963 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1964
1965 /* make sure we put something on the stack in scalar context */
1966 if (gimme == G_SCALAR)
1967 {
1968 if (sp == bot)
1969 XPUSHs (&PL_sv_undef);
1970
1971 SP = bot + 1;
1972 }
1973
1974 PUTBACK;
1975 }
1976
1977 return NORMAL;
1978}
1979
1980static void
1981api_execute_slf (pTHX_ CV *cv, const struct CoroSLF *slf, SV **arg, int items)
1982{
1983 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1984 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1985
1986 if (items > 2)
1987 croak ("Coro only supports a max of two arguments to SLF functions.");
1988
1989 CvFLAGS (cv) |= CVf_SLF;
1990 CvXSUBANY (cv).any_ptr = (void *)slf;
1991 slf_cv = cv;
1992
1993 /* we patch the op, and then re-run the whole call */
1994 /* we have to put the same argument on the stack for this to work */
1995 /* and this will be done by pp_restore */
1996 slf_restore.op_next = (OP *)&slf_restore;
1997 slf_restore.op_type = OP_NULL;
1998 slf_restore.op_ppaddr = pp_restore;
1999 slf_restore.op_first = PL_op;
2000
2001 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2002 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2003
2004 PL_op->op_ppaddr = pp_slf;
2005
2006 PL_op = (OP *)&slf_restore;
2007}
1728 2008
1729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2009MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1730 2010
1731PROTOTYPES: DISABLE 2011PROTOTYPES: DISABLE
1732 2012
1733BOOT: 2013BOOT:
1734{ 2014{
1735#ifdef USE_ITHREADS 2015#ifdef USE_ITHREADS
1736 MUTEX_INIT (&coro_mutex); 2016 MUTEX_INIT (&coro_lock);
2017# if CORO_PTHREAD
2018 coro_thx = PERL_GET_CONTEXT;
2019# endif
1737#endif 2020#endif
1738 BOOT_PAGESIZE; 2021 BOOT_PAGESIZE;
1739 2022
1740 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2023 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1741 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2024 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
1759 main_top_env = PL_top_env; 2042 main_top_env = PL_top_env;
1760 2043
1761 while (main_top_env->je_prev) 2044 while (main_top_env->je_prev)
1762 main_top_env = main_top_env->je_prev; 2045 main_top_env = main_top_env->je_prev;
1763 2046
1764 coroapi.ver = CORO_API_VERSION; 2047 coroapi.ver = CORO_API_VERSION;
1765 coroapi.rev = CORO_API_REVISION; 2048 coroapi.rev = CORO_API_REVISION;
1766 coroapi.transfer = api_transfer; 2049 coroapi.transfer = api_transfer;
2050 coroapi.execute_slf = api_execute_slf;
2051 coroapi.sv_state = SvSTATE_;
1767 2052
1768 { 2053 {
1769 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2054 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1770 2055
1771 if (!svp) croak ("Time::HiRes is required"); 2056 if (!svp) croak ("Time::HiRes is required");
… …
1804 av_push (coro->args, newSVsv (ST (i))); 2089 av_push (coro->args, newSVsv (ST (i)));
1805} 2090}
1806 OUTPUT: 2091 OUTPUT:
1807 RETVAL 2092 RETVAL
1808 2093
1809# these not obviously related functions are all rolled into the same xs
1810# function to increase chances that they all will call transfer with the same
1811# stack offset
1812void 2094void
1813_set_stacklevel (...) 2095_set_stacklevel (...)
1814 ALIAS: 2096 CODE:
1815 Coro::State::transfer = 1
1816 Coro::schedule = 2
1817 Coro::cede = 3
1818 Coro::cede_notself = 4
1819 CODE:
1820{ 2097{
1821 struct transfer_args ta; 2098 static struct CoroSLF slf = { slf_init_set_stacklevel, slf_prepare_set_stacklevel, slf_check_nop };
2099 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2100}
1822 2101
1823 PUTBACK; 2102void
1824 switch (ix) 2103transfer (...)
1825 { 2104 CODE:
1826 case 0: 2105{
1827 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2106 static struct CoroSLF slf = { slf_init_transfer, slf_prepare_transfer, slf_check_nop };
1828 ta.next = 0; 2107 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
1829 break;
1830
1831 case 1:
1832 if (items != 2)
1833 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1834
1835 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1836 break;
1837
1838 case 2:
1839 prepare_schedule (aTHX_ &ta);
1840 break;
1841
1842 case 3:
1843 prepare_cede (aTHX_ &ta);
1844 break;
1845
1846 case 4:
1847 if (!prepare_cede_notself (aTHX_ &ta))
1848 XSRETURN_EMPTY;
1849
1850 break;
1851 }
1852 SPAGAIN;
1853
1854 BARRIER;
1855 PUTBACK;
1856 TRANSFER (ta, 0);
1857 SPAGAIN; /* might be the sp of a different coroutine now */
1858 /* be extra careful not to ever do anything after TRANSFER */
1859} 2108}
1860 2109
1861bool 2110bool
1862_destroy (SV *coro_sv) 2111_destroy (SV *coro_sv)
1863 CODE: 2112 CODE:
… …
1872 _exit (code); 2121 _exit (code);
1873 2122
1874int 2123int
1875cctx_stacksize (int new_stacksize = 0) 2124cctx_stacksize (int new_stacksize = 0)
1876 CODE: 2125 CODE:
1877 RETVAL = coro_stacksize; 2126 RETVAL = cctx_stacksize;
1878 if (new_stacksize) 2127 if (new_stacksize)
2128 {
1879 coro_stacksize = new_stacksize; 2129 cctx_stacksize = new_stacksize;
2130 ++cctx_gen;
2131 }
2132 OUTPUT:
2133 RETVAL
2134
2135int
2136cctx_max_idle (int max_idle = 0)
2137 CODE:
2138 RETVAL = cctx_max_idle;
2139 if (max_idle > 1)
2140 cctx_max_idle = max_idle;
1880 OUTPUT: 2141 OUTPUT:
1881 RETVAL 2142 RETVAL
1882 2143
1883int 2144int
1884cctx_count () 2145cctx_count ()
… …
1962 RETVAL = boolSV (coro->flags & ix); 2223 RETVAL = boolSV (coro->flags & ix);
1963 OUTPUT: 2224 OUTPUT:
1964 RETVAL 2225 RETVAL
1965 2226
1966void 2227void
2228throw (Coro::State self, SV *throw = &PL_sv_undef)
2229 PROTOTYPE: $;$
2230 CODE:
2231 SvREFCNT_dec (self->throw);
2232 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2233
2234void
1967api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2235api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2236 C_ARGS: aTHX_ coro, flags
1968 2237
1969SV * 2238SV *
1970has_cctx (Coro::State coro) 2239has_cctx (Coro::State coro)
1971 PROTOTYPE: $ 2240 PROTOTYPE: $
1972 CODE: 2241 CODE:
… …
1980 CODE: 2249 CODE:
1981 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2250 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1982 OUTPUT: 2251 OUTPUT:
1983 RETVAL 2252 RETVAL
1984 2253
1985IV 2254UV
1986rss (Coro::State coro) 2255rss (Coro::State coro)
1987 PROTOTYPE: $ 2256 PROTOTYPE: $
1988 ALIAS: 2257 ALIAS:
1989 usecount = 1 2258 usecount = 1
1990 CODE: 2259 CODE:
… …
2001 CODE: 2270 CODE:
2002 struct coro *coro = SvSTATE (coro_current); 2271 struct coro *coro = SvSTATE (coro_current);
2003 coro->cctx->idle_sp = 0; 2272 coro->cctx->idle_sp = 0;
2004 2273
2005void 2274void
2006throw (Coro::State self, SV *throw = &PL_sv_undef)
2007 PROTOTYPE: $;$
2008 CODE:
2009 SvREFCNT_dec (self->throw);
2010 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2011
2012void
2013swap_defsv (Coro::State self) 2275swap_defsv (Coro::State self)
2014 PROTOTYPE: $ 2276 PROTOTYPE: $
2015 ALIAS: 2277 ALIAS:
2016 swap_defav = 1 2278 swap_defav = 1
2017 CODE: 2279 CODE:
… …
2049 2311
2050 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2312 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2051 coro_ready[i] = newAV (); 2313 coro_ready[i] = newAV ();
2052 2314
2053 { 2315 {
2054 SV *sv = perl_get_sv ("Coro::API", TRUE); 2316 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2055 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2056 2317
2057 coroapi.schedule = api_schedule; 2318 coroapi.schedule = api_schedule;
2058 coroapi.cede = api_cede; 2319 coroapi.cede = api_cede;
2059 coroapi.cede_notself = api_cede_notself; 2320 coroapi.cede_notself = api_cede_notself;
2060 coroapi.ready = api_ready; 2321 coroapi.ready = api_ready;
2061 coroapi.is_ready = api_is_ready; 2322 coroapi.is_ready = api_is_ready;
2062 coroapi.nready = &coro_nready; 2323 coroapi.nready = coro_nready;
2063 coroapi.current = coro_current; 2324 coroapi.current = coro_current;
2064 2325
2065 GCoroAPI = &coroapi; 2326 GCoroAPI = &coroapi;
2066 sv_setiv (sv, (IV)&coroapi); 2327 sv_setiv (sv, (IV)&coroapi);
2067 SvREADONLY_on (sv); 2328 SvREADONLY_on (sv);
2068 } 2329 }
2330}
2331
2332void
2333schedule (...)
2334 CODE:
2335{
2336 static struct CoroSLF slf = { slf_init_nop, prepare_schedule, slf_check_nop };
2337 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2338}
2339
2340void
2341cede (...)
2342 CODE:
2343{
2344 static struct CoroSLF slf = { slf_init_nop, prepare_cede, slf_check_nop };
2345 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2346}
2347
2348void
2349cede_notself (...)
2350 CODE:
2351{
2352 static struct CoroSLF slf = { slf_init_nop, prepare_cede_notself, slf_check_nop };
2353 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2069} 2354}
2070 2355
2071void 2356void
2072_set_current (SV *current) 2357_set_current (SV *current)
2073 PROTOTYPE: $ 2358 PROTOTYPE: $
2074 CODE: 2359 CODE:
2075 SvREFCNT_dec (SvRV (coro_current)); 2360 SvREFCNT_dec (SvRV (coro_current));
2076 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2361 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2077 2362
2078void 2363void
2079_set_readyhook (SV *hook) 2364_set_readyhook (SV *hook)
2080 PROTOTYPE: $ 2365 PROTOTYPE: $
2081 CODE: 2366 CODE:
… …
2108 2393
2109SV * 2394SV *
2110ready (SV *self) 2395ready (SV *self)
2111 PROTOTYPE: $ 2396 PROTOTYPE: $
2112 CODE: 2397 CODE:
2113 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2114 OUTPUT: 2399 OUTPUT:
2115 RETVAL 2400 RETVAL
2116 2401
2117int 2402int
2118nready (...) 2403nready (...)
… …
2141 SvREFCNT_dec (old); 2426 SvREFCNT_dec (old);
2142 croak ("\3async_pool terminate\2\n"); 2427 croak ("\3async_pool terminate\2\n");
2143 } 2428 }
2144 2429
2145 SvREFCNT_dec (coro->saved_deffh); 2430 SvREFCNT_dec (coro->saved_deffh);
2146 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2431 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2147 2432
2148 hv_store (hv, "desc", sizeof ("desc") - 1, 2433 hv_store (hv, "desc", sizeof ("desc") - 1,
2149 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2434 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2150 2435
2151 invoke_av = (AV *)SvRV (invoke); 2436 invoke_av = (AV *)SvRV (invoke);
… …
2155 2440
2156 if (len > 0) 2441 if (len > 0)
2157 { 2442 {
2158 av_fill (defav, len - 1); 2443 av_fill (defav, len - 1);
2159 for (i = 0; i < len; ++i) 2444 for (i = 0; i < len; ++i)
2160 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2445 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2161 } 2446 }
2162 2447
2163 SvREFCNT_dec (invoke); 2448 SvREFCNT_dec (invoke);
2164} 2449}
2165 2450
… …
2172 sv_setsv (cb, &PL_sv_undef); 2457 sv_setsv (cb, &PL_sv_undef);
2173 2458
2174 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2175 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
2176 2461
2177 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2178 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2179 { 2464 {
2180 SV *old = PL_diehook; 2465 SV *old = PL_diehook;
2181 PL_diehook = 0; 2466 PL_diehook = 0;
2182 SvREFCNT_dec (old); 2467 SvREFCNT_dec (old);
… …
2188 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2189 2474
2190 coro->prio = 0; 2475 coro->prio = 0;
2191 2476
2192 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2193 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2194 2479
2195 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2196} 2481}
2197 2482
2198#if 0 2483#if 0
… …
2244#endif 2529#endif
2245 2530
2246 2531
2247MODULE = Coro::State PACKAGE = Coro::AIO 2532MODULE = Coro::State PACKAGE = Coro::AIO
2248 2533
2249SV * 2534void
2250_get_state () 2535_get_state (SV *self)
2251 CODE: 2536 PPCODE:
2252{ 2537{
2253 struct io_state *data; 2538 AV *defav = GvAV (PL_defgv);
2254 2539 AV *av = newAV ();
2540 int i;
2255 RETVAL = newSV (sizeof (struct io_state)); 2541 SV *data_sv = newSV (sizeof (struct io_state));
2256 data = (struct io_state *)SvPVX (RETVAL); 2542 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2257 SvCUR_set (RETVAL, sizeof (struct io_state)); 2543 SvCUR_set (data_sv, sizeof (struct io_state));
2258 SvPOK_only (RETVAL); 2544 SvPOK_only (data_sv);
2259 2545
2260 data->errorno = errno; 2546 data->errorno = errno;
2261 data->laststype = PL_laststype; 2547 data->laststype = PL_laststype;
2262 data->laststatval = PL_laststatval; 2548 data->laststatval = PL_laststatval;
2263 data->statcache = PL_statcache; 2549 data->statcache = PL_statcache;
2550
2551 av_extend (av, AvFILLp (defav) + 1 + 1);
2552
2553 for (i = 0; i <= AvFILLp (defav); ++i)
2554 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2555
2556 av_push (av, data_sv);
2557
2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2559
2560 api_ready (aTHX_ self);
2264} 2561}
2265 OUTPUT:
2266 RETVAL
2267 2562
2268void 2563void
2269_set_state (char *data_) 2564_set_state (SV *state)
2270 PROTOTYPE: $ 2565 PROTOTYPE: $
2271 CODE: 2566 PPCODE:
2272{ 2567{
2273 struct io_state *data = (void *)data_; 2568 AV *av = (AV *)SvRV (state);
2569 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2570 int i;
2274 2571
2275 errno = data->errorno; 2572 errno = data->errorno;
2276 PL_laststype = data->laststype; 2573 PL_laststype = data->laststype;
2277 PL_laststatval = data->laststatval; 2574 PL_laststatval = data->laststatval;
2278 PL_statcache = data->statcache; 2575 PL_statcache = data->statcache;
2576
2577 EXTEND (SP, AvFILLp (av));
2578 for (i = 0; i < AvFILLp (av); ++i)
2579 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2279} 2580}
2280 2581
2281 2582
2282MODULE = Coro::State PACKAGE = Coro::AnyEvent 2583MODULE = Coro::State PACKAGE = Coro::AnyEvent
2283 2584
… …
2289 PROTOTYPE: @ 2590 PROTOTYPE: @
2290 CODE: 2591 CODE:
2291{ 2592{
2292 static int incede; 2593 static int incede;
2293 2594
2294 api_cede_notself (); 2595 api_cede_notself (aTHX);
2295 2596
2296 ++incede; 2597 ++incede;
2297 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2298 ; 2599 ;
2299 2600
2300 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2301 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2302 { 2603 {
… …
2312 2613
2313MODULE = Coro::State PACKAGE = PerlIO::cede 2614MODULE = Coro::State PACKAGE = PerlIO::cede
2314 2615
2315BOOT: 2616BOOT:
2316 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

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