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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.415 by root, Tue Aug 30 07:48:53 2011 UTC

… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
… …
31# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
32#else 34#else
33# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
34#endif 36#endif
35 37
36#ifdef HAVE_MMAP 38#if HAVE_MMAP
37# include <unistd.h> 39# include <unistd.h>
38# include <sys/mman.h> 40# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 42# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
61#endif 63#endif
62 64
63/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
65 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
68#endif 74#endif
69 75
70#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
87#endif 93#endif
88 94
89#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
90 96
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 97#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
108 99
109#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
110# if CORO_PTHREAD 101# if CORO_PTHREAD
111static void *coro_thx; 102static void *coro_thx;
112# endif 103# endif
113#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
114 108
115#ifdef __linux 109#ifdef __linux
116# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
126static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
127 121
128/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
131 126
132static U32 cctx_gen; 127static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 160static char times_valid;
166 161
167static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
169 164
170enum { 165enum
166{
171 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
200 196
201static coro_cctx *cctx_current; /* the currently running cctx */ 197static coro_cctx *cctx_current; /* the currently running cctx */
202 198
203/*****************************************************************************/ 199/*****************************************************************************/
204 200
201static MGVTBL coro_state_vtbl;
202
205enum { 203enum
204{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 210 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 211};
213 212
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 214typedef struct
216{ 215{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 216#define VARx(name,expr,type) type name;
223# include "state.h" 217# include "state.h"
224#undef VAR 218#undef VARx
225} perl_slots; 219} perl_slots;
226 220
221/* how many context stack entries do we need for perl_slots */
227#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 223
229/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
230struct coro { 225struct coro
226{
231 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 228 coro_cctx *cctx;
233 229
234 /* ready queue */ 230 /* ready queue */
235 struct coro *next_ready; 231 struct coro *next_ready;
… …
237 /* state data */ 233 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 235 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
241 237
242 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 242
249 /* statistics */ 243 /* statistics */
250 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
251 245
252 /* coro process data */ 246 /* coro process data */
253 int prio; 247 int prio;
254 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
256 252
257 /* async_pool */ 253 /* async_pool */
258 SV *saved_deffh; 254 SV *saved_deffh;
259 SV *invoke_cb; 255 SV *invoke_cb;
260 AV *invoke_av; 256 AV *invoke_av;
… …
292 288
293/* for Coro.pm */ 289/* for Coro.pm */
294static SV *coro_current; 290static SV *coro_current;
295static SV *coro_readyhook; 291static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
298static struct coro *coro_first; 294static struct coro *coro_first;
299#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
300 319
301/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
302 321
303static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 323static SV *coro_select_select;
… …
320 339
321/** time stuff **************************************************************/ 340/** time stuff **************************************************************/
322 341
323#ifdef HAS_GETTIMEOFDAY 342#ifdef HAS_GETTIMEOFDAY
324 343
325static void 344ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 345coro_u2time (pTHX_ UV ret[2])
327{ 346{
328 struct timeval tv; 347 struct timeval tv;
329 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
330 349
331 ret [0] = tv.tv_sec; 350 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 351 ret [1] = tv.tv_usec;
333} 352}
334 353
335static double 354ecb_inline double
336coro_nvtime () 355coro_nvtime (void)
337{ 356{
338 struct timeval tv; 357 struct timeval tv;
339 gettimeofday (&tv, 0); 358 gettimeofday (&tv, 0);
340 359
341 return tv.tv_sec + tv.tv_usec * 1e-6; 360 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 361}
343 362
344static void 363ecb_inline void
345time_init (pTHX) 364time_init (pTHX)
346{ 365{
347 nvtime = coro_nvtime; 366 nvtime = coro_nvtime;
348 u2time = coro_u2time; 367 u2time = coro_u2time;
349} 368}
350 369
351#else 370#else
352 371
353static void 372ecb_inline void
354time_init (pTHX) 373time_init (pTHX)
355{ 374{
356 SV **svp; 375 SV **svp;
357 376
358 require_pv ("Time/HiRes.pm"); 377 require_pv ("Time/HiRes.pm");
… …
370 389
371#endif 390#endif
372 391
373/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
374 393
375static SV * 394static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
377{ 396{
378#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 399 get_sv (name, create);
381#endif 400#endif
382 return get_sv (name, create); 401 return get_sv (name, create);
383} 402}
384 403
385static AV * 404static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
387{ 406{
388#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 409 get_av (name, create);
391#endif 410#endif
392 return get_av (name, create); 411 return get_av (name, create);
393} 412}
394 413
395static HV * 414static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
397{ 416{
398#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 419 get_hv (name, create);
401#endif 420#endif
402 return get_hv (name, create); 421 return get_hv (name, create);
403} 422}
404 423
405INLINE void 424ecb_inline void
406coro_times_update () 425coro_times_update (void)
407{ 426{
408#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
409 struct timespec ts; 428 struct timespec ts;
410 429
411 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
425#endif 444#endif
426} 445}
427 446
428INLINE void 447ecb_inline void
429coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
430{ 449{
431 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
438} 457}
439 458
440INLINE void 459ecb_inline void
441coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
442{ 461{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 463 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 472/* magic glue */
454 473
455#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 476
458#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 480 : mg_find (sv, type))
462 481
463#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 485 : 0)
467 486
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 489
471INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
473{ 507{
474 HV *stash;
475 MAGIC *mg; 508 MAGIC *mg;
476 509
477 if (SvROK (coro)) 510 if (SvROK (coro))
478 coro = SvRV (coro); 511 coro = SvRV (coro);
479 512
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
481 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
482 516
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 517 return (struct coro *)mg->mg_ptr;
493} 518}
494 519
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 521
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 525
501/*****************************************************************************/ 526/*****************************************************************************/
502/* padlist management and caching */ 527/* padlist management and caching */
503 528
504static AV * 529ecb_inline AV *
505coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
506{ 531{
507 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
509 534
… …
521 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
522 547
523 return newpadlist; 548 return newpadlist;
524} 549}
525 550
526static void 551ecb_inline void
527free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
528{ 553{
529 /* may be during global destruction */ 554 /* may be during global destruction */
530 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
531 { 556 {
… …
574 0, 0, 0, 0, 599 0, 0, 0, 0,
575 coro_cv_free 600 coro_cv_free
576}; 601};
577 602
578/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
579static void 604ecb_inline void
580get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
581{ 606{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 608 AV *av;
584 609
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 612 else
588 { 613 {
589#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 623#endif
599 } 624 }
600} 625}
601 626
602static void 627ecb_inline void
603put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
604{ 629{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 631 AV *av;
607 632
608 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
610 635
611 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
612 637
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
615 640
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 642}
618 643
… …
663 } 688 }
664#endif 689#endif
665 } 690 }
666} 691}
667 692
668#define SWAP_SVS(coro) \ 693#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 694 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 695 swap_svs (aTHX_ (coro))
671 696
672static void 697static void
673on_enterleave_call (pTHX_ SV *cb); 698on_enterleave_call (pTHX_ SV *cb);
674 699
… …
678 perl_slots *slot = c->slot; 703 perl_slots *slot = c->slot;
679 c->slot = 0; 704 c->slot = 0;
680 705
681 PL_mainstack = c->mainstack; 706 PL_mainstack = c->mainstack;
682 707
683 GvSV (PL_defgv) = slot->defsv; 708#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 709 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 710#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 711 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 712 # include "state.h"
691 #undef VAR 713 #undef VARx
714#endif
692 715
693 { 716 {
694 dSP; 717 dSP;
695 718
696 CV *cv; 719 CV *cv;
697 720
698 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
700 { 723 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
704 } 727 }
… …
707 } 730 }
708 731
709 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 733 CORO_THROW = c->except;
711 734
712 if (expect_false (enable_times)) 735 if (ecb_expect_false (enable_times))
713 { 736 {
714 if (expect_false (!times_valid)) 737 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 738 coro_times_update ();
716 739
717 coro_times_sub (c); 740 coro_times_sub (c);
718 } 741 }
719 742
720 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
721 { 744 {
722 int i; 745 int i;
723 746
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 754static void
732save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
733{ 756{
734 SWAP_SVS (c); 757 SWAP_SVS (c);
735 758
736 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
737 { 760 {
738 int i; 761 int i;
739 762
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 765 }
743 766
744 times_valid = 0; 767 times_valid = 0;
745 768
746 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
747 { 770 {
748 coro_times_update (); times_valid = 1; 771 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 772 coro_times_add (c);
750 } 773 }
751 774
… …
765 788
766 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
768 for (;;) 791 for (;;)
769 { 792 {
770 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
771 { 794 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
773 796
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 798 {
776 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
777 800
778 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
779 { 802 {
780 EXTEND (SP, 3); 803 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
787 } 810 }
788 } 811 }
789 } 812 }
790 813
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 815 break;
793 816
794 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
798 821
799 PUTBACK; 822 PUTBACK;
800 } 823 }
801 824
802 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 827 {
808 unsigned int i; 828 unsigned int i;
829
809 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 831 CXINC;
811 } 832
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
813 835
814 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
815 837
816 { 838 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 840
819 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
820 slot->defsv = DEFSV; 842 save_perl_slots (slot);
821 slot->errsv = ERRSV; 843#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 845 # include "state.h"
827 #undef VAR 846 #undef VARx
847#endif
828 } 848 }
829} 849}
830 850
831/* 851/*
832 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
839#else 859#else
840static void 860static void
841coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
842{ 862{
843 PL_curstackinfo = new_stackinfo(32, 8); 863 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 867
848 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 883#endif
864 884
865 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 887 PL_scopestack_max = 8;
888#if HAS_SCOPESTACK_NAME
889 New(54,PL_scopestack_name,8,const char*);
890#endif
868 891
869 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 894 PL_savestack_max = 24;
872 895
… …
900 } 923 }
901 924
902 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 926 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
905 Safefree (PL_savestack); 931 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 933 Safefree (PL_retstack);
908#endif 934#endif
909} 935}
… …
955#endif 981#endif
956 982
957/* 983/*
958 * This overrides the default magic get method of %SIG elements. 984 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 985 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 986 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 987 * we just provide our own readback here.
962 */ 988 */
963static int 989static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 991{
966 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
967 993
968 if (*s == '_') 994 if (*s == '_')
… …
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 998 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 999 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1000
975 if (svp) 1001 if (svp)
976 { 1002 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1003 SV *ssv;
1004
1005 if (!*svp)
1006 ssv = &PL_sv_undef;
1007 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1008 ssv = sv_2mortal (newRV_inc (*svp));
1009 else
1010 ssv = *svp;
1011
1012 sv_setsv (sv, ssv);
978 return 0; 1013 return 0;
979 } 1014 }
980 } 1015 }
981 1016
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1017 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1018}
984 1019
985static int 1020static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1021coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1022{
988 const char *s = MgPV_nolen_const (mg); 1023 const char *s = MgPV_nolen_const (mg);
989 1024
990 if (*s == '_') 1025 if (*s == '_')
… …
1004 } 1039 }
1005 1040
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1041 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1042}
1008 1043
1009static int 1044static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1045coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1046{
1012 const char *s = MgPV_nolen_const (mg); 1047 const char *s = MgPV_nolen_const (mg);
1013 1048
1014 if (*s == '_') 1049 if (*s == '_')
… …
1049 return 1; 1084 return 1;
1050} 1085}
1051 1086
1052static UNOP init_perl_op; 1087static UNOP init_perl_op;
1053 1088
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1089ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1090init_perl (pTHX_ struct coro *coro)
1056{ 1091{
1057 /* 1092 /*
1058 * emulate part of the perl startup here. 1093 * emulate part of the perl startup here.
1059 */ 1094 */
… …
1074 PL_parser = 0; 1109 PL_parser = 0;
1075#endif 1110#endif
1076 PL_hints = 0; 1111 PL_hints = 0;
1077 1112
1078 /* recreate the die/warn hooks */ 1113 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1114 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1115 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1116
1082 GvSV (PL_defgv) = newSV (0); 1117 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1118 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1119 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1120 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1141 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1142 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1143 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1144 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1145 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1146 slf_frame.destroy = 0;
1111 1147
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1148 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1149 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1150 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1151 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1156 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1157 CORO_THROW = coro->except;
1122 1158
1123 SWAP_SVS (coro); 1159 SWAP_SVS (coro);
1124 1160
1125 if (expect_false (enable_times)) 1161 if (ecb_expect_false (enable_times))
1126 { 1162 {
1127 coro_times_update (); 1163 coro_times_update ();
1128 coro_times_sub (coro); 1164 coro_times_sub (coro);
1129 } 1165 }
1130} 1166}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1190destroy_perl (pTHX_ struct coro *coro)
1155{ 1191{
1156 SV *svf [9]; 1192 SV *svf [9];
1157 1193
1158 { 1194 {
1195 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1196 struct coro *current = SvSTATE (old_current);
1160 1197
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1198 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1199
1163 save_perl (aTHX_ current); 1200 save_perl (aTHX_ current);
1201
1202 /* this will cause transfer_check to croak on block*/
1203 SvRV_set (coro_current, (SV *)coro->hv);
1204
1164 load_perl (aTHX_ coro); 1205 load_perl (aTHX_ coro);
1165 1206
1166 coro_unwind_stacks (aTHX); 1207 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1208
1169 /* restore swapped sv's */ 1209 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1210 SWAP_SVS (coro);
1171 1211
1212 coro_destruct_stacks (aTHX);
1213
1172 // now save some sv's to be free'd later 1214 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1215 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1216 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1217 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1218 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1219 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1221 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1222 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1223 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1224 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1225
1226 SvRV_set (coro_current, old_current);
1227
1184 load_perl (aTHX_ current); 1228 load_perl (aTHX_ current);
1185 } 1229 }
1186 1230
1187 { 1231 {
1188 unsigned int i; 1232 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1239 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1240 SvREFCNT_dec (coro->invoke_av);
1197 } 1241 }
1198} 1242}
1199 1243
1200INLINE void 1244ecb_inline void
1201free_coro_mortal (pTHX) 1245free_coro_mortal (pTHX)
1202{ 1246{
1203 if (expect_true (coro_mortal)) 1247 if (ecb_expect_true (coro_mortal))
1204 { 1248 {
1205 SvREFCNT_dec (coro_mortal); 1249 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1250 coro_mortal = 0;
1207 } 1251 }
1208} 1252}
1209 1253
1210static int 1254static int
… …
1343 1387
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1388 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1389}
1346 1390
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1391/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1392static void ecb_noinline
1349cctx_prepare (pTHX) 1393cctx_prepare (pTHX)
1350{ 1394{
1351 PL_top_env = &PL_start_env; 1395 PL_top_env = &PL_start_env;
1352 1396
1353 if (cctx_current->flags & CC_TRACE) 1397 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1408 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1409 slf_frame.check = slf_check_set_stacklevel;
1366} 1410}
1367 1411
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1412/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1413ecb_inline void
1370transfer_tail (pTHX) 1414transfer_tail (pTHX)
1371{ 1415{
1372 free_coro_mortal (aTHX); 1416 free_coro_mortal (aTHX);
1373} 1417}
1374 1418
… …
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1462 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1463 }
1420} 1464}
1421 1465
1422static coro_cctx * 1466static coro_cctx *
1423cctx_new () 1467cctx_new (void)
1424{ 1468{
1425 coro_cctx *cctx; 1469 coro_cctx *cctx;
1426 1470
1427 ++cctx_count; 1471 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1472 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1478 return cctx;
1435} 1479}
1436 1480
1437/* create a new cctx only suitable as source */ 1481/* create a new cctx only suitable as source */
1438static coro_cctx * 1482static coro_cctx *
1439cctx_new_empty () 1483cctx_new_empty (void)
1440{ 1484{
1441 coro_cctx *cctx = cctx_new (); 1485 coro_cctx *cctx = cctx_new ();
1442 1486
1443 cctx->sptr = 0; 1487 cctx->sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1488 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1446 return cctx; 1490 return cctx;
1447} 1491}
1448 1492
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1493/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1494static coro_cctx *
1451cctx_new_run () 1495cctx_new_run (void)
1452{ 1496{
1453 coro_cctx *cctx = cctx_new (); 1497 coro_cctx *cctx = cctx_new ();
1454 void *stack_start; 1498 void *stack_start;
1455 size_t stack_size; 1499 size_t stack_size;
1456 1500
1457#if HAVE_MMAP 1501#if HAVE_MMAP
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1502 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */ 1503 /* mmap supposedly does allocate-on-write for us */
1460 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1504 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1461 1505
1462 if (cctx->sptr != (void *)-1) 1506 if (cctx->sptr != (void *)-1)
1463 { 1507 {
1464 #if CORO_STACKGUARD 1508 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1509 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1570#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1571
1528static coro_cctx * 1572static coro_cctx *
1529cctx_get (pTHX) 1573cctx_get (pTHX)
1530{ 1574{
1531 while (expect_true (cctx_first)) 1575 while (ecb_expect_true (cctx_first))
1532 { 1576 {
1533 coro_cctx *cctx = cctx_first; 1577 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1578 cctx_first = cctx->next;
1535 --cctx_idle; 1579 --cctx_idle;
1536 1580
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1581 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1582 return cctx;
1539 1583
1540 cctx_destroy (cctx); 1584 cctx_destroy (cctx);
1541 } 1585 }
1542 1586
… …
1547cctx_put (coro_cctx *cctx) 1591cctx_put (coro_cctx *cctx)
1548{ 1592{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1593 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1550 1594
1551 /* free another cctx if overlimit */ 1595 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1596 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1597 {
1554 coro_cctx *first = cctx_first; 1598 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1599 cctx_first = first->next;
1556 --cctx_idle; 1600 --cctx_idle;
1557 1601
… …
1568static void 1612static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1613transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1614{
1571 /* TODO: throwing up here is considered harmful */ 1615 /* TODO: throwing up here is considered harmful */
1572 1616
1573 if (expect_true (prev != next)) 1617 if (ecb_expect_true (prev != next))
1574 { 1618 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1619 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1620 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1621
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1622 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1623 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1624
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1625#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1626 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1627 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1628#endif
1585 } 1629 }
1586} 1630}
1587 1631
1588/* always use the TRANSFER macro */ 1632/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1633static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1634transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1635{
1592 dSTACKLEVEL; 1636 dSTACKLEVEL;
1593 1637
1594 /* sometimes transfer is only called to set idle_sp */ 1638 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1639 if (ecb_expect_false (!prev))
1596 { 1640 {
1597 cctx_current->idle_sp = STACKLEVEL; 1641 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1642 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1643 }
1600 else if (expect_true (prev != next)) 1644 else if (ecb_expect_true (prev != next))
1601 { 1645 {
1602 coro_cctx *cctx_prev; 1646 coro_cctx *cctx_prev;
1603 1647
1604 if (expect_false (prev->flags & CF_NEW)) 1648 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1649 {
1606 /* create a new empty/source context */ 1650 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1651 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1652 prev->flags |= CF_RUNNING;
1609 } 1653 }
… …
1612 next->flags |= CF_RUNNING; 1656 next->flags |= CF_RUNNING;
1613 1657
1614 /* first get rid of the old state */ 1658 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1659 save_perl (aTHX_ prev);
1616 1660
1617 if (expect_false (next->flags & CF_NEW)) 1661 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1662 {
1619 /* need to start coroutine */ 1663 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1664 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1665 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1666 init_perl (aTHX_ next);
1623 } 1667 }
1624 else 1668 else
1625 load_perl (aTHX_ next); 1669 load_perl (aTHX_ next);
1626 1670
1627 /* possibly untie and reuse the cctx */ 1671 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1672 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1673 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1674 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1675 && !force_cctx
1632 )) 1676 ))
1633 { 1677 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1678 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1679 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1680
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1681 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1682 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1683 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1684 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1685 next->cctx = cctx_get (aTHX);
1642 1686
1643 cctx_put (cctx_current); 1687 cctx_put (cctx_current);
1644 } 1688 }
1645 else 1689 else
1646 prev->cctx = cctx_current; 1690 prev->cctx = cctx_current;
1647 1691
1648 ++next->usecount; 1692 ++next->usecount;
1649 1693
1650 cctx_prev = cctx_current; 1694 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1695 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1696
1653 next->cctx = 0; 1697 next->cctx = 0;
1654 1698
1655 if (expect_false (cctx_prev != cctx_current)) 1699 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1700 {
1657 cctx_prev->top_env = PL_top_env; 1701 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1702 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1703 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1704 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1710#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1711#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1712
1669/** high level stuff ********************************************************/ 1713/** high level stuff ********************************************************/
1670 1714
1715/* this function is actually Coro, not Coro::State, but we call it from here */
1716/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1717static void
1718coro_call_on_destroy (pTHX_ struct coro *coro);
1719
1720static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1721coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1722{
1674 if (coro->flags & CF_DESTROYED) 1723 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1724 return;
1676 1725
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1726 slf_destroy (aTHX_ coro);
1679 1727
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1728 coro->flags |= CF_ZOMBIE;
1689 1729
1690 if (coro->flags & CF_READY) 1730 if (coro->flags & CF_READY)
1691 { 1731 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1732 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1733 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1734 --coro_nready;
1695 } 1735 }
1696 else 1736 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1737 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1738
1739 if (coro->next) coro->next->prev = coro->prev;
1740 if (coro->prev) coro->prev->next = coro->next;
1741 if (coro == coro_first) coro_first = coro->next;
1698 1742
1699 if (coro->mainstack 1743 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1744 && coro->mainstack != main_mainstack
1701 && coro->slot 1745 && coro->slot
1702 && !PL_dirty) 1746 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1747 destroy_perl (aTHX_ coro);
1704 1748
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1749 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1750 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1751 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1752 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1753 SvREFCNT_dec (CORO_THROW);
1714 1754
1715 return 1; 1755 coro_call_on_destroy (aTHX_ coro);
1756
1757 /* more destruction mayhem in coro_state_free */
1716} 1758}
1717 1759
1718static int 1760static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1761coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1762{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1763 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1764 mg->mg_ptr = 0;
1723 1765
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1766 coro_state_destroy (aTHX_ coro);
1767 SvREFCNT_dec (coro->on_destroy);
1768 SvREFCNT_dec (coro->status);
1769
1729 Safefree (coro); 1770 Safefree (coro);
1730 }
1731 1771
1732 return 0; 1772 return 0;
1733} 1773}
1734 1774
1735static int 1775static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1776coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1777{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1778 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1779 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1780 mg->mg_ptr = 0;
1781 mg->mg_virtual = 0;
1741 1782
1742 return 0; 1783 return 0;
1743} 1784}
1744 1785
1745static MGVTBL coro_state_vtbl = { 1786static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1811 TRANSFER (ta, 1);
1771} 1812}
1772 1813
1773/** Coro ********************************************************************/ 1814/** Coro ********************************************************************/
1774 1815
1775INLINE void 1816ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1817coro_enq (pTHX_ struct coro *coro)
1777{ 1818{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1819 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1820
1780 SvREFCNT_inc_NN (coro->hv); 1821 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1823 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1824 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1825 ready [1] = coro;
1785} 1826}
1786 1827
1787INLINE struct coro * 1828ecb_inline struct coro *
1788coro_deq (pTHX) 1829coro_deq (pTHX)
1789{ 1830{
1790 int prio; 1831 int prio;
1791 1832
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1833 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1886{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1887 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1888}
1848 1889
1849/* expects to own a reference to next->hv */ 1890/* expects to own a reference to next->hv */
1850INLINE void 1891ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1892prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1893{
1853 SV *prev_sv = SvRV (coro_current); 1894 SV *prev_sv = SvRV (coro_current);
1854 1895
1855 ta->prev = SvSTATE_hv (prev_sv); 1896 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1909{
1869 for (;;) 1910 for (;;)
1870 { 1911 {
1871 struct coro *next = coro_deq (aTHX); 1912 struct coro *next = coro_deq (aTHX);
1872 1913
1873 if (expect_true (next)) 1914 if (ecb_expect_true (next))
1874 { 1915 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1916 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1917 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1918 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1919 else
1879 { 1920 {
1880 next->flags &= ~CF_READY; 1921 next->flags &= ~CF_READY;
1881 --coro_nready; 1922 --coro_nready;
… …
1914 } 1955 }
1915 } 1956 }
1916 } 1957 }
1917} 1958}
1918 1959
1919INLINE void 1960ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1961prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1962{
1922 api_ready (aTHX_ coro_current); 1963 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1964 prepare_schedule (aTHX_ ta);
1924} 1965}
1925 1966
1926INLINE void 1967ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1969{
1929 SV *prev = SvRV (coro_current); 1970 SV *prev = SvRV (coro_current);
1930 1971
1931 if (coro_nready) 1972 if (coro_nready)
… …
1961{ 2002{
1962 struct coro_transfer_args ta; 2003 struct coro_transfer_args ta;
1963 2004
1964 prepare_cede (aTHX_ &ta); 2005 prepare_cede (aTHX_ &ta);
1965 2006
1966 if (expect_true (ta.prev != ta.next)) 2007 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2008 {
1968 TRANSFER (ta, 1); 2009 TRANSFER (ta, 1);
1969 return 1; 2010 return 1;
1970 } 2011 }
1971 else 2012 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2055 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2056 }
2016} 2057}
2017 2058
2018static void 2059static void
2060coro_push_av (pTHX_ AV *av, I32 gimme_v)
2061{
2062 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2063 {
2064 dSP;
2065
2066 if (gimme_v == G_SCALAR)
2067 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2068 else
2069 {
2070 int i;
2071 EXTEND (SP, AvFILLp (av) + 1);
2072
2073 for (i = 0; i <= AvFILLp (av); ++i)
2074 PUSHs (AvARRAY (av)[i]);
2075 }
2076
2077 PUTBACK;
2078 }
2079}
2080
2081static void
2082coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2083{
2084 if (!coro->on_destroy)
2085 coro->on_destroy = newAV ();
2086
2087 av_push (coro->on_destroy, cb);
2088}
2089
2090static void
2091slf_destroy_join (pTHX_ struct CoroSLF *frame)
2092{
2093 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2094}
2095
2096static int
2097slf_check_join (pTHX_ struct CoroSLF *frame)
2098{
2099 struct coro *coro = (struct coro *)frame->data;
2100
2101 if (!coro->status)
2102 return 1;
2103
2104 frame->destroy = 0;
2105
2106 coro_push_av (aTHX_ coro->status, GIMME_V);
2107
2108 SvREFCNT_dec ((SV *)coro->hv);
2109
2110 return 0;
2111}
2112
2113static void
2114slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2115{
2116 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2117
2118 if (items > 1)
2119 croak ("join called with too many arguments");
2120
2121 if (coro->status)
2122 frame->prepare = prepare_nop;
2123 else
2124 {
2125 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2126 frame->prepare = prepare_schedule;
2127 }
2128
2129 frame->check = slf_check_join;
2130 frame->destroy = slf_destroy_join;
2131 frame->data = (void *)coro;
2132 SvREFCNT_inc (coro->hv);
2133}
2134
2135static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2136coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2137{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2138 AV *od = coro->on_destroy;
2022 2139
2023 if (on_destroyp) 2140 if (!od)
2024 { 2141 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2142
2029 while (AvFILLp (on_destroy) >= 0) 2143 while (AvFILLp (od) >= 0)
2144 {
2145 SV *cb = sv_2mortal (av_pop (od));
2146
2147 /* coro hv's (and only hv's at the moment) are supported as well */
2148 if (SvSTATEhv_p (aTHX_ cb))
2149 api_ready (aTHX_ cb);
2150 else
2030 { 2151 {
2031 dSP; /* don't disturb outer sp */ 2152 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2153 PUSHMARK (SP);
2035 2154
2036 if (statusp) 2155 if (coro->status)
2037 { 2156 {
2038 int i; 2157 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2158 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2159 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2160 }
2044 2161
2045 PUTBACK; 2162 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2163 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2164 }
2048 } 2165 }
2049} 2166}
2050 2167
2051static void 2168static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2169coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2170{
2054 AV *av = newAV (); 2171 AV *av;
2172
2173 if (coro->status)
2174 {
2175 av = coro->status;
2176 av_clear (av);
2177 }
2178 else
2179 av = coro->status = newAV ();
2055 2180
2056 /* items are actually not so common, so optimise for this case */ 2181 /* items are actually not so common, so optimise for this case */
2057 if (items) 2182 if (items)
2058 { 2183 {
2059 int i; 2184 int i;
… …
2061 av_extend (av, items - 1); 2186 av_extend (av, items - 1);
2062 2187
2063 for (i = 0; i < items; ++i) 2188 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2189 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2190 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2191}
2069 2192
2070static void 2193static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2194slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2195{
… …
2084static void 2207static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2208slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2209{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2210 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2211
2089 coro_set_status (coro_hv, arg, items); 2212 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2213 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2214}
2092 2215
2093static void 2216static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2217slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2218{
… …
2100 croak ("Coro::cancel called without coro object,"); 2223 croak ("Coro::cancel called without coro object,");
2101 2224
2102 coro = SvSTATE (arg [0]); 2225 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2226 coro_hv = coro->hv;
2104 2227
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2228 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2229
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2230 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2231 {
2109 /* coro currently busy cancelling something, so just notify it */ 2232 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2233 coro->slf_frame.data = (void *)coro;
2111 2234
2112 frame->prepare = prepare_nop; 2235 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2236 frame->check = slf_check_nop;
2114 } 2237 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2238 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2239 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2240 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2241 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2242 }
2120 else 2243 else
2121 { 2244 {
2122 struct coro *self = SvSTATE_current; 2245 struct coro *self = SvSTATE_current;
2123 2246
… …
2127 * this is ugly, and hopefully fully worth the extra speed. 2250 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2251 * besides, I can't get the slow-but-safe version working...
2129 */ 2252 */
2130 slf_frame.data = 0; 2253 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2254 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2255 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2256 self->flags &= ~CF_NOCANCEL;
2137 2257
2138 if (slf_frame.data) 2258 if (slf_frame.data)
2139 { 2259 {
2140 /* while we were busy we have been cancelled, so terminate */ 2260 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2261 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2262 }
2143 else 2263 else
2144 { 2264 {
2145 frame->prepare = prepare_nop; 2265 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2266 frame->check = slf_check_nop;
2147 } 2267 }
2148 } 2268 }
2149} 2269}
2150 2270
2271static int
2272slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2273{
2274 frame->prepare = 0;
2275 coro_unwind_stacks (aTHX);
2276
2277 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2278
2279 return 1;
2280}
2281
2282static int
2283safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2284{
2285 if (coro->cctx)
2286 croak ("coro inside C callback, unable to cancel at this time, caught");
2287
2288 if (coro->flags & CF_NEW)
2289 {
2290 coro_set_status (aTHX_ coro, arg, items);
2291 coro_state_destroy (aTHX_ coro);
2292 }
2293 else
2294 {
2295 if (!coro->slf_frame.prepare)
2296 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2297
2298 slf_destroy (aTHX_ coro);
2299
2300 coro_set_status (aTHX_ coro, arg, items);
2301 coro->slf_frame.prepare = prepare_nop;
2302 coro->slf_frame.check = slf_check_safe_cancel;
2303
2304 api_ready (aTHX_ (SV *)coro->hv);
2305 }
2306
2307 return 1;
2308}
2309
2151/*****************************************************************************/ 2310/*****************************************************************************/
2152/* async pool handler */ 2311/* async pool handler */
2153 2312
2154static int 2313static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2314slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2343slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2344{
2186 HV *hv = (HV *)SvRV (coro_current); 2345 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2346 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2347
2189 if (expect_true (coro->saved_deffh)) 2348 if (ecb_expect_true (coro->saved_deffh))
2190 { 2349 {
2191 /* subsequent iteration */ 2350 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2351 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2352 coro->saved_deffh = 0;
2194 2353
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2354 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2355 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2356 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2357 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2358 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2359 }
2203 else 2360 else
2204 { 2361 {
2205 av_clear (GvAV (PL_defgv)); 2362 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2363 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2429static void 2586static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2587slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2588{
2432 frame->prepare = prepare_cede_notself; 2589 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2590 frame->check = slf_check_nop;
2591}
2592
2593/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2594static void
2595slf_destroy (pTHX_ struct coro *coro)
2596{
2597 /* this callback is reserved for slf functions needing to do cleanup */
2598 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2599 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2600
2601 /*
2602 * The on_destroy above most likely is from an SLF call.
2603 * Since by definition the SLF call will not finish when we destroy
2604 * the coro, we will have to force-finish it here, otherwise
2605 * cleanup functions cannot call SLF functions.
2606 */
2607 coro->slf_frame.prepare = 0;
2434} 2608}
2435 2609
2436/* 2610/*
2437 * these not obviously related functions are all rolled into one 2611 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2612 * function to increase chances that they all will call transfer with the same
… …
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2619 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2620
2447 /* set up the slf frame, unless it has already been set-up */ 2621 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2622 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2623 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2624 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2625 {
2452 /* first iteration */ 2626 /* first iteration */
2453 dSP; 2627 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2628 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2629 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2670 while (slf_frame.check (aTHX_ &slf_frame));
2497 2671
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2672 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2673
2500 /* exception handling */ 2674 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2675 if (ecb_expect_false (CORO_THROW))
2502 { 2676 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2677 SV *exception = sv_2mortal (CORO_THROW);
2504 2678
2505 CORO_THROW = 0; 2679 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2680 sv_setsv (ERRSV, exception);
2507 croak (0); 2681 croak (0);
2508 } 2682 }
2509 2683
2510 /* return value handling - mostly like entersub */ 2684 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2685 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2686 if (GIMME_V == G_SCALAR
2687 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2688 {
2514 dSP; 2689 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2690 SV **bot = PL_stack_base + checkmark;
2516 2691
2517 if (sp == bot) /* too few, push undef */ 2692 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2693 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2694 else /* too many, take last one */
2520 bot [1] = *sp; 2695 bot [1] = *sp;
2521 2696
2522 SP = bot + 1; 2697 SP = bot + 1;
2523 2698
2524 PUTBACK; 2699 PUTBACK;
… …
2631{ 2806{
2632 PerlIOBuf base; 2807 PerlIOBuf base;
2633 NV next, every; 2808 NV next, every;
2634} PerlIOCede; 2809} PerlIOCede;
2635 2810
2636static IV 2811static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2812PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2813{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2814 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2815
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2816 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2817 self->next = nvtime () + self->every;
2643 2818
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2819 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2820}
2646 2821
2647static SV * 2822static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2823PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2824{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2825 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2826
2652 return newSVnv (self->every); 2827 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2939 SvREFCNT_dec (cb);
2765 } 2940 }
2766} 2941}
2767 2942
2768static void 2943static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2944coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2945{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2946 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2947 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2948}
2774 2949
2775static int 2950static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2951slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2952{
2778 AV *av = (AV *)frame->data; 2953 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2954 SV *count_sv = AvARRAY (av)[0];
2955 SV *coro_hv = SvRV (coro_current);
2780 2956
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 2957 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 2958 if (CORO_THROW)
2783 return 0; 2959 return 0;
2784 else if (SvIVX (count_sv) > 0) 2960 else if (SvIVX (count_sv) > 0)
2785 { 2961 {
2786 SvSTATE_current->on_destroy = 0; 2962 frame->destroy = 0;
2787 2963
2788 if (acquire) 2964 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2965 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2966 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2967 coro_semaphore_adjust (aTHX_ av, 0);
… …
2796 { 2972 {
2797 int i; 2973 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 2974 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 2975 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 2976 /* this avoids some degenerate memory usage cases */
2801 2977 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 2978 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2979 return 1;
2805 2980
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2981 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2982 return 1;
2808 } 2983 }
2809} 2984}
2810 2985
2811static int 2986static int
… …
2834 { 3009 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3010 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3011
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3012 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3013 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3014 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3015 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3016 frame->destroy = coro_semaphore_destroy;
2843 } 3017 }
2844} 3018}
2845 3019
2846static void 3020static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3021slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3065 dSP; 3239 dSP;
3066 3240
3067 static SV *prio_cv; 3241 static SV *prio_cv;
3068 static SV *prio_sv; 3242 static SV *prio_sv;
3069 3243
3070 if (expect_false (!prio_cv)) 3244 if (ecb_expect_false (!prio_cv))
3071 { 3245 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3246 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3247 prio_sv = newSViv (0);
3074 } 3248 }
3075 3249
… …
3181 } 3355 }
3182 3356
3183 return coro_sv; 3357 return coro_sv;
3184} 3358}
3185 3359
3360#ifndef __cplusplus
3361ecb_cold XS(boot_Coro__State);
3362#endif
3363
3364#if CORO_JIT
3365
3366static void ecb_noinline ecb_cold
3367pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3368{
3369 dSP;
3370 AV *av = newAV ();
3371
3372 av_store (av, 3, newSVuv (d));
3373 av_store (av, 2, newSVuv (c));
3374 av_store (av, 1, newSVuv (b));
3375 av_store (av, 0, newSVuv (a));
3376
3377 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3378
3379 PUTBACK;
3380}
3381
3382static void ecb_noinline ecb_cold
3383jit_init (pTHX)
3384{
3385 dSP;
3386 SV *load, *save;
3387 char *map_base;
3388 char *load_ptr, *save_ptr;
3389 STRLEN load_len, save_len, map_len;
3390 int count;
3391
3392 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3393
3394 PUSHMARK (SP);
3395#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3396# include "state.h"
3397#undef VARx
3398 count = call_pv ("Coro::State::_jit", G_ARRAY);
3399 SPAGAIN;
3400
3401 save = POPs; save_ptr = SvPVbyte (save, save_len);
3402 load = POPs; load_ptr = SvPVbyte (load, load_len);
3403
3404 map_len = load_len + save_len + 16;
3405
3406 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3407
3408 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3409
3410 load_perl_slots = (load_save_perl_slots_type)map_base;
3411 memcpy (map_base, load_ptr, load_len);
3412
3413 map_base += (load_len + 15) & ~15;
3414
3415 save_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, save_ptr, save_len);
3417
3418 /* we are good citizens and try to make the page read-only, so the evil evil */
3419 /* hackers might have it a bit more difficult */
3420 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3421
3422 PUTBACK;
3423 eval_pv ("undef &Coro::State::_jit", 1);
3424}
3425
3426#endif
3427
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3428MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3429
3188PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3189 3431
3190BOOT: 3432BOOT:
… …
3193# if CORO_PTHREAD 3435# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3436 coro_thx = PERL_GET_CONTEXT;
3195# endif 3437# endif
3196#endif 3438#endif
3197 BOOT_PAGESIZE; 3439 BOOT_PAGESIZE;
3440
3441 /* perl defines these to check for existance first, but why it doesn't */
3442 /* just create them one at init time is not clear to me, except for */
3443 /* programs trying to delete them, but... */
3444 /* anyway, we declare this as invalid and make sure they are initialised here */
3445 DEFSV;
3446 ERRSV;
3198 3447
3199 cctx_current = cctx_new_empty (); 3448 cctx_current = cctx_new_empty ();
3200 3449
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3450 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3451 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3494 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3495
3247 time_init (aTHX); 3496 time_init (aTHX);
3248 3497
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3498 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3499#if CORO_JIT
3500 PUTBACK;
3501 jit_init (aTHX);
3502 SPAGAIN;
3503#endif
3250} 3504}
3251 3505
3252SV * 3506SV *
3253new (SV *klass, ...) 3507new (SV *klass, ...)
3254 ALIAS: 3508 ALIAS:
… …
3396 PROTOTYPE: $ 3650 PROTOTYPE: $
3397 ALIAS: 3651 ALIAS:
3398 is_ready = CF_READY 3652 is_ready = CF_READY
3399 is_running = CF_RUNNING 3653 is_running = CF_RUNNING
3400 is_new = CF_NEW 3654 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3655 is_destroyed = CF_ZOMBIE
3656 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3657 is_suspended = CF_SUSPENDED
3403 CODE: 3658 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3659 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3660 OUTPUT:
3406 RETVAL 3661 RETVAL
… …
3501times (Coro::State self) 3756times (Coro::State self)
3502 PPCODE: 3757 PPCODE:
3503{ 3758{
3504 struct coro *current = SvSTATE (coro_current); 3759 struct coro *current = SvSTATE (coro_current);
3505 3760
3506 if (expect_false (current == self)) 3761 if (ecb_expect_false (current == self))
3507 { 3762 {
3508 coro_times_update (); 3763 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3764 coro_times_add (SvSTATE (coro_current));
3510 } 3765 }
3511 3766
3512 EXTEND (SP, 2); 3767 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3768 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3769 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3770
3516 if (expect_false (current == self)) 3771 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3772 coro_times_sub (SvSTATE (coro_current));
3518} 3773}
3519 3774
3520void 3775void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3776swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3797BOOT:
3543{ 3798{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3802 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3804 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3805 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3806 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3595void 3849void
3596_destroy (Coro::State coro) 3850_destroy (Coro::State coro)
3597 CODE: 3851 CODE:
3598 /* used by the manager thread */ 3852 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3853 coro_state_destroy (aTHX_ coro);
3854
3855void
3856on_destroy (Coro::State coro, SV *cb)
3857 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3858 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3859
3860void
3861join (...)
3862 CODE:
3863 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3864
3602void 3865void
3603terminate (...) 3866terminate (...)
3604 CODE: 3867 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3868 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3869
3607void 3870void
3608cancel (...) 3871cancel (...)
3609 CODE: 3872 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3873 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3874
3875int
3876safe_cancel (Coro::State self, ...)
3877 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3878
3612void 3879void
3613schedule (...) 3880schedule (...)
3614 CODE: 3881 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3882 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3891} 4158}
3892 4159
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4160MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4161
3895void 4162void
3896_may_delete (SV *sem, int count, int extra_refs) 4163_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4164 PPCODE:
3898{ 4165{
3899 AV *av = (AV *)SvRV (sem); 4166 AV *av = (AV *)SvRV (sem);
3900 4167
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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