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.214 by root, Sat Oct 13 23:19:10 2007 UTC vs.
Revision 1.284 by root, Mon Nov 17 01:05:47 2008 UTC

… …
4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
14#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
15#include <inttypes.h> /* portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif
16 25
17#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
18# include <unistd.h> 27# include <unistd.h>
19# include <sys/mman.h> 28# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
37# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
38#endif 47#endif
39 48
40#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif 51#endif
46 52
47/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
49 55
50#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
72# ifndef IS_PADCONST 78# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
74# endif 80# endif
75#endif 81#endif
76 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100
77/* 5.8.7 */ 101/* 5.8.7 */
78#ifndef SvRV_set 102#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
80#endif 104#endif
81 105
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 107# undef CORO_STACKGUARD
92#endif 108#endif
93 109
94#ifndef CORO_STACKGUARD 110#ifndef CORO_STACKGUARD
… …
100# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
101#endif 117#endif
102 118
103/* 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
104 * portable way as possible. */ 120 * portable way as possible. */
105#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
106#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
107 126
108#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
109 128
110#if __GNUC__ >= 3 129#if __GNUC__ >= 3
111# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
114#else 133#else
115# define attribute(x) 134# define attribute(x)
116# define BARRIER
117# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
118#endif 137#endif
119 138
120#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
122 141
123#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
124 143
125#include "CoroAPI.h" 144#include "CoroAPI.h"
126 145
127#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
128static perl_mutex coro_mutex; 147# if CORO_PTHREAD
129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 148static void *coro_thx;
130# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 149# endif
131#else
132# define LOCK (void)0
133# define UNLOCK (void)0
134#endif 150#endif
135 151
136/* helper storage struct for Coro::AIO */ 152/* helper storage struct for Coro::AIO */
137struct io_state 153struct io_state
138{ 154{
155 AV *res;
139 int errorno; 156 int errorno;
140 I32 laststype; 157 I32 laststype; /* U16 in 5.10.0 */
141 int laststatval; 158 int laststatval;
142 Stat_t statcache; 159 Stat_t statcache;
143}; 160};
144 161
162static double (*nvtime)(); /* so why doesn't it take void? */
163
164static U32 cctx_gen;
145static size_t coro_stacksize = CORO_STACKSIZE; 165static size_t cctx_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 166static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 167static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 168static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 169static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
151 171
152static GV *irsgv; /* $/ */ 172static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 173static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook; 174static SV *rv_diehook;
155static SV *rv_warnhook; 175static SV *rv_warnhook;
… …
157 177
158/* async_pool helper stuff */ 178/* async_pool helper stuff */
159static SV *sv_pool_rss; 179static SV *sv_pool_rss;
160static SV *sv_pool_size; 180static SV *sv_pool_size;
161static AV *av_async_pool; 181static AV *av_async_pool;
182
183/* Coro::AnyEvent */
184static SV *sv_activity;
162 185
163static struct coro_cctx *cctx_first; 186static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 187static int cctx_count, cctx_idle;
165 188
166enum { 189enum {
… …
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 194 CC_TRACE_LINE = 0x10, /* trace each statement */
172 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 195 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
173}; 196};
174 197
175/* this is a structure representing a c-level coroutine */ 198/* this is a structure representing a c-level coroutine */
176typedef struct coro_cctx { 199typedef struct coro_cctx
200{
177 struct coro_cctx *next; 201 struct coro_cctx *next;
178 202
179 /* the stack */ 203 /* the stack */
180 void *sptr; 204 void *sptr;
181 size_t ssize; 205 size_t ssize;
… …
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 208 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 209 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
186 JMPENV *top_env; 210 JMPENV *top_env;
187 coro_context cctx; 211 coro_context cctx;
188 212
213 U32 gen;
189#if CORO_USE_VALGRIND 214#if CORO_USE_VALGRIND
190 int valgrind_id; 215 int valgrind_id;
191#endif 216#endif
192 unsigned char flags; 217 unsigned char flags;
193} coro_cctx; 218} coro_cctx;
… …
198 CF_NEW = 0x0004, /* has never been switched to */ 223 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200}; 225};
201 226
202/* the structure where most of the perl state is stored, overlaid on the cxstack */ 227/* the structure where most of the perl state is stored, overlaid on the cxstack */
203typedef struct { 228typedef struct
229{
204 SV *defsv; 230 SV *defsv;
205 AV *defav; 231 AV *defav;
206 SV *errsv; 232 SV *errsv;
207 SV *irsgv; 233 SV *irsgv;
208#define VAR(name,type) type name; 234#define VAR(name,type) type name;
… …
212 238
213#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
214 240
215/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
216struct coro { 242struct coro {
217 /* the c coroutine allocated to this perl coroutine, if any */ 243 /* the C coroutine allocated to this perl coroutine, if any */
218 coro_cctx *cctx; 244 coro_cctx *cctx;
219 245
220 /* process data */ 246 /* process data */
247 struct CoroSLF slf_frame; /* saved slf frame */
221 AV *mainstack; 248 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */ 249 perl_slots *slot; /* basically the saved sp */
223 250
224 AV *args; /* data associated with this coroutine (initial args) */ 251 AV *args; /* data associated with this coroutine (initial args) */
225 int refcnt; /* coroutines are refcounted, yes */ 252 int refcnt; /* coroutines are refcounted, yes */
226 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
227 HV *hv; /* the perl hash associated with this coro, if any */ 254 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro);
228 256
229 /* statistics */ 257 /* statistics */
230 int usecount; /* number of transfers to this coro */ 258 int usecount; /* number of transfers to this coro */
231 259
232 /* coro process data */ 260 /* coro process data */
… …
240 struct coro *next, *prev; 268 struct coro *next, *prev;
241}; 269};
242 270
243typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
244typedef struct coro *Coro__State_or_hashref; 272typedef struct coro *Coro__State_or_hashref;
273
274static struct CoroSLF slf_frame; /* the current slf frame */
245 275
246/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
247 277
248#define PRIO_MAX 3 278#define PRIO_MAX 3
249#define PRIO_HIGH 1 279#define PRIO_HIGH 1
… …
252#define PRIO_IDLE -3 282#define PRIO_IDLE -3
253#define PRIO_MIN -4 283#define PRIO_MIN -4
254 284
255/* for Coro.pm */ 285/* for Coro.pm */
256static SV *coro_current; 286static SV *coro_current;
287static SV *coro_readyhook;
257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 288static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
258static int coro_nready;
259static struct coro *coro_first; 289static struct coro *coro_first;
290#define coro_nready coroapi.nready
260 291
261/** lowlevel stuff **********************************************************/ 292/** lowlevel stuff **********************************************************/
262 293
263static SV * 294static SV *
264coro_get_sv (pTHX_ const char *name, int create) 295coro_get_sv (pTHX_ const char *name, int create)
265{ 296{
266#if PERL_VERSION_ATLEAST (5,9,0) 297#if PERL_VERSION_ATLEAST (5,10,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 298 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create); 299 get_sv (name, create);
269#endif 300#endif
270 return get_sv (name, create); 301 return get_sv (name, create);
271} 302}
272 303
273static AV * 304static AV *
274coro_get_av (pTHX_ const char *name, int create) 305coro_get_av (pTHX_ const char *name, int create)
275{ 306{
276#if PERL_VERSION_ATLEAST (5,9,0) 307#if PERL_VERSION_ATLEAST (5,10,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 308 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create); 309 get_av (name, create);
279#endif 310#endif
280 return get_av (name, create); 311 return get_av (name, create);
281} 312}
282 313
283static HV * 314static HV *
284coro_get_hv (pTHX_ const char *name, int create) 315coro_get_hv (pTHX_ const char *name, int create)
285{ 316{
286#if PERL_VERSION_ATLEAST (5,9,0) 317#if PERL_VERSION_ATLEAST (5,10,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 318 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create); 319 get_hv (name, create);
289#endif 320#endif
290 return get_hv (name, create); 321 return get_hv (name, create);
291} 322}
… …
296 AV *padlist = CvPADLIST (cv); 327 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 328 AV *newpadlist, *newpad;
298 329
299 newpadlist = newAV (); 330 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 331 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 333 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 334#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 335 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 336#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 337 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
307 --AvFILLp (padlist); 338 --AvFILLp (padlist);
308 339
309 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 340 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
310 av_store (newpadlist, 1, (SV *)newpad); 341 av_store (newpadlist, 1, (SV *)newpad);
311 342
312 return newpadlist; 343 return newpadlist;
313} 344}
314 345
… …
344 375
345 /* casting is fun. */ 376 /* casting is fun. */
346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 377 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
347 free_padlist (aTHX_ padlist); 378 free_padlist (aTHX_ padlist);
348 379
380 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
381
349 return 0; 382 return 0;
350} 383}
351 384
352#define CORO_MAGIC_type_cv PERL_MAGIC_ext 385#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext 386#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
355static MGVTBL coro_cv_vtbl = { 388static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0, 389 0, 0, 0, 0,
357 coro_cv_free 390 coro_cv_free
358}; 391};
359 392
360#define CORO_MAGIC(sv,type) \ 393#define CORO_MAGIC(sv, type) \
361 SvMAGIC (sv) \ 394 expect_true (SvMAGIC (sv)) \
362 ? SvMAGIC (sv)->mg_type == type \ 395 ? expect_true (SvMAGIC (sv)->mg_type == type) \
363 ? SvMAGIC (sv) \ 396 ? SvMAGIC (sv) \
364 : mg_find (sv, type) \ 397 : mg_find (sv, type) \
365 : 0 398 : 0
366 399
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 400#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 401#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
369 402
370static struct coro * 403INLINE struct coro *
371SvSTATE_ (pTHX_ SV *coro) 404SvSTATE_ (pTHX_ SV *coro)
372{ 405{
373 HV *stash; 406 HV *stash;
374 MAGIC *mg; 407 MAGIC *mg;
375 408
… …
390 mg = CORO_MAGIC_state (coro); 423 mg = CORO_MAGIC_state (coro);
391 return (struct coro *)mg->mg_ptr; 424 return (struct coro *)mg->mg_ptr;
392} 425}
393 426
394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 427#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
428
429/* fastert than SvSTATE, but expects a coroutine hv */
430INLINE struct coro *
431SvSTATE_hv (SV *sv)
432{
433 MAGIC *mg = expect_true (SvMAGIC (sv)->mg_type == CORO_MAGIC_type_state)
434 ? SvMAGIC (sv)
435 : mg_find (sv, CORO_MAGIC_type_state);
436
437 return (struct coro *)mg->mg_ptr;
438}
439
440#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
395 441
396/* the next two functions merely cache the padlists */ 442/* the next two functions merely cache the padlists */
397static void 443static void
398get_padlist (pTHX_ CV *cv) 444get_padlist (pTHX_ CV *cv)
399{ 445{
… …
403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 449 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 450 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
405 else 451 else
406 { 452 {
407#if CORO_PREFER_PERL_FUNCTIONS 453#if CORO_PREFER_PERL_FUNCTIONS
408 /* this is probably cleaner, but also slower? */ 454 /* this is probably cleaner? but also slower! */
455 /* in practise, it seems to be less stable */
409 CV *cp = Perl_cv_clone (cv); 456 CV *cp = Perl_cv_clone (cv);
410 CvPADLIST (cv) = CvPADLIST (cp); 457 CvPADLIST (cv) = CvPADLIST (cp);
411 CvPADLIST (cp) = 0; 458 CvPADLIST (cp) = 0;
412 SvREFCNT_dec (cp); 459 SvREFCNT_dec (cp);
413#else 460#else
… …
465 CvPADLIST (cv) = (AV *)POPs; 512 CvPADLIST (cv) = (AV *)POPs;
466 } 513 }
467 514
468 PUTBACK; 515 PUTBACK;
469 } 516 }
517
518 slf_frame = c->slf_frame;
470} 519}
471 520
472static void 521static void
473save_perl (pTHX_ Coro__State c) 522save_perl (pTHX_ Coro__State c)
474{ 523{
524 c->slf_frame = slf_frame;
525
475 { 526 {
476 dSP; 527 dSP;
477 I32 cxix = cxstack_ix; 528 I32 cxix = cxstack_ix;
478 PERL_CONTEXT *ccstk = cxstack; 529 PERL_CONTEXT *ccstk = cxstack;
479 PERL_SI *top_si = PL_curstackinfo; 530 PERL_SI *top_si = PL_curstackinfo;
… …
497 548
498 if (expect_true (CvDEPTH (cv))) 549 if (expect_true (CvDEPTH (cv)))
499 { 550 {
500 EXTEND (SP, 3); 551 EXTEND (SP, 3);
501 PUSHs ((SV *)CvPADLIST (cv)); 552 PUSHs ((SV *)CvPADLIST (cv));
502 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 553 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
503 PUSHs ((SV *)cv); 554 PUSHs ((SV *)cv);
504 555
505 CvDEPTH (cv) = 0; 556 CvDEPTH (cv) = 0;
506 get_padlist (aTHX_ cv); 557 get_padlist (aTHX_ cv);
507 } 558 }
… …
546 #undef VAR 597 #undef VAR
547 } 598 }
548} 599}
549 600
550/* 601/*
551 * allocate various perl stacks. This is an exact copy 602 * allocate various perl stacks. This is almost an exact copy
552 * of perl.c:init_stacks, except that it uses less memory 603 * of perl.c:init_stacks, except that it uses less memory
553 * on the (sometimes correct) assumption that coroutines do 604 * on the (sometimes correct) assumption that coroutines do
554 * not usually need a lot of stackspace. 605 * not usually need a lot of stackspace.
555 */ 606 */
556#if CORO_PREFER_PERL_FUNCTIONS 607#if CORO_PREFER_PERL_FUNCTIONS
… …
587 638
588 New(54,PL_savestack,24,ANY); 639 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 640 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 641 PL_savestack_max = 24;
591 642
592#if !PERL_VERSION_ATLEAST (5,9,0) 643#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 644 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 645 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 646 PL_retstack_max = 4;
596#endif 647#endif
597} 648}
… …
599 650
600/* 651/*
601 * destroy the stacks, the callchain etc... 652 * destroy the stacks, the callchain etc...
602 */ 653 */
603static void 654static void
604coro_destroy_stacks (pTHX) 655coro_destruct_stacks (pTHX)
605{ 656{
606 while (PL_curstackinfo->si_next) 657 while (PL_curstackinfo->si_next)
607 PL_curstackinfo = PL_curstackinfo->si_next; 658 PL_curstackinfo = PL_curstackinfo->si_next;
608 659
609 while (PL_curstackinfo) 660 while (PL_curstackinfo)
… …
620 671
621 Safefree (PL_tmps_stack); 672 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 673 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 674 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 675 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 677 Safefree (PL_retstack);
627#endif 678#endif
628} 679}
629 680
630static size_t 681static size_t
… …
646 #undef VAR 697 #undef VAR
647 } 698 }
648 else 699 else
649 slot = coro->slot; 700 slot = coro->slot;
650 701
702 if (slot)
703 {
651 rss += sizeof (slot->curstackinfo); 704 rss += sizeof (slot->curstackinfo);
652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
654 rss += slot->tmps_max * sizeof (SV *); 707 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 709 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 710 rss += slot->savestack_max * sizeof (ANY);
658 711
659#if !PERL_VERSION_ATLEAST (5,9,0) 712#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 713 rss += slot->retstack_max * sizeof (OP *);
661#endif 714#endif
715 }
662 } 716 }
663 717
664 return rss; 718 return rss;
665} 719}
666 720
667/** coroutine stack handling ************************************************/ 721/** coroutine stack handling ************************************************/
668 722
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 723static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
724static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
725static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
726
727/* apparently < 5.8.8 */
728#ifndef MgPV_nolen_const
729#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
730 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
731 (const char*)(mg)->mg_ptr)
732#endif
670 733
671/* 734/*
672 * This overrides the default magic get method of %SIG elements. 735 * This overrides the default magic get method of %SIG elements.
673 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
674 * and instead of tryign to save and restore the hash elements, we just provide 737 * and instead of tryign to save and restore the hash elements, we just provide
… …
682{ 745{
683 const char *s = MgPV_nolen_const (mg); 746 const char *s = MgPV_nolen_const (mg);
684 747
685 if (*s == '_') 748 if (*s == '_')
686 { 749 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 750 SV **svp = 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 751
752 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
753 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
754
755 if (svp)
756 {
757 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
758 return 0;
759 }
760 }
761
762 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
763}
764
765static int
766coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
767{
768 const char *s = MgPV_nolen_const (mg);
769
770 if (*s == '_')
689 } 771 {
772 SV **svp = 0;
690 773
774 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
775 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
776
777 if (svp)
778 {
779 SV *old = *svp;
780 *svp = 0;
781 SvREFCNT_dec (old);
782 return 0;
783 }
784 }
785
786 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
787}
788
789static int
790coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
791{
792 const char *s = MgPV_nolen_const (mg);
793
794 if (*s == '_')
795 {
796 SV **svp = 0;
797
798 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800
801 if (svp)
802 {
803 SV *old = *svp;
804 *svp = newSVsv (sv);
805 SvREFCNT_dec (old);
806 return 0;
807 }
808 }
809
691 return orig_sigelem_get (aTHX_ sv, mg); 810 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
811}
812
813static void
814prepare_nop (pTHX_ struct coro_transfer_args *ta)
815{
816 /* kind of mega-hacky, but works */
817 ta->next = ta->prev = (struct coro *)ta;
818}
819
820static int
821slf_check_nop (pTHX_ struct CoroSLF *frame)
822{
823 return 0;
692} 824}
693 825
694static void 826static void
695coro_setup (pTHX_ struct coro *coro) 827coro_setup (pTHX_ struct coro *coro)
696{ 828{
… …
706 PL_curpm = 0; 838 PL_curpm = 0;
707 PL_curpad = 0; 839 PL_curpad = 0;
708 PL_localizing = 0; 840 PL_localizing = 0;
709 PL_dirty = 0; 841 PL_dirty = 0;
710 PL_restartop = 0; 842 PL_restartop = 0;
843#if PERL_VERSION_ATLEAST (5,10,0)
844 PL_parser = 0;
845#endif
711 846
712 /* recreate the die/warn hooks */ 847 /* recreate the die/warn hooks */
713 PL_diehook = 0; 848 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
714 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 849 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
715 PL_diehook = SvREFCNT_inc (rv_diehook);
716
717 PL_warnhook = 0;
718 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
719 PL_warnhook = SvREFCNT_inc (rv_warnhook);
720 850
721 GvSV (PL_defgv) = newSV (0); 851 GvSV (PL_defgv) = newSV (0);
722 GvAV (PL_defgv) = coro->args; coro->args = 0; 852 GvAV (PL_defgv) = coro->args; coro->args = 0;
723 GvSV (PL_errgv) = newSV (0); 853 GvSV (PL_errgv) = newSV (0);
724 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 854 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
725 PL_rs = newSVsv (GvSV (irsgv)); 855 PL_rs = newSVsv (GvSV (irsgv));
726 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 856 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
727 857
728 { 858 {
729 dSP; 859 dSP;
730 LOGOP myop; 860 UNOP myop;
731 861
732 Zero (&myop, 1, LOGOP); 862 Zero (&myop, 1, UNOP);
733 myop.op_next = Nullop; 863 myop.op_next = Nullop;
734 myop.op_flags = OPf_WANT_VOID; 864 myop.op_flags = OPf_WANT_VOID;
735 865
736 PUSHMARK (SP); 866 PUSHMARK (SP);
737 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 867 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
740 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 870 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
741 SPAGAIN; 871 SPAGAIN;
742 } 872 }
743 873
744 /* this newly created coroutine might be run on an existing cctx which most 874 /* this newly created coroutine might be run on an existing cctx which most
745 * likely was suspended in set_stacklevel, called from entersub. 875 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
746 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
747 * so we ENTER here for symmetry
748 */ 876 */
749 ENTER; 877 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
878 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
750} 879}
751 880
752static void 881static void
753coro_destroy (pTHX_ struct coro *coro) 882coro_destruct (pTHX_ struct coro *coro)
754{ 883{
755 if (!IN_DESTRUCT) 884 if (!IN_DESTRUCT)
756 { 885 {
757 /* restore all saved variables and stuff */ 886 /* restore all saved variables and stuff */
758 LEAVE_SCOPE (0); 887 LEAVE_SCOPE (0);
… …
780 SvREFCNT_dec (PL_warnhook); 909 SvREFCNT_dec (PL_warnhook);
781 910
782 SvREFCNT_dec (coro->saved_deffh); 911 SvREFCNT_dec (coro->saved_deffh);
783 SvREFCNT_dec (coro->throw); 912 SvREFCNT_dec (coro->throw);
784 913
785 coro_destroy_stacks (aTHX); 914 coro_destruct_stacks (aTHX);
786} 915}
787 916
788static void 917INLINE void
789free_coro_mortal (pTHX) 918free_coro_mortal (pTHX)
790{ 919{
791 if (expect_true (coro_mortal)) 920 if (expect_true (coro_mortal))
792 { 921 {
793 SvREFCNT_dec (coro_mortal); 922 SvREFCNT_dec (coro_mortal);
… …
798static int 927static int
799runops_trace (pTHX) 928runops_trace (pTHX)
800{ 929{
801 COP *oldcop = 0; 930 COP *oldcop = 0;
802 int oldcxix = -2; 931 int oldcxix = -2;
803 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */ 932 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
804 coro_cctx *cctx = coro->cctx; 933 coro_cctx *cctx = coro->cctx;
805 934
806 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 935 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
807 { 936 {
808 PERL_ASYNC_CHECK (); 937 PERL_ASYNC_CHECK ();
… …
827 : cx->blk_gimme == G_SCALAR ? bot + 1 956 : cx->blk_gimme == G_SCALAR ? bot + 1
828 : bot; 957 : bot;
829 958
830 av_extend (av, top - bot); 959 av_extend (av, top - bot);
831 while (bot < top) 960 while (bot < top)
832 av_push (av, SvREFCNT_inc (*bot++)); 961 av_push (av, SvREFCNT_inc_NN (*bot++));
833 962
834 PL_runops = RUNOPS_DEFAULT; 963 PL_runops = RUNOPS_DEFAULT;
835 ENTER; 964 ENTER;
836 SAVETMPS; 965 SAVETMPS;
837 EXTEND (SP, 3); 966 EXTEND (SP, 3);
… …
875 SAVETMPS; 1004 SAVETMPS;
876 EXTEND (SP, 3); 1005 EXTEND (SP, 3);
877 PUSHMARK (SP); 1006 PUSHMARK (SP);
878 PUSHs (&PL_sv_yes); 1007 PUSHs (&PL_sv_yes);
879 PUSHs (fullname); 1008 PUSHs (fullname);
880 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1009 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
881 PUTBACK; 1010 PUTBACK;
882 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1011 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
883 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1012 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
884 SPAGAIN; 1013 SPAGAIN;
885 FREETMPS; 1014 FREETMPS;
… …
917 1046
918 TAINT_NOT; 1047 TAINT_NOT;
919 return 0; 1048 return 0;
920} 1049}
921 1050
1051static void
1052prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1053{
1054 ta->prev = (struct coro *)cctx;
1055 ta->next = 0;
1056}
1057
922/* inject a fake call to Coro::State::_cctx_init into the execution */ 1058/* inject a fake call to Coro::State::_cctx_init into the execution */
923/* _cctx_init should be careful, as it could be called at almost any time */ 1059/* _cctx_init should be careful, as it could be called at almost any time */
924/* during execution of a perl program */ 1060/* during execution of a perl program */
1061/* also initialises PL_top_env */
925static void NOINLINE 1062static void NOINLINE
926cctx_prepare (pTHX_ coro_cctx *cctx) 1063cctx_prepare (pTHX_ coro_cctx *cctx)
927{ 1064{
928 dSP; 1065 dSP;
929 LOGOP myop; 1066 UNOP myop;
930 1067
931 PL_top_env = &PL_start_env; 1068 PL_top_env = &PL_start_env;
932 1069
933 if (cctx->flags & CC_TRACE) 1070 if (cctx->flags & CC_TRACE)
934 PL_runops = runops_trace; 1071 PL_runops = runops_trace;
935 1072
936 Zero (&myop, 1, LOGOP); 1073 Zero (&myop, 1, UNOP);
937 myop.op_next = PL_op; 1074 myop.op_next = PL_op;
938 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1075 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
939 1076
940 PUSHMARK (SP); 1077 PUSHMARK (SP);
941 EXTEND (SP, 2); 1078 EXTEND (SP, 2);
942 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1079 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
943 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1080 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
944 PUTBACK; 1081 PUTBACK;
945 PL_op = (OP *)&myop; 1082 PL_op = (OP *)&myop;
946 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1083 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
947 SPAGAIN; 1084 SPAGAIN;
948} 1085}
949 1086
1087/* the tail of transfer: execute stuff we can only do after a transfer */
1088INLINE void
1089transfer_tail (pTHX)
1090{
1091 free_coro_mortal (aTHX);
1092}
1093
950/* 1094/*
951 * this is a _very_ stripped down perl interpreter ;) 1095 * this is a _very_ stripped down perl interpreter ;)
952 */ 1096 */
953static void 1097static void
954cctx_run (void *arg) 1098cctx_run (void *arg)
955{ 1099{
1100#ifdef USE_ITHREADS
1101# if CORO_PTHREAD
1102 PERL_SET_CONTEXT (coro_thx);
1103# endif
1104#endif
1105 {
956 dTHX; 1106 dTHX;
957 1107
958 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1108 /* normally we would need to skip the entersub here */
959 UNLOCK; 1109 /* not doing so will re-execute it, which is exactly what we want */
960
961 /* we now skip the entersub that lead to transfer() */
962 PL_op = PL_op->op_next; 1110 /* PL_nop = PL_nop->op_next */
963 1111
964 /* inject a fake subroutine call to cctx_init */ 1112 /* inject a fake subroutine call to cctx_init */
965 cctx_prepare (aTHX_ (coro_cctx *)arg); 1113 cctx_prepare (aTHX_ (coro_cctx *)arg);
966 1114
1115 /* cctx_run is the alternative tail of transfer() */
1116 transfer_tail (aTHX);
1117
967 /* somebody or something will hit me for both perl_run and PL_restartop */ 1118 /* somebody or something will hit me for both perl_run and PL_restartop */
968 PL_restartop = PL_op; 1119 PL_restartop = PL_op;
969 perl_run (PL_curinterp); 1120 perl_run (PL_curinterp);
970 1121
971 /* 1122 /*
972 * If perl-run returns we assume exit() was being called or the coro 1123 * If perl-run returns we assume exit() was being called or the coro
973 * fell off the end, which seems to be the only valid (non-bug) 1124 * fell off the end, which seems to be the only valid (non-bug)
974 * reason for perl_run to return. We try to exit by jumping to the 1125 * reason for perl_run to return. We try to exit by jumping to the
975 * bootstrap-time "top" top_env, as we cannot restore the "main" 1126 * bootstrap-time "top" top_env, as we cannot restore the "main"
976 * coroutine as Coro has no such concept 1127 * coroutine as Coro has no such concept
977 */ 1128 */
978 PL_top_env = main_top_env; 1129 PL_top_env = main_top_env;
979 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1130 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1131 }
980} 1132}
981 1133
982static coro_cctx * 1134static coro_cctx *
983cctx_new () 1135cctx_new ()
984{ 1136{
985 coro_cctx *cctx; 1137 coro_cctx *cctx;
1138
1139 ++cctx_count;
1140 New (0, cctx, 1, coro_cctx);
1141
1142 cctx->gen = cctx_gen;
1143 cctx->flags = 0;
1144 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1145
1146 return cctx;
1147}
1148
1149/* create a new cctx only suitable as source */
1150static coro_cctx *
1151cctx_new_empty ()
1152{
1153 coro_cctx *cctx = cctx_new ();
1154
1155 cctx->sptr = 0;
1156 coro_create (&cctx->cctx, 0, 0, 0, 0);
1157
1158 return cctx;
1159}
1160
1161/* create a new cctx suitable as destination/running a perl interpreter */
1162static coro_cctx *
1163cctx_new_run ()
1164{
1165 coro_cctx *cctx = cctx_new ();
986 void *stack_start; 1166 void *stack_start;
987 size_t stack_size; 1167 size_t stack_size;
988 1168
989 ++cctx_count;
990
991 Newz (0, cctx, 1, coro_cctx);
992
993#if HAVE_MMAP 1169#if HAVE_MMAP
994 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1170 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
995 /* mmap supposedly does allocate-on-write for us */ 1171 /* mmap supposedly does allocate-on-write for us */
996 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1172 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
997 1173
998 if (cctx->sptr != (void *)-1) 1174 if (cctx->sptr != (void *)-1)
999 { 1175 {
1000# if CORO_STACKGUARD 1176 #if CORO_STACKGUARD
1001 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1177 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1002# endif 1178 #endif
1003 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1179 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1004 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1180 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1005 cctx->flags |= CC_MAPPED; 1181 cctx->flags |= CC_MAPPED;
1006 } 1182 }
1007 else 1183 else
1008#endif 1184#endif
1009 { 1185 {
1010 cctx->ssize = coro_stacksize * (long)sizeof (long); 1186 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1011 New (0, cctx->sptr, coro_stacksize, long); 1187 New (0, cctx->sptr, cctx_stacksize, long);
1012 1188
1013 if (!cctx->sptr) 1189 if (!cctx->sptr)
1014 { 1190 {
1015 perror ("FATAL: unable to allocate stack for coroutine"); 1191 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1016 _exit (EXIT_FAILURE); 1192 _exit (EXIT_FAILURE);
1017 } 1193 }
1018 1194
1019 stack_start = cctx->sptr; 1195 stack_start = cctx->sptr;
1020 stack_size = cctx->ssize; 1196 stack_size = cctx->ssize;
1021 } 1197 }
1022 1198
1023 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1199 #if CORO_USE_VALGRIND
1200 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1201 #endif
1202
1024 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1203 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1025 1204
1026 return cctx; 1205 return cctx;
1027} 1206}
1028 1207
… …
1031{ 1210{
1032 if (!cctx) 1211 if (!cctx)
1033 return; 1212 return;
1034 1213
1035 --cctx_count; 1214 --cctx_count;
1215 coro_destroy (&cctx->cctx);
1036 1216
1217 /* coro_transfer creates new, empty cctx's */
1218 if (cctx->sptr)
1219 {
1037#if CORO_USE_VALGRIND 1220 #if CORO_USE_VALGRIND
1038 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1221 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1039#endif 1222 #endif
1040 1223
1041#if HAVE_MMAP 1224#if HAVE_MMAP
1042 if (cctx->flags & CC_MAPPED) 1225 if (cctx->flags & CC_MAPPED)
1043 munmap (cctx->sptr, cctx->ssize); 1226 munmap (cctx->sptr, cctx->ssize);
1044 else 1227 else
1045#endif 1228#endif
1046 Safefree (cctx->sptr); 1229 Safefree (cctx->sptr);
1230 }
1047 1231
1048 Safefree (cctx); 1232 Safefree (cctx);
1049} 1233}
1050 1234
1051/* wether this cctx should be destructed */ 1235/* wether this cctx should be destructed */
1052#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1236#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1053 1237
1054static coro_cctx * 1238static coro_cctx *
1055cctx_get (pTHX) 1239cctx_get (pTHX)
1056{ 1240{
1057 while (expect_true (cctx_first)) 1241 while (expect_true (cctx_first))
… …
1064 return cctx; 1248 return cctx;
1065 1249
1066 cctx_destroy (cctx); 1250 cctx_destroy (cctx);
1067 } 1251 }
1068 1252
1069 return cctx_new (); 1253 return cctx_new_run ();
1070} 1254}
1071 1255
1072static void 1256static void
1073cctx_put (coro_cctx *cctx) 1257cctx_put (coro_cctx *cctx)
1074{ 1258{
1259 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1260
1075 /* free another cctx if overlimit */ 1261 /* free another cctx if overlimit */
1076 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1262 if (expect_false (cctx_idle >= cctx_max_idle))
1077 { 1263 {
1078 coro_cctx *first = cctx_first; 1264 coro_cctx *first = cctx_first;
1079 cctx_first = first->next; 1265 cctx_first = first->next;
1080 --cctx_idle; 1266 --cctx_idle;
1081 1267
… …
1093transfer_check (pTHX_ struct coro *prev, struct coro *next) 1279transfer_check (pTHX_ struct coro *prev, struct coro *next)
1094{ 1280{
1095 if (expect_true (prev != next)) 1281 if (expect_true (prev != next))
1096 { 1282 {
1097 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1283 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1098 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1284 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1099 1285
1100 if (expect_false (next->flags & CF_RUNNING)) 1286 if (expect_false (next->flags & CF_RUNNING))
1101 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1287 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1102 1288
1103 if (expect_false (next->flags & CF_DESTROYED)) 1289 if (expect_false (next->flags & CF_DESTROYED))
1104 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1290 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1105 1291
1106 if (
1107#if PERL_VERSION_ATLEAST (5,9,0) 1292#if !PERL_VERSION_ATLEAST (5,10,0)
1108 expect_false (PL_parser)
1109#else
1110 expect_false (PL_lex_state != LEX_NOTPARSING) 1293 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1111#endif
1112 )
1113 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1294 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1295#endif
1114 } 1296 }
1115} 1297}
1116 1298
1117/* always use the TRANSFER macro */ 1299/* always use the TRANSFER macro */
1118static void NOINLINE 1300static void NOINLINE
1119transfer (pTHX_ struct coro *prev, struct coro *next) 1301transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1120{ 1302{
1121 dSTACKLEVEL; 1303 dSTACKLEVEL;
1122 1304
1123 /* sometimes transfer is only called to set idle_sp */ 1305 /* sometimes transfer is only called to set idle_sp */
1124 if (expect_false (!next)) 1306 if (expect_false (!next))
1125 { 1307 {
1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1308 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel;
1127 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1309 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1128 } 1310 }
1129 else if (expect_true (prev != next)) 1311 else if (expect_true (prev != next))
1130 { 1312 {
1131 coro_cctx *prev__cctx; 1313 coro_cctx *prev__cctx;
1132 1314
1133 if (expect_false (prev->flags & CF_NEW)) 1315 if (expect_false (prev->flags & CF_NEW))
1134 { 1316 {
1135 /* create a new empty context */ 1317 /* create a new empty/source context */
1136 Newz (0, prev->cctx, 1, coro_cctx); 1318 prev->cctx = cctx_new_empty ();
1137 prev->flags &= ~CF_NEW; 1319 prev->flags &= ~CF_NEW;
1138 prev->flags |= CF_RUNNING; 1320 prev->flags |= CF_RUNNING;
1139 } 1321 }
1140 1322
1141 prev->flags &= ~CF_RUNNING; 1323 prev->flags &= ~CF_RUNNING;
1142 next->flags |= CF_RUNNING; 1324 next->flags |= CF_RUNNING;
1143
1144 LOCK;
1145 1325
1146 /* first get rid of the old state */ 1326 /* first get rid of the old state */
1147 save_perl (aTHX_ prev); 1327 save_perl (aTHX_ prev);
1148 1328
1149 if (expect_false (next->flags & CF_NEW)) 1329 if (expect_false (next->flags & CF_NEW))
… …
1156 else 1336 else
1157 load_perl (aTHX_ next); 1337 load_perl (aTHX_ next);
1158 1338
1159 prev__cctx = prev->cctx; 1339 prev__cctx = prev->cctx;
1160 1340
1161 /* possibly "free" the cctx */ 1341 /* possibly untie and reuse the cctx */
1162 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1342 if (expect_true (
1343 prev__cctx->idle_sp == (void *)stacklevel
1344 && !(prev__cctx->flags & CC_TRACE)
1345 && !force_cctx
1346 ))
1163 { 1347 {
1164 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1348 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1165 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1349 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1166 1350
1167 prev->cctx = 0; 1351 prev->cctx = 0;
1168 1352
1169 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1353 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1170 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1354 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1185 prev__cctx->top_env = PL_top_env; 1369 prev__cctx->top_env = PL_top_env;
1186 PL_top_env = next->cctx->top_env; 1370 PL_top_env = next->cctx->top_env;
1187 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1371 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1188 } 1372 }
1189 1373
1190 free_coro_mortal (aTHX); 1374 transfer_tail (aTHX);
1191 UNLOCK;
1192
1193 if (expect_false (prev->throw || next->throw))
1194 {
1195 struct coro *coro = SvSTATE (coro_current);
1196
1197 if (coro->throw)
1198 {
1199 SV *exception = coro->throw;
1200 coro->throw = 0;
1201 sv_setsv (ERRSV, exception);
1202 croak (0);
1203 }
1204 }
1205 } 1375 }
1206} 1376}
1207 1377
1208struct transfer_args
1209{
1210 struct coro *prev, *next;
1211};
1212
1213#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1378#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1214#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1379#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1215 1380
1216/** high level stuff ********************************************************/ 1381/** high level stuff ********************************************************/
1217 1382
1218static int 1383static int
1219coro_state_destroy (pTHX_ struct coro *coro) 1384coro_state_destroy (pTHX_ struct coro *coro)
1220{ 1385{
1221 if (coro->flags & CF_DESTROYED) 1386 if (coro->flags & CF_DESTROYED)
1222 return 0; 1387 return 0;
1388
1389 if (coro->on_destroy)
1390 coro->on_destroy (aTHX_ coro);
1223 1391
1224 coro->flags |= CF_DESTROYED; 1392 coro->flags |= CF_DESTROYED;
1225 1393
1226 if (coro->flags & CF_READY) 1394 if (coro->flags & CF_READY)
1227 { 1395 {
1228 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1396 /* reduce nready, as destroying a ready coro effectively unreadies it */
1229 /* alternative: look through all ready queues and remove the coro */ 1397 /* alternative: look through all ready queues and remove the coro */
1230 LOCK;
1231 --coro_nready; 1398 --coro_nready;
1232 UNLOCK;
1233 } 1399 }
1234 else 1400 else
1235 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1401 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1236 1402
1237 if (coro->mainstack && coro->mainstack != main_mainstack) 1403 if (coro->mainstack && coro->mainstack != main_mainstack)
1238 { 1404 {
1239 struct coro temp; 1405 struct coro temp;
1240 1406
1241 if (coro->flags & CF_RUNNING) 1407 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1242 croak ("FATAL: tried to destroy currently running coroutine");
1243 1408
1244 save_perl (aTHX_ &temp); 1409 save_perl (aTHX_ &temp);
1245 load_perl (aTHX_ coro); 1410 load_perl (aTHX_ coro);
1246 1411
1247 coro_destroy (aTHX_ coro); 1412 coro_destruct (aTHX_ coro);
1248 1413
1249 load_perl (aTHX_ &temp); 1414 load_perl (aTHX_ &temp);
1250 1415
1251 coro->slot = 0; 1416 coro->slot = 0;
1252 } 1417 }
… …
1298# define MGf_DUP 0 1463# define MGf_DUP 0
1299#endif 1464#endif
1300}; 1465};
1301 1466
1302static void 1467static void
1303prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1468prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1304{ 1469{
1305 ta->prev = SvSTATE (prev_sv); 1470 ta->prev = SvSTATE (prev_sv);
1306 ta->next = SvSTATE (next_sv); 1471 ta->next = SvSTATE (next_sv);
1307 TRANSFER_CHECK (*ta); 1472 TRANSFER_CHECK (*ta);
1308} 1473}
1309 1474
1310static void 1475static void
1311api_transfer (SV *prev_sv, SV *next_sv) 1476api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1312{ 1477{
1313 dTHX;
1314 struct transfer_args ta; 1478 struct coro_transfer_args ta;
1315 1479
1316 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1480 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1317 TRANSFER (ta); 1481 TRANSFER (ta, 1);
1318} 1482}
1319 1483
1320/** Coro ********************************************************************/ 1484/** Coro ********************************************************************/
1321 1485
1322static void 1486INLINE void
1323coro_enq (pTHX_ SV *coro_sv) 1487coro_enq (pTHX_ struct coro *coro)
1324{ 1488{
1325 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1489 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv));
1326} 1490}
1327 1491
1328static SV * 1492INLINE SV *
1329coro_deq (pTHX_ int min_prio) 1493coro_deq (pTHX)
1330{ 1494{
1331 int prio = PRIO_MAX - PRIO_MIN; 1495 int prio;
1332 1496
1333 min_prio -= PRIO_MIN;
1334 if (min_prio < 0)
1335 min_prio = 0;
1336
1337 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1497 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1338 if (AvFILLp (coro_ready [prio]) >= 0) 1498 if (AvFILLp (coro_ready [prio]) >= 0)
1339 return av_shift (coro_ready [prio]); 1499 return av_shift (coro_ready [prio]);
1340 1500
1341 return 0; 1501 return 0;
1342} 1502}
1343 1503
1344static int 1504static int
1345api_ready (SV *coro_sv) 1505api_ready (pTHX_ SV *coro_sv)
1346{ 1506{
1347 dTHX;
1348 struct coro *coro; 1507 struct coro *coro;
1508 SV *sv_hook;
1509 void (*xs_hook)(void);
1349 1510
1350 if (SvROK (coro_sv)) 1511 if (SvROK (coro_sv))
1351 coro_sv = SvRV (coro_sv); 1512 coro_sv = SvRV (coro_sv);
1352 1513
1353 coro = SvSTATE (coro_sv); 1514 coro = SvSTATE (coro_sv);
… …
1355 if (coro->flags & CF_READY) 1516 if (coro->flags & CF_READY)
1356 return 0; 1517 return 0;
1357 1518
1358 coro->flags |= CF_READY; 1519 coro->flags |= CF_READY;
1359 1520
1360 LOCK; 1521 sv_hook = coro_nready ? 0 : coro_readyhook;
1361 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1522 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1523
1524 coro_enq (aTHX_ coro);
1362 ++coro_nready; 1525 ++coro_nready;
1363 UNLOCK; 1526
1527 if (sv_hook)
1528 {
1529 dSP;
1530
1531 ENTER;
1532 SAVETMPS;
1533
1534 PUSHMARK (SP);
1535 PUTBACK;
1536 call_sv (sv_hook, G_DISCARD);
1537 SPAGAIN;
1538
1539 FREETMPS;
1540 LEAVE;
1541 }
1542
1543 if (xs_hook)
1544 xs_hook ();
1364 1545
1365 return 1; 1546 return 1;
1366} 1547}
1367 1548
1368static int 1549static int
1369api_is_ready (SV *coro_sv) 1550api_is_ready (pTHX_ SV *coro_sv)
1370{ 1551{
1371 dTHX;
1372 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1552 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1373} 1553}
1374 1554
1375static void 1555INLINE void
1376prepare_schedule (pTHX_ struct transfer_args *ta) 1556prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1377{ 1557{
1378 SV *prev_sv, *next_sv; 1558 SV *prev_sv, *next_sv;
1379 1559
1380 for (;;) 1560 for (;;)
1381 { 1561 {
1382 LOCK;
1383 next_sv = coro_deq (aTHX_ PRIO_MIN); 1562 next_sv = coro_deq (aTHX);
1384 1563
1385 /* nothing to schedule: call the idle handler */ 1564 /* nothing to schedule: call the idle handler */
1386 if (expect_false (!next_sv)) 1565 if (expect_false (!next_sv))
1387 { 1566 {
1388 dSP; 1567 dSP;
1389 UNLOCK;
1390 1568
1391 ENTER; 1569 ENTER;
1392 SAVETMPS; 1570 SAVETMPS;
1393 1571
1394 PUSHMARK (SP); 1572 PUSHMARK (SP);
1395 PUTBACK; 1573 PUTBACK;
1396 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1574 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1575 SPAGAIN;
1397 1576
1398 FREETMPS; 1577 FREETMPS;
1399 LEAVE; 1578 LEAVE;
1400 continue; 1579 continue;
1401 } 1580 }
1402 1581
1403 ta->next = SvSTATE (next_sv); 1582 ta->next = SvSTATE_hv (next_sv);
1404 1583
1405 /* cannot transfer to destroyed coros, skip and look for next */ 1584 /* cannot transfer to destroyed coros, skip and look for next */
1406 if (expect_false (ta->next->flags & CF_DESTROYED)) 1585 if (expect_false (ta->next->flags & CF_DESTROYED))
1407 { 1586 {
1408 UNLOCK;
1409 SvREFCNT_dec (next_sv); 1587 SvREFCNT_dec (next_sv);
1410 /* coro_nready is already taken care of by destroy */ 1588 /* coro_nready has already been taken care of by destroy */
1411 continue; 1589 continue;
1412 } 1590 }
1413 1591
1414 --coro_nready; 1592 --coro_nready;
1415 UNLOCK;
1416 break; 1593 break;
1417 } 1594 }
1418 1595
1419 /* free this only after the transfer */ 1596 /* free this only after the transfer */
1420 prev_sv = SvRV (coro_current); 1597 prev_sv = SvRV (coro_current);
1421 ta->prev = SvSTATE (prev_sv); 1598 ta->prev = SvSTATE_hv (prev_sv);
1422 TRANSFER_CHECK (*ta); 1599 TRANSFER_CHECK (*ta);
1423 assert (ta->next->flags & CF_READY); 1600 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1424 ta->next->flags &= ~CF_READY; 1601 ta->next->flags &= ~CF_READY;
1425 SvRV_set (coro_current, next_sv); 1602 SvRV_set (coro_current, next_sv);
1426 1603
1427 LOCK;
1428 free_coro_mortal (aTHX); 1604 free_coro_mortal (aTHX);
1429 coro_mortal = prev_sv; 1605 coro_mortal = prev_sv;
1430 UNLOCK;
1431} 1606}
1432 1607
1433static void 1608INLINE void
1434prepare_cede (pTHX_ struct transfer_args *ta) 1609prepare_cede (pTHX_ struct coro_transfer_args *ta)
1435{ 1610{
1436 api_ready (coro_current); 1611 api_ready (aTHX_ coro_current);
1437 prepare_schedule (aTHX_ ta); 1612 prepare_schedule (aTHX_ ta);
1438} 1613}
1439 1614
1615INLINE void
1616prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1617{
1618 SV *prev = SvRV (coro_current);
1619
1620 if (coro_nready)
1621 {
1622 prepare_schedule (aTHX_ ta);
1623 api_ready (aTHX_ prev);
1624 }
1625 else
1626 prepare_nop (aTHX_ ta);
1627}
1628
1629static void
1630api_schedule (pTHX)
1631{
1632 struct coro_transfer_args ta;
1633
1634 prepare_schedule (aTHX_ &ta);
1635 TRANSFER (ta, 1);
1636}
1637
1440static int 1638static int
1441prepare_cede_notself (pTHX_ struct transfer_args *ta) 1639api_cede (pTHX)
1442{ 1640{
1443 if (coro_nready) 1641 struct coro_transfer_args ta;
1444 { 1642
1445 SV *prev = SvRV (coro_current);
1446 prepare_schedule (aTHX_ ta); 1643 prepare_cede (aTHX_ &ta);
1447 api_ready (prev); 1644
1645 if (expect_true (ta.prev != ta.next))
1646 {
1647 TRANSFER (ta, 1);
1448 return 1; 1648 return 1;
1449 } 1649 }
1450 else 1650 else
1451 return 0; 1651 return 0;
1452} 1652}
1453 1653
1454static void
1455api_schedule (void)
1456{
1457 dTHX;
1458 struct transfer_args ta;
1459
1460 prepare_schedule (aTHX_ &ta);
1461 TRANSFER (ta);
1462}
1463
1464static int 1654static int
1465api_cede (void) 1655api_cede_notself (pTHX)
1466{ 1656{
1467 dTHX; 1657 if (coro_nready)
1658 {
1468 struct transfer_args ta; 1659 struct coro_transfer_args ta;
1469 1660
1470 prepare_cede (aTHX_ &ta); 1661 prepare_cede_notself (aTHX_ &ta);
1471
1472 if (expect_true (ta.prev != ta.next))
1473 {
1474 TRANSFER (ta); 1662 TRANSFER (ta, 1);
1475 return 1; 1663 return 1;
1476 } 1664 }
1477 else 1665 else
1478 return 0; 1666 return 0;
1479} 1667}
1480 1668
1481static int 1669static void
1482api_cede_notself (void)
1483{
1484 dTHX;
1485 struct transfer_args ta;
1486
1487 if (prepare_cede_notself (aTHX_ &ta))
1488 {
1489 TRANSFER (ta);
1490 return 1;
1491 }
1492 else
1493 return 0;
1494}
1495
1496static void
1497api_trace (SV *coro_sv, int flags) 1670api_trace (pTHX_ SV *coro_sv, int flags)
1498{ 1671{
1499 dTHX;
1500 struct coro *coro = SvSTATE (coro_sv); 1672 struct coro *coro = SvSTATE (coro_sv);
1501 1673
1502 if (flags & CC_TRACE) 1674 if (flags & CC_TRACE)
1503 { 1675 {
1504 if (!coro->cctx) 1676 if (!coro->cctx)
1505 coro->cctx = cctx_new (); 1677 coro->cctx = cctx_new_run ();
1506 else if (!(coro->cctx->flags & CC_TRACE)) 1678 else if (!(coro->cctx->flags & CC_TRACE))
1507 croak ("cannot enable tracing on coroutine with custom stack"); 1679 croak ("cannot enable tracing on coroutine with custom stack,");
1508 1680
1509 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1681 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1510 } 1682 }
1511 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1683 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1512 { 1684 {
… …
1517 else 1689 else
1518 coro->slot->runops = RUNOPS_DEFAULT; 1690 coro->slot->runops = RUNOPS_DEFAULT;
1519 } 1691 }
1520} 1692}
1521 1693
1694/*****************************************************************************/
1695/* PerlIO::cede */
1696
1697typedef struct
1698{
1699 PerlIOBuf base;
1700 NV next, every;
1701} PerlIOCede;
1702
1703static IV
1704PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1705{
1706 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1707
1708 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1709 self->next = nvtime () + self->every;
1710
1711 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1712}
1713
1714static SV *
1715PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1716{
1717 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1718
1719 return newSVnv (self->every);
1720}
1721
1722static IV
1723PerlIOCede_flush (pTHX_ PerlIO *f)
1724{
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime ();
1727
1728 if (now >= self->next)
1729 {
1730 api_cede (aTHX);
1731 self->next = now + self->every;
1732 }
1733
1734 return PerlIOBuf_flush (aTHX_ f);
1735}
1736
1737static PerlIO_funcs PerlIO_cede =
1738{
1739 sizeof(PerlIO_funcs),
1740 "cede",
1741 sizeof(PerlIOCede),
1742 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1743 PerlIOCede_pushed,
1744 PerlIOBuf_popped,
1745 PerlIOBuf_open,
1746 PerlIOBase_binmode,
1747 PerlIOCede_getarg,
1748 PerlIOBase_fileno,
1749 PerlIOBuf_dup,
1750 PerlIOBuf_read,
1751 PerlIOBuf_unread,
1752 PerlIOBuf_write,
1753 PerlIOBuf_seek,
1754 PerlIOBuf_tell,
1755 PerlIOBuf_close,
1756 PerlIOCede_flush,
1757 PerlIOBuf_fill,
1758 PerlIOBase_eof,
1759 PerlIOBase_error,
1760 PerlIOBase_clearerr,
1761 PerlIOBase_setlinebuf,
1762 PerlIOBuf_get_base,
1763 PerlIOBuf_bufsiz,
1764 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt,
1767};
1768
1769/*****************************************************************************/
1770
1771static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1772static const CV *slf_cv;
1773static SV *slf_arg0;
1774static SV *slf_arg1;
1775static SV *slf_arg2;
1776static I32 slf_ax; /* top of stack, for restore */
1777
1778/* this restores the stack in the case we patched the entersub, to */
1779/* recreate the stack frame as perl will on following calls */
1780/* since entersub cleared the stack */
1781static OP *
1782pp_restore (pTHX)
1783{
1784 SV **SP = PL_stack_base + slf_ax;
1785
1786 PUSHMARK (SP);
1787
1788 EXTEND (SP, 3);
1789 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1790 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1791 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1792 PUSHs ((SV *)CvGV (slf_cv));
1793
1794 RETURNOP (slf_restore.op_first);
1795}
1796
1797static void
1798slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1799{
1800 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1801}
1802
1803static void
1804slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1805{
1806 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1807
1808 frame->prepare = slf_prepare_set_stacklevel;
1809 frame->check = slf_check_nop;
1810 frame->data = (void *)SvIV (arg [0]);
1811}
1812
1813static void
1814slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1815{
1816 SV **arg = (SV **)slf_frame.data;
1817
1818 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
1819
1820 /* if the destination has ->throw set, then copy it */
1821 /* into the current coro's throw slot, so it will be raised */
1822 /* after the schedule */
1823 if (expect_false (ta->next->throw))
1824 {
1825 struct coro *coro = SvSTATE_current;
1826 SvREFCNT_dec (coro->throw);
1827 coro->throw = ta->next->throw;
1828 ta->next->throw = 0;
1829 }
1830}
1831
1832static void
1833slf_init_transfer (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1834{
1835 if (items != 2)
1836 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1837
1838 frame->prepare = slf_prepare_transfer;
1839 frame->check = slf_check_nop;
1840 frame->data = (void *)arg; /* let's hope it will stay valid */
1841}
1842
1843static void
1844slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1845{
1846 frame->prepare = prepare_schedule;
1847 frame->check = slf_check_nop;
1848}
1849
1850static void
1851slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1852{
1853 frame->prepare = prepare_cede;
1854 frame->check = slf_check_nop;
1855}
1856
1857static void
1858slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1859{
1860 frame->prepare = prepare_cede_notself;
1861 frame->check = slf_check_nop;
1862}
1863
1864/* we hijack an hopefully unused CV flag for our purposes */
1865#define CVf_SLF 0x4000
1866
1867/*
1868 * these not obviously related functions are all rolled into one
1869 * function to increase chances that they all will call transfer with the same
1870 * stack offset
1871 * SLF stands for "schedule-like-function".
1872 */
1873static OP *
1874pp_slf (pTHX)
1875{
1876 I32 checkmark; /* mark SP to see how many elements check has pushed */
1877
1878 /* set up the slf frame, unless it has already been set-up */
1879 /* the latter happens when a new coro has been started */
1880 /* or when a new cctx was attached to an existing coroutine */
1881 if (expect_true (!slf_frame.prepare))
1882 {
1883 /* first iteration */
1884 dSP;
1885 SV **arg = PL_stack_base + TOPMARK + 1;
1886 int items = SP - arg; /* args without function object */
1887 SV *gv = *sp;
1888
1889 /* do a quick consistency check on the "function" object, and if it isn't */
1890 /* for us, divert to the real entersub */
1891 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1892 return PL_ppaddr[OP_ENTERSUB](aTHX);
1893
1894 if (!(PL_op->op_flags & OPf_STACKED))
1895 {
1896 /* ampersand-form of call, use @_ instead of stack */
1897 AV *av = GvAV (PL_defgv);
1898 arg = AvARRAY (av);
1899 items = AvFILLp (av) + 1;
1900 }
1901
1902 /* now call the init function, which needs to set up slf_frame */
1903 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr)
1904 (aTHX_ &slf_frame, GvCV (gv), arg, items);
1905
1906 /* pop args */
1907 SP = PL_stack_base + POPMARK;
1908
1909 PUTBACK;
1910 }
1911
1912 /* now that we have a slf_frame, interpret it! */
1913 /* we use a callback system not to make the code needlessly */
1914 /* complicated, but so we can run multiple perl coros from one cctx */
1915
1916 do
1917 {
1918 struct coro_transfer_args ta;
1919
1920 slf_frame.prepare (aTHX_ &ta);
1921 TRANSFER (ta, 0);
1922
1923 checkmark = PL_stack_sp - PL_stack_base;
1924 }
1925 while (slf_frame.check (aTHX_ &slf_frame));
1926
1927 {
1928 dSP;
1929 SV **bot = PL_stack_base + checkmark;
1930 int gimme = GIMME_V;
1931
1932 slf_frame.prepare = 0; /* invalidate the frame, so it gets initialised again next time */
1933
1934 /* make sure we put something on the stack in scalar context */
1935 if (gimme == G_SCALAR)
1936 {
1937 if (sp == bot)
1938 XPUSHs (&PL_sv_undef);
1939
1940 SP = bot + 1;
1941 }
1942
1943 PUTBACK;
1944 }
1945
1946 {
1947 struct coro *coro = SvSTATE_current;
1948
1949 if (expect_false (coro->throw))
1950 {
1951 SV *exception = sv_2mortal (coro->throw);
1952
1953 coro->throw = 0;
1954 sv_setsv (ERRSV, exception);
1955 croak (0);
1956 }
1957 }
1958
1959 return NORMAL;
1960}
1961
1962static void
1963api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, I32 ax)
1964{
1965 SV **arg = PL_stack_base + ax;
1966 int items = PL_stack_sp - arg + 1;
1967
1968 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1969
1970 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1971 && PL_op->op_ppaddr != pp_slf)
1972 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1973
1974#if 0
1975 if (items > 3)
1976 croak ("Coro only supports up to three arguments to SLF functions currently (not %d), caught", items);
1977#endif
1978
1979 CvFLAGS (cv) |= CVf_SLF;
1980 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1981 slf_cv = cv;
1982
1983 /* we patch the op, and then re-run the whole call */
1984 /* we have to put the same argument on the stack for this to work */
1985 /* and this will be done by pp_restore */
1986 slf_restore.op_next = (OP *)&slf_restore;
1987 slf_restore.op_type = OP_CUSTOM;
1988 slf_restore.op_ppaddr = pp_restore;
1989 slf_restore.op_first = PL_op;
1990
1991 slf_ax = ax - 1; /* undo the ax++ inside dAXMARK */
1992 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
1993 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
1994 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
1995
1996 PL_op->op_ppaddr = pp_slf;
1997 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */
1998
1999 PL_op = (OP *)&slf_restore;
2000}
2001
2002/*****************************************************************************/
2003
2004static void
2005coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2006{
2007 SV *count_sv = AvARRAY (av)[0];
2008 IV count = SvIVX (count_sv);
2009
2010 count += adjust;
2011 SvIVX (count_sv) = count;
2012
2013 /* now wake up as many waiters as are expected to lock */
2014 while (count > 0 && AvFILLp (av) > 0)
2015 {
2016 SV *cb;
2017
2018 /* swap first two elements so we can shift a waiter */
2019 AvARRAY (av)[0] = AvARRAY (av)[1];
2020 AvARRAY (av)[1] = count_sv;
2021 cb = av_shift (av);
2022
2023 if (SvOBJECT (cb))
2024 api_ready (aTHX_ cb);
2025 else
2026 croak ("callbacks not yet supported");
2027
2028 SvREFCNT_dec (cb);
2029
2030 --count;
2031 }
2032}
2033
2034static void
2035coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2036{
2037 /* call $sem->adjust (0) to possibly wake up some other waiters */
2038 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2039}
2040
2041static int
2042slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2043{
2044 AV *av = (AV *)frame->data;
2045 SV *count_sv = AvARRAY (av)[0];
2046
2047 if (SvIVX (count_sv) > 0)
2048 {
2049 SvSTATE_current->on_destroy = 0;
2050 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2051 return 0;
2052 }
2053 else
2054 {
2055 int i;
2056 /* if we were woken up but can't down, we look through the whole */
2057 /* waiters list and only add us if we aren't in there already */
2058 /* this avoids some degenerate memory usage cases */
2059
2060 for (i = 1; i <= AvFILLp (av); ++i)
2061 if (AvARRAY (av)[i] == SvRV (coro_current))
2062 return 1;
2063
2064 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2065 return 1;
2066 }
2067}
2068
2069static void
2070slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2071{
2072 AV *av = (AV *)SvRV (arg [0]);
2073
2074 if (SvIVX (AvARRAY (av)[0]) > 0)
2075 {
2076 frame->data = (void *)av;
2077 frame->prepare = prepare_nop;
2078 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
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 assert (!SvSTATE_current->on_destroy);//D
2090 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2091 }
2092
2093 frame->check = slf_check_semaphore_down;
2094
2095}
2096
2097/*****************************************************************************/
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, 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
1522MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2121MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1523 2122
1524PROTOTYPES: DISABLE 2123PROTOTYPES: DISABLE
1525 2124
1526BOOT: 2125BOOT:
1527{ 2126{
1528#ifdef USE_ITHREADS 2127#ifdef USE_ITHREADS
1529 MUTEX_INIT (&coro_mutex); 2128# if CORO_PTHREAD
2129 coro_thx = PERL_GET_CONTEXT;
2130# endif
1530#endif 2131#endif
1531 BOOT_PAGESIZE; 2132 BOOT_PAGESIZE;
1532 2133
1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2134 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2135 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535 2136
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 2137 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2138 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2139 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1538 2140
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 2141 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 2142 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1541 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 2143 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1542 2144
… …
1551 main_top_env = PL_top_env; 2153 main_top_env = PL_top_env;
1552 2154
1553 while (main_top_env->je_prev) 2155 while (main_top_env->je_prev)
1554 main_top_env = main_top_env->je_prev; 2156 main_top_env = main_top_env->je_prev;
1555 2157
2158 {
2159 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2160
2161 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2162 hv_store_ent (PL_custom_op_names, slf,
2163 newSVpv ("coro_slf", 0), 0);
2164
2165 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2166 hv_store_ent (PL_custom_op_descs, slf,
2167 newSVpv ("coro schedule like function", 0), 0);
2168 }
2169
1556 coroapi.ver = CORO_API_VERSION; 2170 coroapi.ver = CORO_API_VERSION;
1557 coroapi.rev = CORO_API_REVISION; 2171 coroapi.rev = CORO_API_REVISION;
2172
1558 coroapi.transfer = api_transfer; 2173 coroapi.transfer = api_transfer;
2174
2175 coroapi.sv_state = SvSTATE_;
2176 coroapi.execute_slf = api_execute_slf;
2177 coroapi.prepare_nop = prepare_nop;
2178 coroapi.prepare_schedule = prepare_schedule;
2179 coroapi.prepare_cede = prepare_cede;
2180 coroapi.prepare_cede_notself = prepare_cede_notself;
2181
2182 {
2183 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2184
2185 if (!svp) croak ("Time::HiRes is required");
2186 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2187
2188 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2189 }
1559 2190
1560 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2191 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1561} 2192}
1562 2193
1563SV * 2194SV *
… …
1587 av_push (coro->args, newSVsv (ST (i))); 2218 av_push (coro->args, newSVsv (ST (i)));
1588} 2219}
1589 OUTPUT: 2220 OUTPUT:
1590 RETVAL 2221 RETVAL
1591 2222
1592# these not obviously related functions are all rolled into the same xs
1593# function to increase chances that they all will call transfer with the same
1594# stack offset
1595void 2223void
1596_set_stacklevel (...) 2224_set_stacklevel (...)
1597 ALIAS: 2225 CODE:
1598 Coro::State::transfer = 1 2226 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
1599 Coro::schedule = 2
1600 Coro::cede = 3
1601 Coro::cede_notself = 4
1602 CODE:
1603{
1604 struct transfer_args ta;
1605 2227
1606 switch (ix) 2228void
1607 { 2229transfer (...)
1608 case 0: 2230 PROTOTYPE: $$
1609 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2231 CODE:
1610 ta.next = 0; 2232 CORO_EXECUTE_SLF_XS (slf_init_transfer);
1611 break;
1612
1613 case 1:
1614 if (items != 2)
1615 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1616
1617 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1618 break;
1619
1620 case 2:
1621 prepare_schedule (aTHX_ &ta);
1622 break;
1623
1624 case 3:
1625 prepare_cede (aTHX_ &ta);
1626 break;
1627
1628 case 4:
1629 if (!prepare_cede_notself (aTHX_ &ta))
1630 XSRETURN_EMPTY;
1631
1632 break;
1633 }
1634
1635 BARRIER;
1636 PUTBACK;
1637 TRANSFER (ta);
1638 SPAGAIN; /* might be the sp of a different coroutine now */
1639 /* be extra careful not to ever do anything after TRANSFER */
1640}
1641 2233
1642bool 2234bool
1643_destroy (SV *coro_sv) 2235_destroy (SV *coro_sv)
1644 CODE: 2236 CODE:
1645 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2237 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1646 OUTPUT: 2238 OUTPUT:
1647 RETVAL 2239 RETVAL
1648 2240
1649void 2241void
1650_exit (code) 2242_exit (int code)
1651 int code
1652 PROTOTYPE: $ 2243 PROTOTYPE: $
1653 CODE: 2244 CODE:
1654 _exit (code); 2245 _exit (code);
1655 2246
1656int 2247int
1657cctx_stacksize (int new_stacksize = 0) 2248cctx_stacksize (int new_stacksize = 0)
2249 PROTOTYPE: ;$
1658 CODE: 2250 CODE:
1659 RETVAL = coro_stacksize; 2251 RETVAL = cctx_stacksize;
1660 if (new_stacksize) 2252 if (new_stacksize)
2253 {
1661 coro_stacksize = new_stacksize; 2254 cctx_stacksize = new_stacksize;
2255 ++cctx_gen;
2256 }
1662 OUTPUT: 2257 OUTPUT:
1663 RETVAL 2258 RETVAL
1664 2259
1665int 2260int
2261cctx_max_idle (int max_idle = 0)
2262 PROTOTYPE: ;$
2263 CODE:
2264 RETVAL = cctx_max_idle;
2265 if (max_idle > 1)
2266 cctx_max_idle = max_idle;
2267 OUTPUT:
2268 RETVAL
2269
2270int
1666cctx_count () 2271cctx_count ()
2272 PROTOTYPE:
1667 CODE: 2273 CODE:
1668 RETVAL = cctx_count; 2274 RETVAL = cctx_count;
1669 OUTPUT: 2275 OUTPUT:
1670 RETVAL 2276 RETVAL
1671 2277
1672int 2278int
1673cctx_idle () 2279cctx_idle ()
2280 PROTOTYPE:
1674 CODE: 2281 CODE:
1675 RETVAL = cctx_idle; 2282 RETVAL = cctx_idle;
1676 OUTPUT: 2283 OUTPUT:
1677 RETVAL 2284 RETVAL
1678 2285
1679void 2286void
1680list () 2287list ()
2288 PROTOTYPE:
1681 PPCODE: 2289 PPCODE:
1682{ 2290{
1683 struct coro *coro; 2291 struct coro *coro;
1684 for (coro = coro_first; coro; coro = coro->next) 2292 for (coro = coro_first; coro; coro = coro->next)
1685 if (coro->hv) 2293 if (coro->hv)
… …
1690call (Coro::State coro, SV *coderef) 2298call (Coro::State coro, SV *coderef)
1691 ALIAS: 2299 ALIAS:
1692 eval = 1 2300 eval = 1
1693 CODE: 2301 CODE:
1694{ 2302{
1695 if (coro->mainstack) 2303 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1696 { 2304 {
1697 struct coro temp; 2305 struct coro temp;
1698 2306
1699 if (!(coro->flags & CF_RUNNING)) 2307 if (!(coro->flags & CF_RUNNING))
1700 { 2308 {
2309 PUTBACK;
1701 save_perl (aTHX_ &temp); 2310 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 2311 load_perl (aTHX_ coro);
1703 } 2312 }
1704 2313
1705 { 2314 {
… …
1724 2333
1725 if (!(coro->flags & CF_RUNNING)) 2334 if (!(coro->flags & CF_RUNNING))
1726 { 2335 {
1727 save_perl (aTHX_ coro); 2336 save_perl (aTHX_ coro);
1728 load_perl (aTHX_ &temp); 2337 load_perl (aTHX_ &temp);
2338 SPAGAIN;
1729 } 2339 }
1730 } 2340 }
1731} 2341}
1732 2342
1733SV * 2343SV *
… …
1742 RETVAL = boolSV (coro->flags & ix); 2352 RETVAL = boolSV (coro->flags & ix);
1743 OUTPUT: 2353 OUTPUT:
1744 RETVAL 2354 RETVAL
1745 2355
1746void 2356void
2357throw (Coro::State self, SV *throw = &PL_sv_undef)
2358 PROTOTYPE: $;$
2359 CODE:
2360 SvREFCNT_dec (self->throw);
2361 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2362
2363void
1747api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2364api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2365 PROTOTYPE: $;$
2366 C_ARGS: aTHX_ coro, flags
1748 2367
1749SV * 2368SV *
1750has_stack (Coro::State coro) 2369has_cctx (Coro::State coro)
1751 PROTOTYPE: $ 2370 PROTOTYPE: $
1752 CODE: 2371 CODE:
1753 RETVAL = boolSV (!!coro->cctx); 2372 RETVAL = boolSV (!!coro->cctx);
1754 OUTPUT: 2373 OUTPUT:
1755 RETVAL 2374 RETVAL
… …
1760 CODE: 2379 CODE:
1761 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2380 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1762 OUTPUT: 2381 OUTPUT:
1763 RETVAL 2382 RETVAL
1764 2383
1765IV 2384UV
1766rss (Coro::State coro) 2385rss (Coro::State coro)
1767 PROTOTYPE: $ 2386 PROTOTYPE: $
1768 ALIAS: 2387 ALIAS:
1769 usecount = 1 2388 usecount = 1
1770 CODE: 2389 CODE:
… …
1774 case 1: RETVAL = coro->usecount; break; 2393 case 1: RETVAL = coro->usecount; break;
1775 } 2394 }
1776 OUTPUT: 2395 OUTPUT:
1777 RETVAL 2396 RETVAL
1778 2397
2398void
2399force_cctx ()
2400 PROTOTYPE:
2401 CODE:
2402 SvSTATE_current->cctx->idle_sp = 0;
2403
2404void
2405swap_defsv (Coro::State self)
2406 PROTOTYPE: $
2407 ALIAS:
2408 swap_defav = 1
2409 CODE:
2410 if (!self->slot)
2411 croak ("cannot swap state with coroutine that has no saved state,");
2412 else
2413 {
2414 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2415 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2416
2417 SV *tmp = *src; *src = *dst; *dst = tmp;
2418 }
1779 2419
1780MODULE = Coro::State PACKAGE = Coro 2420MODULE = Coro::State PACKAGE = Coro
1781 2421
1782BOOT: 2422BOOT:
1783{ 2423{
1784 int i; 2424 int i;
1785 2425
2426 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1786 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 2427 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1787 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 2428 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1788 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1789 2429
1790 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 2430 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1791 SvREADONLY_on (coro_current); 2431 SvREADONLY_on (coro_current);
1792 2432
1793 coro_stash = gv_stashpv ("Coro", TRUE); 2433 coro_stash = gv_stashpv ("Coro", TRUE);
… …
1801 2441
1802 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2442 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1803 coro_ready[i] = newAV (); 2443 coro_ready[i] = newAV ();
1804 2444
1805 { 2445 {
1806 SV *sv = perl_get_sv ("Coro::API", TRUE); 2446 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1807 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1808 2447
1809 coroapi.schedule = api_schedule; 2448 coroapi.schedule = api_schedule;
1810 coroapi.cede = api_cede; 2449 coroapi.cede = api_cede;
1811 coroapi.cede_notself = api_cede_notself; 2450 coroapi.cede_notself = api_cede_notself;
1812 coroapi.ready = api_ready; 2451 coroapi.ready = api_ready;
1813 coroapi.is_ready = api_is_ready; 2452 coroapi.is_ready = api_is_ready;
1814 coroapi.nready = &coro_nready; 2453 coroapi.nready = coro_nready;
1815 coroapi.current = coro_current; 2454 coroapi.current = coro_current;
1816 2455
1817 GCoroAPI = &coroapi; 2456 GCoroAPI = &coroapi;
1818 sv_setiv (sv, (IV)&coroapi); 2457 sv_setiv (sv, (IV)&coroapi);
1819 SvREADONLY_on (sv); 2458 SvREADONLY_on (sv);
1820 } 2459 }
1821} 2460}
2461
2462void
2463schedule (...)
2464 CODE:
2465 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2466
2467void
2468cede (...)
2469 CODE:
2470 CORO_EXECUTE_SLF_XS (slf_init_cede);
2471
2472void
2473cede_notself (...)
2474 CODE:
2475 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
1822 2476
1823void 2477void
1824_set_current (SV *current) 2478_set_current (SV *current)
1825 PROTOTYPE: $ 2479 PROTOTYPE: $
1826 CODE: 2480 CODE:
1827 SvREFCNT_dec (SvRV (coro_current)); 2481 SvREFCNT_dec (SvRV (coro_current));
1828 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2482 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2483
2484void
2485_set_readyhook (SV *hook)
2486 PROTOTYPE: $
2487 CODE:
2488 SvREFCNT_dec (coro_readyhook);
2489 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1829 2490
1830int 2491int
1831prio (Coro::State coro, int newprio = 0) 2492prio (Coro::State coro, int newprio = 0)
2493 PROTOTYPE: $;$
1832 ALIAS: 2494 ALIAS:
1833 nice = 1 2495 nice = 1
1834 CODE: 2496 CODE:
1835{ 2497{
1836 RETVAL = coro->prio; 2498 RETVAL = coro->prio;
… …
1851 2513
1852SV * 2514SV *
1853ready (SV *self) 2515ready (SV *self)
1854 PROTOTYPE: $ 2516 PROTOTYPE: $
1855 CODE: 2517 CODE:
1856 RETVAL = boolSV (api_ready (self)); 2518 RETVAL = boolSV (api_ready (aTHX_ self));
1857 OUTPUT: 2519 OUTPUT:
1858 RETVAL 2520 RETVAL
1859 2521
1860int 2522int
1861nready (...) 2523nready (...)
… …
1863 CODE: 2525 CODE:
1864 RETVAL = coro_nready; 2526 RETVAL = coro_nready;
1865 OUTPUT: 2527 OUTPUT:
1866 RETVAL 2528 RETVAL
1867 2529
1868void
1869throw (Coro::State self, SV *throw = &PL_sv_undef)
1870 PROTOTYPE: $;$
1871 CODE:
1872 SvREFCNT_dec (self->throw);
1873 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1874
1875# for async_pool speedup 2530# for async_pool speedup
1876void 2531void
1877_pool_1 (SV *cb) 2532_pool_1 (SV *cb)
1878 CODE: 2533 CODE:
1879{ 2534{
1880 struct coro *coro = SvSTATE (coro_current);
1881 HV *hv = (HV *)SvRV (coro_current); 2535 HV *hv = (HV *)SvRV (coro_current);
2536 struct coro *coro = SvSTATE_hv ((SV *)hv);
1882 AV *defav = GvAV (PL_defgv); 2537 AV *defav = GvAV (PL_defgv);
1883 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2538 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1884 AV *invoke_av; 2539 AV *invoke_av;
1885 int i, len; 2540 int i, len;
1886 2541
1887 if (!invoke) 2542 if (!invoke)
2543 {
2544 SV *old = PL_diehook;
2545 PL_diehook = 0;
2546 SvREFCNT_dec (old);
1888 croak ("\3async_pool terminate\2\n"); 2547 croak ("\3async_pool terminate\2\n");
2548 }
1889 2549
1890 SvREFCNT_dec (coro->saved_deffh); 2550 SvREFCNT_dec (coro->saved_deffh);
1891 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2551 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1892 2552
1893 hv_store (hv, "desc", sizeof ("desc") - 1, 2553 hv_store (hv, "desc", sizeof ("desc") - 1,
1894 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2554 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1895 2555
1896 invoke_av = (AV *)SvRV (invoke); 2556 invoke_av = (AV *)SvRV (invoke);
… …
1900 2560
1901 if (len > 0) 2561 if (len > 0)
1902 { 2562 {
1903 av_fill (defav, len - 1); 2563 av_fill (defav, len - 1);
1904 for (i = 0; i < len; ++i) 2564 for (i = 0; i < len; ++i)
1905 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2565 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1906 } 2566 }
1907
1908 SvREFCNT_dec (invoke);
1909} 2567}
1910 2568
1911void 2569void
1912_pool_2 (SV *cb) 2570_pool_2 (SV *cb)
1913 CODE: 2571 CODE:
1914{ 2572{
1915 struct coro *coro = SvSTATE (coro_current); 2573 struct coro *coro = SvSTATE_current;
1916 2574
1917 sv_setsv (cb, &PL_sv_undef); 2575 sv_setsv (cb, &PL_sv_undef);
1918 2576
1919 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2577 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1920 coro->saved_deffh = 0; 2578 coro->saved_deffh = 0;
1921 2579
1922 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2580 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1923 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2581 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2582 {
2583 SV *old = PL_diehook;
2584 PL_diehook = 0;
2585 SvREFCNT_dec (old);
1924 croak ("\3async_pool terminate\2\n"); 2586 croak ("\3async_pool terminate\2\n");
2587 }
1925 2588
1926 av_clear (GvAV (PL_defgv)); 2589 av_clear (GvAV (PL_defgv));
1927 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2590 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1928 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2591 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1929 2592
1930 coro->prio = 0; 2593 coro->prio = 0;
1931 2594
1932 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2595 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1933 api_trace (coro_current, 0); 2596 api_trace (aTHX_ coro_current, 0);
1934 2597
1935 av_push (av_async_pool, newSVsv (coro_current)); 2598 av_push (av_async_pool, newSVsv (coro_current));
1936} 2599}
1937 2600
1938 2601
1939MODULE = Coro::State PACKAGE = Coro::AIO 2602MODULE = Coro::State PACKAGE = Coro::AIO
1940 2603
1941SV * 2604void
1942_get_state () 2605_get_state (SV *self)
2606 PROTOTYPE: $
1943 CODE: 2607 PPCODE:
1944{ 2608{
1945 struct io_state *data; 2609 AV *defav = GvAV (PL_defgv);
1946 2610 AV *av = newAV ();
2611 int i;
1947 RETVAL = newSV (sizeof (struct io_state)); 2612 SV *data_sv = newSV (sizeof (struct io_state));
1948 data = (struct io_state *)SvPVX (RETVAL); 2613 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1949 SvCUR_set (RETVAL, sizeof (struct io_state)); 2614 SvCUR_set (data_sv, sizeof (struct io_state));
1950 SvPOK_only (RETVAL); 2615 SvPOK_only (data_sv);
1951 2616
1952 data->errorno = errno; 2617 data->errorno = errno;
1953 data->laststype = PL_laststype; 2618 data->laststype = PL_laststype;
1954 data->laststatval = PL_laststatval; 2619 data->laststatval = PL_laststatval;
1955 data->statcache = PL_statcache; 2620 data->statcache = PL_statcache;
2621
2622 av_extend (av, AvFILLp (defav) + 1 + 1);
2623
2624 for (i = 0; i <= AvFILLp (defav); ++i)
2625 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2626
2627 av_push (av, data_sv);
2628
2629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2630
2631 api_ready (aTHX_ self);
1956} 2632}
1957 OUTPUT:
1958 RETVAL
1959 2633
1960void 2634void
1961_set_state (char *data_) 2635_set_state (SV *state)
1962 PROTOTYPE: $ 2636 PROTOTYPE: $
1963 CODE: 2637 PPCODE:
1964{ 2638{
1965 struct io_state *data = (void *)data_; 2639 AV *av = (AV *)SvRV (state);
2640 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2641 int i;
1966 2642
1967 errno = data->errorno; 2643 errno = data->errorno;
1968 PL_laststype = data->laststype; 2644 PL_laststype = data->laststype;
1969 PL_laststatval = data->laststatval; 2645 PL_laststatval = data->laststatval;
1970 PL_statcache = data->statcache; 2646 PL_statcache = data->statcache;
1971}
1972 2647
2648 EXTEND (SP, AvFILLp (av));
2649 for (i = 0; i < AvFILLp (av); ++i)
2650 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2651}
2652
2653
2654MODULE = Coro::State PACKAGE = Coro::AnyEvent
2655
2656BOOT:
2657 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2658
2659void
2660_schedule (...)
2661 CODE:
2662{
2663 static int incede;
2664
2665 api_cede_notself (aTHX);
2666
2667 ++incede;
2668 while (coro_nready >= incede && api_cede (aTHX))
2669 ;
2670
2671 sv_setsv (sv_activity, &PL_sv_undef);
2672 if (coro_nready >= incede)
2673 {
2674 PUSHMARK (SP);
2675 PUTBACK;
2676 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2677 SPAGAIN;
2678 }
2679
2680 --incede;
2681}
2682
2683
2684MODULE = Coro::State PACKAGE = PerlIO::cede
2685
2686BOOT:
2687 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2688
2689MODULE = Coro::State PACKAGE = Coro::Semaphore
2690
2691SV *
2692new (SV *klass, SV *count_ = 0)
2693 CODE:
2694{
2695 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2696 AV *av = newAV ();
2697 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1));
2698 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2699}
2700 OUTPUT:
2701 RETVAL
2702
2703SV *
2704count (SV *self)
2705 CODE:
2706 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2707 OUTPUT:
2708 RETVAL
2709
2710void
2711up (SV *self, int adjust = 1)
2712 ALIAS:
2713 adjust = 1
2714 CODE:
2715 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2716
2717void
2718down (SV *self)
2719 CODE:
2720 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2721
2722void
2723try (SV *self)
2724 PPCODE:
2725{
2726 AV *av = (AV *)SvRV (self);
2727 SV *count_sv = AvARRAY (av)[0];
2728 IV count = SvIVX (count_sv);
2729
2730 if (count > 0)
2731 {
2732 --count;
2733 SvIVX (count_sv) = count;
2734 XSRETURN_YES;
2735 }
2736 else
2737 XSRETURN_NO;
2738}
2739
2740void
2741waiters (SV *self)
2742 CODE:
2743{
2744 AV *av = (AV *)SvRV (self);
2745
2746 if (GIMME_V == G_SCALAR)
2747 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2748 else
2749 {
2750 int i;
2751 EXTEND (SP, AvFILLp (av) + 1 - 1);
2752 for (i = 1; i <= AvFILLp (av); ++i)
2753 PUSHs (newSVsv (AvARRAY (av)[i]));
2754 }
2755}
2756

Diff Legend

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