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.403 by root, Sun May 22 20:13:33 2011 UTC vs.
Revision 1.466 by root, Sat Jun 25 19:22:33 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
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 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
18#include <stddef.h> 22#include <stddef.h>
19#include <stdio.h> 23#include <stdio.h>
20#include <errno.h> 24#include <errno.h>
21#include <assert.h> 25#include <assert.h>
22 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
23#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
24# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
25#endif 66#endif
26 67
27#if defined(_WIN32) 68#if defined(_WIN32)
28# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
29# undef setjmp 70# undef setjmp
32# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
33#else 74#else
34# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
35#endif 76#endif
36 77
37#ifdef HAVE_MMAP
38# include <unistd.h>
39# include <sys/mman.h>
40# ifndef MAP_ANONYMOUS
41# ifdef MAP_ANON
42# define MAP_ANONYMOUS MAP_ANON
43# else
44# undef HAVE_MMAP
45# endif
46# endif
47# include <limits.h>
48# ifndef PAGESIZE
49# define PAGESIZE pagesize
50# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
51static long pagesize;
52# else
53# define BOOT_PAGESIZE (void)0
54# endif
55#else
56# define PAGESIZE 0
57# define BOOT_PAGESIZE (void)0
58#endif
59
60#if CORO_USE_VALGRIND
61# include <valgrind/valgrind.h>
62#endif
63
64/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
65static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
66 80
67#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
68# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
69#endif
70
71#ifndef CORO_STACKGUARD
72# define CORO_STACKGUARD 0
73#endif 83#endif
74 84
75/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
76#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
77# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
87# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
88#endif 98#endif
89 99
90#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
91 101
92#if __GNUC__ >= 3
93# define attribute(x) __attribute__(x)
94# define expect(expr,value) __builtin_expect ((expr), (value))
95# define INLINE static inline
96#else
97# define attribute(x)
98# define expect(expr,value) (expr)
99# define INLINE static
100#endif
101
102#define expect_false(expr) expect ((expr) != 0, 0)
103#define expect_true(expr) expect ((expr) != 0, 1)
104
105#define NOINLINE attribute ((noinline))
106
107#include "CoroAPI.h" 102#include "CoroAPI.h"
108#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
109 104
110#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
111# if CORO_PTHREAD 106# if CORO_PTHREAD
121# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
122# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
123# endif 118# endif
124#endif 119#endif
125 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
126static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
127static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
128 129
129/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
130#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
145 146
146static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
147static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
148static SV *rv_diehook; 149static SV *rv_diehook;
149static SV *rv_warnhook; 150static SV *rv_warnhook;
150static HV *hv_sig; /* %SIG */
151 151
152/* async_pool helper stuff */ 152/* async_pool helper stuff */
153static SV *sv_pool_rss; 153static SV *sv_pool_rss;
154static SV *sv_pool_size; 154static SV *sv_pool_size;
155static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
183typedef struct coro_cctx 183typedef struct coro_cctx
184{ 184{
185 struct coro_cctx *next; 185 struct coro_cctx *next;
186 186
187 /* the stack */ 187 /* the stack */
188 void *sptr; 188 struct coro_stack stack;
189 size_t ssize;
190 189
191 /* cpu state */ 190 /* cpu state */
192 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
193 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
194 JMPENV *top_env; 195 JMPENV *top_env;
195 coro_context cctx; 196 coro_context cctx;
196 197
197 U32 gen; 198 U32 gen;
198#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
218}; 219};
219 220
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 222typedef struct
222{ 223{
223 SV *defsv;
224 AV *defav;
225 SV *errsv;
226 SV *irsgv;
227 HV *hinthv;
228#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
229# include "state.h" 225 #include "state.h"
230#undef VAR
231} perl_slots; 226} perl_slots;
232 227
233// how many context stack entries do we need for perl_slots 228/* how many context stack entries do we need for perl_slots */
234#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
235 230
236/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
237struct coro 232struct coro
238{ 233{
266 SV *saved_deffh; 261 SV *saved_deffh;
267 SV *invoke_cb; 262 SV *invoke_cb;
268 AV *invoke_av; 263 AV *invoke_av;
269 264
270 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
271 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
272 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
273 268
274 /* swap_sv */ 269 /* swap_sv */
275 AV *swap_sv; 270 AV *swap_sv;
276 271
277 /* times */ 272 /* times */
304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
305static CV *cv_coro_run; 300static CV *cv_coro_run;
306static struct coro *coro_first; 301static struct coro *coro_first;
307#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
308 303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
326
309/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
310 328
311static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select; 330static SV *coro_select_select;
313 331
328 346
329/** time stuff **************************************************************/ 347/** time stuff **************************************************************/
330 348
331#ifdef HAS_GETTIMEOFDAY 349#ifdef HAS_GETTIMEOFDAY
332 350
333static void 351ecb_inline void
334coro_u2time (pTHX_ UV ret[2]) 352coro_u2time (pTHX_ UV ret[2])
335{ 353{
336 struct timeval tv; 354 struct timeval tv;
337 gettimeofday (&tv, 0); 355 gettimeofday (&tv, 0);
338 356
339 ret [0] = tv.tv_sec; 357 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec; 358 ret [1] = tv.tv_usec;
341} 359}
342 360
343static double 361ecb_inline double
344coro_nvtime () 362coro_nvtime (void)
345{ 363{
346 struct timeval tv; 364 struct timeval tv;
347 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
348 366
349 return tv.tv_sec + tv.tv_usec * 1e-6; 367 return tv.tv_sec + tv.tv_usec * 1e-6;
350} 368}
351 369
352static void 370ecb_inline void
353time_init (pTHX) 371time_init (pTHX)
354{ 372{
355 nvtime = coro_nvtime; 373 nvtime = coro_nvtime;
356 u2time = coro_u2time; 374 u2time = coro_u2time;
357} 375}
358 376
359#else 377#else
360 378
361static void 379ecb_inline void
362time_init (pTHX) 380time_init (pTHX)
363{ 381{
364 SV **svp; 382 SV **svp;
365 383
366 require_pv ("Time/HiRes.pm"); 384 require_pv ("Time/HiRes.pm");
367 385
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369 387
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372 390
378 396
379#endif 397#endif
380 398
381/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
382 400
383static SV * 401static SV * ecb_noinline
384coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
385{ 403{
386#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_sv (name, create); 406 get_sv (name, create);
389#endif 407#endif
390 return get_sv (name, create); 408 return get_sv (name, create);
391} 409}
392 410
393static AV * 411static AV * ecb_noinline
394coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
395{ 413{
396#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_av (name, create); 416 get_av (name, create);
399#endif 417#endif
400 return get_av (name, create); 418 return get_av (name, create);
401} 419}
402 420
403static HV * 421static HV * ecb_noinline
404coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
405{ 423{
406#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
407 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
408 get_hv (name, create); 426 get_hv (name, create);
409#endif 427#endif
410 return get_hv (name, create); 428 return get_hv (name, create);
411} 429}
412 430
413INLINE void 431ecb_inline void
414coro_times_update () 432coro_times_update (void)
415{ 433{
416#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
417 struct timespec ts; 435 struct timespec ts;
418 436
419 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
431 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
433#endif 451#endif
434} 452}
435 453
436INLINE void 454ecb_inline void
437coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
438{ 456{
439 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
443 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
446} 464}
447 465
448INLINE void 466ecb_inline void
449coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
450{ 468{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
452 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
461/* magic glue */ 479/* magic glue */
462 480
463#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
464#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
465 483
466#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
467 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
468 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
469 : mg_find (sv, type)) 487 : mg_find (sv, type))
470 488
471#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
472 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
473 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
474 : 0) 492 : 0)
475 493
476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
477#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
478 496
479INLINE MAGIC * 497ecb_inline MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
481{ 499{
482 MAGIC *mg; 500 MAGIC *mg;
483 501
484 if (expect_true ( 502 if (ecb_expect_true (
485 SvTYPE (coro) == SVt_PVHV 503 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro)) 504 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl 505 && mg->mg_virtual == &coro_state_vtbl
488 )) 506 ))
489 return mg; 507 return mg;
490 508
491 return 0; 509 return 0;
492} 510}
493 511
494INLINE struct coro * 512ecb_inline struct coro *
495SvSTATE_ (pTHX_ SV *coro) 513SvSTATE_ (pTHX_ SV *coro_sv)
496{ 514{
497 MAGIC *mg; 515 MAGIC *mg;
498 516
499 if (SvROK (coro)) 517 if (SvROK (coro_sv))
500 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
501 519
502 mg = SvSTATEhv_p (aTHX_ coro); 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
503 if (!mg) 521 if (!mg)
504 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
505 523
506 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
507} 525}
513#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
514 532
515/*****************************************************************************/ 533/*****************************************************************************/
516/* padlist management and caching */ 534/* padlist management and caching */
517 535
518static AV * 536ecb_inline PADLIST *
519coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
520{ 538{
521 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
522 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
523 544
524 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
525 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
526#if PERL_VERSION_ATLEAST (5,10,0)
527 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
528#else
529 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
530#endif 574#endif
531 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
532 --AvFILLp (padlist);
533 575
534 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
535 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
536 584
537 return newpadlist; 585 return newpadlist;
538} 586}
539 587
540static void 588ecb_inline void
541free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
542{ 590{
543 /* may be during global destruction */ 591 /* may be during global destruction */
544 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
545 { 593 {
546 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
547 595
548 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
549 { 597 {
550 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
551 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
552 I32 j = AvFILLp (av);
553 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
554 while (j >= 0) 605 while (j >= 0)
555 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
556 607
557 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
558 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
559 } 611 }
560 612
561 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
562 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
563 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
564 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
565 } 623 }
566} 624}
567 625
568static int 626static int
569coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
570{ 628{
571 AV *padlist; 629 PADLIST *padlist;
572 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
573 632
574 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
576 return 0; 635 return 0;
577 636
578 /* casting is fun. */ 637 while (len--)
579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
580 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
581
582 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
583 639
584 return 0; 640 return 0;
585} 641}
586 642
587static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
588 0, 0, 0, 0, 644 0, 0, 0, 0,
589 coro_cv_free 645 coro_cv_free
590}; 646};
591 647
592/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
593static void 649ecb_inline void
594get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
595{ 651{
596 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
597 AV *av; 653 size_t *lenp;
598 654
599 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
600 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
601 else 657 else
602 { 658 {
603#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
604 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
605 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
611 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
612#endif 668#endif
613 } 669 }
614} 670}
615 671
616static void 672ecb_inline void
617put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
618{ 674{
619 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
620 AV *av;
621 676
622 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
623 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
624 687
625 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
626
627 if (expect_false (AvFILLp (av) >= AvMAX (av)))
628 av_extend (av, AvFILLp (av) + 1);
629
630 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
631} 689}
632 690
633/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
634 692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
635/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
636static void 736static void
637swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
638{ 738{
639 int i; 739 int i;
640 740
641 for (i = 0; i <= AvFILLp (c->swap_sv); ) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
642 { 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
643 SV *a = AvARRAY (c->swap_sv)[i++];
644 SV *b = AvARRAY (c->swap_sv)[i++];
645
646 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
647 SV tmp;
648
649 /* swap sv_any */
650 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
651
652 /* swap sv_flags */
653 SvFLAGS (&tmp) = SvFLAGS (a);
654 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
655 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
656
657#if PERL_VERSION_ATLEAST (5,10,0)
658 /* perl 5.10 complicates this _quite_ a bit, but it also is
659 * much faster, so no quarrels here. alternatively, we could
660 * sv_upgrade to avoid this.
661 */
662 {
663 /* swap sv_u */
664 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
665
666 /* if SvANY points to the head, we need to adjust the pointers,
667 * as the pointer for a still points to b, and maybe vice versa.
668 */
669 #define svany_in_head(type) \
670 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
671
672 if (svany_in_head (SvTYPE (a)))
673 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
674
675 if (svany_in_head (SvTYPE (b)))
676 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
677 }
678#endif
679 }
680} 743}
681 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
682#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
683 if (expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
685 761
686static void 762static void
687on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
688 764
689static void 765static void
692 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
693 c->slot = 0; 769 c->slot = 0;
694 770
695 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
696 772
697 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
698 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
699 GvSV (PL_errgv) = slot->errsv; 775#else
700 GvSV (irsgv) = slot->irsgv;
701 GvHV (PL_hintgv) = slot->hinthv;
702
703 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 777 #include "state.h"
705 #undef VAR 778#endif
706 779
707 { 780 {
708 dSP; 781 dSP;
709 782
710 CV *cv; 783 CV *cv;
711 784
712 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
713 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
714 { 787 {
715 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
716 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
717 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
718 } 791 }
719 792
720 PUTBACK; 793 PUTBACK;
721 } 794 }
722 795
723 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
724 CORO_THROW = c->except; 797 CORO_THROW = c->except;
725 798
726 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
727 { 800 {
728 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
729 coro_times_update (); 802 coro_times_update ();
730 803
731 coro_times_sub (c); 804 coro_times_sub (c);
732 } 805 }
733 806
734 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
735 { 808 {
736 int i; 809 int i;
737 810
738 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
740 } 813 }
741 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
742 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
743} 824}
744 825
745static void 826static void
746save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
747{ 828{
748 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
749 830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
750 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
751 { 840 {
752 int i; 841 int i;
753 842
754 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 } 845 }
757 846
758 times_valid = 0; 847 times_valid = 0;
759 848
760 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
761 { 850 {
762 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
763 coro_times_add (c); 852 coro_times_add (c);
764 } 853 }
765 854
779 868
780 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
781 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
782 for (;;) 871 for (;;)
783 { 872 {
784 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
785 { 874 {
786 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
787 876
788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
789 { 878 {
790 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
791 880
792 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
793 { 882 {
794 EXTEND (SP, 3); 883 EXTEND (SP, 3);
795 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
796 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
797 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
800 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
801 } 890 }
802 } 891 }
803 } 892 }
804 893
805 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
806 break; 895 break;
807 896
808 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
809 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
810 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
812 901
813 PUTBACK; 902 PUTBACK;
814 } 903 }
815 904
816 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
818 { 907 {
819 unsigned int i; 908 unsigned int i;
820 909
821 for (i = 0; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
822 CXINC; 911 CXINC;
827 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
828 917
829 { 918 {
830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
831 920
832 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
833 slot->defsv = DEFSV; 922 save_perl_slots (slot);
834 slot->errsv = ERRSV; 923#else
835 slot->irsgv = GvSV (irsgv);
836 slot->hinthv = GvHV (PL_hintgv);
837
838 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 925 #include "state.h"
840 #undef VAR 926#endif
841 } 927 }
842} 928}
843 929
844/* 930/*
845 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
876#endif 962#endif
877 963
878 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
881 970
882 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
885 979
886#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
887 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
888 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
889 PL_retstack_max = 4; 983 PL_retstack_max = 4;
913 } 1007 }
914 1008
915 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
918 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
921#endif 1018#endif
922} 1019}
952 } 1049 }
953 1050
954 return rss; 1051 return rss;
955} 1052}
956 1053
957/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
958
959static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
961static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
962 1055
963/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
964#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
965#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
966 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
967 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
968#endif 1061#endif
1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 char *key = SvPV_nolen ((SV *)name);
1070
1071 /* do what mg_copy normally does */
1072 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1073 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1074
1075 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1076 if (*key == '_'
1077 && (strEQ (key, "__DIE__")
1078 || strEQ (key, "__WARN__")))
1079 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1080
1081 return 1;
1082}
1083
1084/* perl does not have a %SIG vtbl, we provide one so we can override */
1085/* the magic vtbl for the __DIE__ and __WARN__ members */
1086static const MGVTBL coro_sig_vtbl = {
1087 0, 0, 0, 0, 0,
1088 coro_sig_copy
1089};
969 1090
970/* 1091/*
971 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1093 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
973 * and instead of trying to save and restore the hash elements (extremely slow), 1094 * and instead of trying to save and restore the hash elements (extremely slow),
974 * we just provide our own readback here. 1095 * we just provide our own readback here.
975 */ 1096 */
976static int 1097static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1099{
979 const char *s = MgPV_nolen_const (mg); 1100 const char *s = MgPV_nolen_const (mg);
1101 /* the key must be either __DIE__ or __WARN__ here */
1102 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
980 1103
981 if (*s == '_') 1104 SV *ssv;
982 {
983 SV **svp = 0;
984 1105
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987
988 if (svp) 1106 if (!*svp)
989 { 1107 ssv = &PL_sv_undef;
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
991 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
992 } 1110 else
993 } 1111 ssv = *svp;
994 1112
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
996} 1115}
997 1116
998static int 1117static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1119{
1001 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1121 /* the key must be either __DIE__ or __WARN__ here */
1122 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1002 1123
1003 if (*s == '_')
1004 {
1005 SV **svp = 0;
1006
1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1009
1010 if (svp)
1011 {
1012 SV *old = *svp; 1124 SV *old = *svp;
1013 *svp = 0; 1125 *svp = 0;
1014 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
1015 return 0; 1127 return 0;
1016 }
1017 }
1018
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1128}
1021 1129
1022static int 1130static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1132{
1025 const char *s = MgPV_nolen_const (mg); 1133 const char *s = MgPV_nolen_const (mg);
1134 /* the key must be either __DIE__ or __WARN__ here */
1135 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1026 1136
1027 if (*s == '_')
1028 {
1029 SV **svp = 0;
1030
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp)
1035 {
1036 SV *old = *svp; 1137 SV *old = *svp;
1037 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1038 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
1039 return 0; 1140 return 0;
1040 }
1041 }
1042
1043 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1044} 1141}
1045 1142
1046static void 1143static void
1047prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
1048{ 1145{
1060slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{ 1158{
1062 return 1; 1159 return 1;
1063} 1160}
1064 1161
1162/** coroutine stack handling ************************************************/
1163
1065static UNOP init_perl_op; 1164static UNOP init_perl_op;
1066 1165
1067static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1166ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
1069{ 1168{
1070 /* 1169 /*
1071 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
1072 */ 1171 */
1089 PL_hints = 0; 1188 PL_hints = 0;
1090 1189
1091 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1193
1095 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1197 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1198 GvHV (PL_hintgv) = newHV ();
1199#if PERL_VERSION_ATLEAST (5,10,0)
1200 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1201#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1204
1103 { 1205 {
1104 dSP; 1206 dSP;
1132 PL_op = (OP *)&init_perl_op; 1234 PL_op = (OP *)&init_perl_op;
1133 1235
1134 /* copy throw, in case it was set before init_perl */ 1236 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1136 1238
1137 SWAP_SVS (coro); 1239 SWAP_SVS_ENTER (coro);
1138 1240
1139 if (expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1140 { 1242 {
1141 coro_times_update (); 1243 coro_times_update ();
1142 coro_times_sub (coro); 1244 coro_times_sub (coro);
1143 } 1245 }
1144} 1246}
1180 /* this will cause transfer_check to croak on block*/ 1282 /* this will cause transfer_check to croak on block*/
1181 SvRV_set (coro_current, (SV *)coro->hv); 1283 SvRV_set (coro_current, (SV *)coro->hv);
1182 1284
1183 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1184 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1185 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1186 1291
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1191 1293
1192 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
1214 1316
1215 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1323 }
1220} 1324}
1221 1325
1222INLINE void 1326ecb_inline void
1223free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1224{ 1328{
1225 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1226 { 1330 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1228 coro_mortal = 0; 1332 coro_mortal = 0;
1229 } 1333 }
1230} 1334}
1286 1390
1287 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1288 { 1392 {
1289 SV **cb; 1393 SV **cb;
1290 1394
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1396 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1398
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1400 {
1365 1469
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1470 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367} 1471}
1368 1472
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1473/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void NOINLINE 1474static void ecb_noinline
1371cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1372{ 1476{
1373 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1374 1478
1375 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1388} 1492}
1389 1493
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1494/* the tail of transfer: execute stuff we can only do after a transfer */
1391INLINE void 1495ecb_inline void
1392transfer_tail (pTHX) 1496transfer_tail (pTHX)
1393{ 1497{
1394 free_coro_mortal (aTHX); 1498 free_coro_mortal (aTHX);
1499}
1500
1501/* try to exit the same way perl's main function would do */
1502/* we do not bother resetting the environment or other things *7
1503/* that are not, uhm, essential */
1504/* this obviously also doesn't work when perl is embedded */
1505static void ecb_noinline ecb_cold
1506perlish_exit (pTHX)
1507{
1508 int exitstatus = perl_destruct (PL_curinterp);
1509 perl_free (PL_curinterp);
1510 exit (exitstatus);
1395} 1511}
1396 1512
1397/* 1513/*
1398 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1515 */
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1542 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread. 1543 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */ 1544 */
1429 1545
1430 /* 1546 /*
1547 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1548 * requires PL_scopestack_ix, so do it here if required.
1549 */
1550 if (!PL_scopestack_ix)
1551 ENTER;
1552
1553 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1554 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1555 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1556 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1557 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1558 */
1439 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1560 }
1442} 1561}
1443 1562
1444static coro_cctx * 1563static coro_cctx *
1445cctx_new () 1564cctx_new (void)
1446{ 1565{
1447 coro_cctx *cctx; 1566 coro_cctx *cctx;
1448 1567
1449 ++cctx_count; 1568 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
1456 return cctx; 1575 return cctx;
1457} 1576}
1458 1577
1459/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1460static coro_cctx * 1579static coro_cctx *
1461cctx_new_empty () 1580cctx_new_empty (void)
1462{ 1581{
1463 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1464 1583
1465 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1586
1468 return cctx; 1587 return cctx;
1469} 1588}
1470 1589
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1591static coro_cctx *
1473cctx_new_run () 1592cctx_new_run (void)
1474{ 1593{
1475 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1595
1479#if HAVE_MMAP 1596 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1597 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1600 }
1508 1601
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1602 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1603
1515 return cctx; 1604 return cctx;
1516} 1605}
1517 1606
1518static void 1607static void
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1614
1526 --cctx_count; 1615 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1528 1617
1529 /* coro_transfer creates new, empty cctx's */ 1618 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1619
1544 Safefree (cctx); 1620 Safefree (cctx);
1545} 1621}
1546 1622
1547/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1624#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1549 1625
1550static coro_cctx * 1626static coro_cctx *
1551cctx_get (pTHX) 1627cctx_get (pTHX)
1552{ 1628{
1553 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1554 { 1630 {
1555 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1556 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1557 --cctx_idle; 1633 --cctx_idle;
1558 1634
1559 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1560 return cctx; 1636 return cctx;
1561 1637
1562 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1563 } 1639 }
1564 1640
1566} 1642}
1567 1643
1568static void 1644static void
1569cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1570{ 1646{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1647 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1648
1573 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1574 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1651 {
1576 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1577 cctx_first = first->next; 1653 cctx_first = first->next;
1578 --cctx_idle; 1654 --cctx_idle;
1579 1655
1590static void 1666static void
1591transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1592{ 1668{
1593 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1594 1670
1595 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1596 { 1672 {
1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1674 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1599 1675
1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1676 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1677 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1602 1678
1603#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1604 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1681 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1606#endif 1682#endif
1607 } 1683 }
1608} 1684}
1609 1685
1610/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1611static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1613{ 1689{
1614 dSTACKLEVEL; 1690 dSTACKLEVEL;
1615 1691
1616 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1617 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1618 { 1694 {
1619 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1696 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1621 } 1697 }
1622 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1623 { 1699 {
1624 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1625 1701
1626 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1627 { 1703 {
1628 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1629 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1630 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1631 } 1707 }
1634 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1635 1711
1636 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1637 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1638 1714
1639 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1640 { 1716 {
1641 /* need to start coroutine */ 1717 /* need to start coroutine */
1642 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1643 /* setup coroutine call */ 1719 /* setup coroutine call */
1644 init_perl (aTHX_ next); 1720 init_perl (aTHX_ next);
1645 } 1721 }
1646 else 1722 else
1647 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1648 1724
1649 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1650 if (expect_true ( 1726 if (ecb_expect_true (
1651 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1652 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1653 && !force_cctx 1729 && !force_cctx
1654 )) 1730 ))
1655 { 1731 {
1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1732 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1733 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1658 1734
1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1735 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1660 /* without this the next cctx_get might destroy the running cctx while still in use */ 1736 /* without this the next cctx_get might destroy the running cctx while still in use */
1661 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1662 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1663 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1664 1740
1665 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1666 } 1742 }
1667 else 1743 else
1668 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1669 1745
1670 ++next->usecount; 1746 ++next->usecount;
1671 1747
1672 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1673 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1674 1750
1675 next->cctx = 0; 1751 next->cctx = 0;
1676 1752
1677 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1678 { 1754 {
1679 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1680 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1682 } 1758 }
1702 return; 1778 return;
1703 1779
1704 slf_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1705 1781
1706 coro->flags |= CF_ZOMBIE; 1782 coro->flags |= CF_ZOMBIE;
1707 1783
1708 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1709 { 1785 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1788 --coro_nready;
1748 Safefree (coro); 1824 Safefree (coro);
1749 1825
1750 return 0; 1826 return 0;
1751} 1827}
1752 1828
1753static int 1829static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1831{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1834 mg->mg_ptr = 0;
1789 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1790} 1866}
1791 1867
1792/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1793 1869
1794INLINE void 1870ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1796{ 1872{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1874
1799 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
1801 coro->next_ready = 0; 1877 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1879 ready [1] = coro;
1804} 1880}
1805 1881
1806INLINE struct coro * 1882ecb_inline struct coro *
1807coro_deq (pTHX) 1883coro_deq (pTHX)
1808{ 1884{
1809 int prio; 1885 int prio;
1810 1886
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1864{ 1940{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1942}
1867 1943
1868/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1869INLINE void 1945ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1947{
1872 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1873 1949
1874 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
1887{ 1963{
1888 for (;;) 1964 for (;;)
1889 { 1965 {
1890 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1891 1967
1892 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1893 { 1969 {
1894 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 1971 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1972 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else 1973 else
1898 { 1974 {
1899 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1900 --coro_nready; 1976 --coro_nready;
1908 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1911 { 1987 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 1988 if (SvRV (sv_idle) == SvRV (coro_current))
1989 {
1990 require_pv ("Carp");
1991
1992 {
1993 dSP;
1994
1995 ENTER;
1996 SAVETMPS;
1997
1998 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1999 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2000 PUTBACK;
2001 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2002
2003 FREETMPS;
2004 LEAVE;
2005 }
2006 }
1914 2007
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2008 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 2010 --coro_nready;
1918 } 2011 }
1933 } 2026 }
1934 } 2027 }
1935 } 2028 }
1936} 2029}
1937 2030
1938INLINE void 2031ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2033{
1941 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1943} 2036}
1944 2037
1945INLINE void 2038ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2040{
1948 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1949 2042
1950 if (coro_nready) 2043 if (coro_nready)
1980{ 2073{
1981 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1982 2075
1983 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1984 2077
1985 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1986 { 2079 {
1987 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1988 return 1; 2081 return 1;
1989 } 2082 }
1990 else 2083 else
2115{ 2208{
2116 AV *od = coro->on_destroy; 2209 AV *od = coro->on_destroy;
2117 2210
2118 if (!od) 2211 if (!od)
2119 return; 2212 return;
2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2120 2216
2121 while (AvFILLp (od) >= 0) 2217 while (AvFILLp (od) >= 0)
2122 { 2218 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2219 SV *cb = sv_2mortal (av_pop (od));
2124 2220
2145 2241
2146static void 2242static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2244{
2149 AV *av; 2245 AV *av;
2150 2246
2151 if (coro->status) 2247 if (coro->status)
2152 { 2248 {
2153 av = coro->status; 2249 av = coro->status;
2154 av_clear (av); 2250 av_clear (av);
2155 } 2251 }
2202 2298
2203 coro = SvSTATE (arg [0]); 2299 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2300 coro_hv = coro->hv;
2205 2301
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2302 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2303
2208 if (expect_false (coro->flags & CF_NOCANCEL)) 2304 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2305 {
2210 /* coro currently busy cancelling something, so just notify it */ 2306 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2307 coro->slf_frame.data = (void *)coro;
2212 2308
2213 frame->prepare = prepare_nop; 2309 frame->prepare = prepare_nop;
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2315 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2316 }
2221 else 2317 else
2222 { 2318 {
2223 struct coro *self = SvSTATE_current; 2319 struct coro *self = SvSTATE_current;
2320
2321 if (!self)
2322 croak ("Coro::cancel called outside of thread content,");
2224 2323
2225 /* otherwise we cancel directly, purely for speed reasons 2324 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2325 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2326 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2327 * this is ugly, and hopefully fully worth the extra speed.
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2420slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{ 2421{
2323 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325 2424
2326 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
2327 { 2426 {
2328 /* subsequent iteration */ 2427 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
2331 2430
2338 else 2437 else
2339 { 2438 {
2340 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2440 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342 2441
2442 if (ecb_expect_false (coro->swap_sv))
2443 {
2444 swap_svs_leave (coro);
2445 SvREFCNT_dec_NN (coro->swap_sv);
2446 coro->swap_sv = 0;
2447 }
2448
2343 coro->prio = 0; 2449 coro->prio = 0;
2344 2450
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2347 2453
2348 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2350 } 2456 }
2391 2497
2392static int 2498static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2500{
2395 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2396 2502
2397 if (CORO_THROW) 2503 if (CORO_THROW)
2398 return 0; 2504 return 0;
2399 2505
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2507 return 1;
2437 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2439 } 2545 }
2440 2546
2441 if (!SvROK (cb) 2547 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2551
2446 { 2552 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2570 2676
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2677/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2678static void
2573slf_destroy (pTHX_ struct coro *coro) 2679slf_destroy (pTHX_ struct coro *coro)
2574{ 2680{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2681 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2682
2579 /* 2683 /*
2580 * The on_destroy above most likely is from an SLF call. 2684 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2685 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2686 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2687 * cleanup functions cannot call SLF functions.
2584 */ 2688 */
2585 coro->slf_frame.prepare = 0; 2689 coro->slf_frame.prepare = 0;
2690
2691 /* this callback is reserved for slf functions needing to do cleanup */
2692 if (frame.destroy && frame.prepare && !PL_dirty)
2693 frame.destroy (aTHX_ &frame);
2586} 2694}
2587 2695
2588/* 2696/*
2589 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2698 * function to increase chances that they all will call transfer with the same
2597 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2705 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598 2706
2599 /* set up the slf frame, unless it has already been set-up */ 2707 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2602 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2603 { 2711 {
2604 /* first iteration */ 2712 /* first iteration */
2605 dSP; 2713 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
2648 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2649 2757
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2758 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651 2759
2652 /* exception handling */ 2760 /* exception handling */
2653 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2654 { 2762 {
2655 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2656 2764
2657 CORO_THROW = 0; 2765 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2660 } 2768 }
2661 2769
2662 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR 2772 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 { 2774 {
2667 dSP; 2775 dSP;
2668 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2669 2777
2670 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2775{ 2883{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778} 2886}
2779 2887
2888static void
2889enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2890{
2891 if (!hook)
2892 return;
2893
2894 if (!*avp)
2895 {
2896 *avp = newAV ();
2897 AvREAL_off (*avp);
2898 }
2899
2900 av_push (*avp, (SV *)hook);
2901 av_push (*avp, (SV *)arg);
2902}
2903
2904static void
2905enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2906{
2907 AV *av = *avp;
2908 int i;
2909
2910 if (!av)
2911 return;
2912
2913 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2914 if (AvARRAY (av)[i] == (SV *)hook)
2915 {
2916 if (execute)
2917 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2918
2919 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2920 av_pop (av);
2921 av_pop (av);
2922 break;
2923 }
2924
2925 if (AvFILLp (av) >= 0)
2926 {
2927 *avp = 0;
2928 SvREFCNT_dec_NN (av);
2929 }
2930}
2931
2932static void
2933api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2934{
2935 struct coro *coro = SvSTATE (coro_sv);
2936
2937 if (SvSTATE_current == coro)
2938 if (enter)
2939 enter (aTHX_ enter_arg);
2940
2941 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2943}
2944
2945static void
2946api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2947{
2948 struct coro *coro = SvSTATE (coro_sv);
2949
2950 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2952}
2953
2954static void
2955savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2956{
2957 struct coro *coro = SvSTATE_current;
2958
2959 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2960}
2961
2962static void
2963savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2964{
2965 struct coro *coro = SvSTATE_current;
2966
2967 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2968}
2969
2970static void
2971api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2972{
2973 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2974
2975 /* this ought to be much cheaper than malloc + a single destructor call */
2976 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2977 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2978}
2979
2780/*****************************************************************************/ 2980/*****************************************************************************/
2781/* PerlIO::cede */ 2981/* PerlIO::cede */
2782 2982
2783typedef struct 2983typedef struct
2784{ 2984{
2785 PerlIOBuf base; 2985 PerlIOBuf base;
2786 NV next, every; 2986 NV next, every;
2787} PerlIOCede; 2987} PerlIOCede;
2788 2988
2789static IV 2989static IV ecb_cold
2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2990PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2791{ 2991{
2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2793 2993
2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2795 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2796 2996
2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2798} 2998}
2799 2999
2800static SV * 3000static SV * ecb_cold
2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2802{ 3002{
2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2804 3004
2805 return newSVnv (self->every); 3005 return newSVnv (self->every);
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3113 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3115 }
2916 3116
2917 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2918 } 3118 }
2919} 3119}
2920 3120
2921static void 3121static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2930{ 3130{
2931 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3132 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3133 SV *coro_hv = SvRV (coro_current);
2934 3134
3135 frame->destroy = 0;
3136
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3137 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3138 if (ecb_expect_false (CORO_THROW))
3139 {
3140 /* we still might be responsible for the semaphore, so wake up others */
3141 coro_semaphore_adjust (aTHX_ av, 0);
3142
2937 return 0; 3143 return 0;
3144 }
2938 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2939 { 3146 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3147 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3149 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2946 3151
2950 { 3155 {
2951 int i; 3156 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3157 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3158 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3161 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3162 return 1;
2958 3163
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3165 return 1;
3057 { 3262 {
3058 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
3060 } 3265 }
3061 3266
3062 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
3063 3268
3064 --count; 3269 --count;
3065 } 3270 }
3066} 3271}
3067 3272
3152 } 3357 }
3153 3358
3154 av_push (state, data_sv); 3359 av_push (state, data_sv);
3155 3360
3156 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
3159} 3364}
3160 3365
3161static int 3366static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3368{
3168 /* it quickly returns */ 3373 /* it quickly returns */
3169 if (CORO_THROW) 3374 if (CORO_THROW)
3170 return 0; 3375 return 0;
3171 3376
3172 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3379 return 1;
3175 3380
3176 /* restore status */ 3381 /* restore status */
3177 { 3382 {
3178 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
3181 errno = data->errorno; 3386 errno = data->errorno;
3182 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
3185 3390
3186 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
3187 } 3392 }
3188 3393
3189 /* push result values */ 3394 /* push result values */
3190 { 3395 {
3191 dSP; 3396 dSP;
3217 dSP; 3422 dSP;
3218 3423
3219 static SV *prio_cv; 3424 static SV *prio_cv;
3220 static SV *prio_sv; 3425 static SV *prio_sv;
3221 3426
3222 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
3223 { 3428 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
3226 } 3431 }
3227 3432
3333 } 3538 }
3334 3539
3335 return coro_sv; 3540 return coro_sv;
3336} 3541}
3337 3542
3543#ifndef __cplusplus
3544ecb_cold XS(boot_Coro__State);
3545#endif
3546
3547#if CORO_JIT
3548
3549static void ecb_noinline ecb_cold
3550pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3551{
3552 dSP;
3553 AV *av = newAV ();
3554
3555 av_store (av, 3, newSVuv (d));
3556 av_store (av, 2, newSVuv (c));
3557 av_store (av, 1, newSVuv (b));
3558 av_store (av, 0, newSVuv (a));
3559
3560 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3561
3562 PUTBACK;
3563}
3564
3565static void ecb_noinline ecb_cold
3566jit_init (pTHX)
3567{
3568 dSP;
3569 SV *load, *save;
3570 char *map_base;
3571 char *load_ptr, *save_ptr;
3572 STRLEN load_len, save_len, map_len;
3573 int count;
3574
3575 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3576
3577 PUSHMARK (SP);
3578 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3579 #include "state.h"
3580 count = call_pv ("Coro::State::_jit", G_ARRAY);
3581 SPAGAIN;
3582
3583 save = POPs; save_ptr = SvPVbyte (save, save_len);
3584 load = POPs; load_ptr = SvPVbyte (load, load_len);
3585
3586 map_len = load_len + save_len + 16;
3587
3588 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3589
3590 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3591
3592 load_perl_slots = (load_save_perl_slots_type)map_base;
3593 memcpy (map_base, load_ptr, load_len);
3594
3595 map_base += (load_len + 15) & ~15;
3596
3597 save_perl_slots = (load_save_perl_slots_type)map_base;
3598 memcpy (map_base, save_ptr, save_len);
3599
3600 /* we are good citizens and try to make the page read-only, so the evil evil */
3601 /* hackers might have it a bit more difficult */
3602 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3603
3604 PUTBACK;
3605 eval_pv ("undef &Coro::State::_jit", 1);
3606}
3607
3608#endif
3609
3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3610MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3339 3611
3340PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
3341 3613
3342BOOT: 3614BOOT:
3343{ 3615{
3616#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3617#include "state.h"
3344#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
3345# if CORO_PTHREAD 3619# if CORO_PTHREAD
3346 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
3347# endif 3621# endif
3348#endif 3622#endif
3349 BOOT_PAGESIZE; 3623 /* perl defines these to check for existance first, but why it doesn't */
3624 /* just create them one at init time is not clear to me, except for */
3625 /* programs trying to delete them, but... */
3626 /* anyway, we declare this as invalid and make sure they are initialised here */
3627 DEFSV;
3628 ERRSV;
3350 3629
3351 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
3352 3631
3353 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3354 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3355 3634
3356 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
3357 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
3358 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3637 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3638 * by coro_sig_vtbl in hash values.
3639 */
3640 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3641
3642 /* this only works if perl doesn't have a vtbl for %SIG */
3643 assert (!mg->mg_virtual);
3644
3645 /*
3646 * The irony is that the perl API itself asserts that mg_virtual
3647 * must be non-const, yet perl5porters insisted on marking their
3648 * vtbls as read-only, just to thwart perl modules from patching
3649 * them.
3650 */
3651 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3652 mg->mg_flags |= MGf_COPY;
3653
3654 coro_sigelem_vtbl = PL_vtbl_sigelem;
3655 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3656 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3657 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3658 }
3359 3659
3360 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3361 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3660 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3362 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3661 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3363 3662
3364 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3365 3664
3397 coroapi.prepare_cede_notself = prepare_cede_notself; 3696 coroapi.prepare_cede_notself = prepare_cede_notself;
3398 3697
3399 time_init (aTHX); 3698 time_init (aTHX);
3400 3699
3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3700 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3701#if CORO_JIT
3702 PUTBACK;
3703 jit_init (aTHX);
3704 SPAGAIN;
3705#endif
3402} 3706}
3403 3707
3404SV * 3708SV *
3405new (SV *klass, ...) 3709new (SV *klass, ...)
3406 ALIAS: 3710 ALIAS:
3413void 3717void
3414transfer (...) 3718transfer (...)
3415 PROTOTYPE: $$ 3719 PROTOTYPE: $$
3416 CODE: 3720 CODE:
3417 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3721 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3418
3419void
3420_exit (int code)
3421 PROTOTYPE: $
3422 CODE:
3423 _exit (code);
3424 3722
3425SV * 3723SV *
3426clone (Coro::State coro) 3724clone (Coro::State coro)
3427 CODE: 3725 CODE:
3428{ 3726{
3483void 3781void
3484list () 3782list ()
3485 PROTOTYPE: 3783 PROTOTYPE:
3486 PPCODE: 3784 PPCODE:
3487{ 3785{
3488 struct coro *coro; 3786 struct coro *coro;
3489 for (coro = coro_first; coro; coro = coro->next) 3787 for (coro = coro_first; coro; coro = coro->next)
3490 if (coro->hv) 3788 if (coro->hv)
3491 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3789 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3492} 3790}
3493 3791
3557 RETVAL = boolSV (coro->flags & ix); 3855 RETVAL = boolSV (coro->flags & ix);
3558 OUTPUT: 3856 OUTPUT:
3559 RETVAL 3857 RETVAL
3560 3858
3561void 3859void
3562throw (Coro::State self, SV *exception = &PL_sv_undef) 3860throw (SV *self, SV *exception = &PL_sv_undef)
3563 PROTOTYPE: $;$ 3861 PROTOTYPE: $;$
3564 CODE: 3862 CODE:
3565{ 3863{
3864 struct coro *coro = SvSTATE (self);
3566 struct coro *current = SvSTATE_current; 3865 struct coro *current = SvSTATE_current;
3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3866 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3568 SvREFCNT_dec (*exceptionp); 3867 SvREFCNT_dec (*exceptionp);
3569 SvGETMAGIC (exception); 3868 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3869 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3870
3871 api_ready (aTHX_ self);
3571} 3872}
3572 3873
3573void 3874void
3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3875api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3575 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3652 3953
3653void 3954void
3654times (Coro::State self) 3955times (Coro::State self)
3655 PPCODE: 3956 PPCODE:
3656{ 3957{
3657 struct coro *current = SvSTATE (coro_current); 3958 struct coro *current = SvSTATE (coro_current);
3658 3959
3659 if (expect_false (current == self)) 3960 if (ecb_expect_false (current == self))
3660 { 3961 {
3661 coro_times_update (); 3962 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current)); 3963 coro_times_add (SvSTATE (coro_current));
3663 } 3964 }
3664 3965
3665 EXTEND (SP, 2); 3966 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3967 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3667 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3968 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668 3969
3669 if (expect_false (current == self)) 3970 if (ecb_expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current)); 3971 coro_times_sub (SvSTATE (coro_current));
3671} 3972}
3672 3973
3673void 3974void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3975swap_sv (Coro::State coro, SV *sva, SV *svb)
3675 CODE: 3976 CODE:
3676{ 3977{
3677 struct coro *current = SvSTATE_current; 3978 struct coro *current = SvSTATE_current;
3979 AV *swap_sv;
3980 int i;
3981
3982 sva = SvRV (sva);
3983 svb = SvRV (svb);
3678 3984
3679 if (current == coro) 3985 if (current == coro)
3680 SWAP_SVS (current); 3986 SWAP_SVS_LEAVE (current);
3681 3987
3682 if (!coro->swap_sv) 3988 if (!coro->swap_sv)
3683 coro->swap_sv = newAV (); 3989 coro->swap_sv = newAV ();
3684 3990
3991 swap_sv = coro->swap_sv;
3992
3993 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3994 {
3995 SV *a = AvARRAY (swap_sv)[i ];
3996 SV *b = AvARRAY (swap_sv)[i + 1];
3997
3998 if (a == sva && b == svb)
3999 {
4000 SvREFCNT_dec_NN (a);
4001 SvREFCNT_dec_NN (b);
4002
4003 for (; i <= AvFILLp (swap_sv) - 2; i++)
4004 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4005
4006 AvFILLp (swap_sv) -= 2;
4007
4008 goto removed;
4009 }
4010 }
4011
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4012 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3686 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4013 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4014
4015 removed:
3687 4016
3688 if (current == coro) 4017 if (current == coro)
3689 SWAP_SVS (current); 4018 SWAP_SVS_ENTER (current);
3690} 4019}
3691 4020
3692 4021
3693MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3694 4023
3695BOOT: 4024BOOT:
3696{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4032 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3701 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3705 4037
3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4038 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3707 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4039 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3708 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4040 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3709 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4041 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3710 4042
3711 coro_stash = gv_stashpv ("Coro", TRUE); 4043 coro_stash = gv_stashpv ("Coro", TRUE);
3712 4044
3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4045 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4046 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4047 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3727 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3728 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3729 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3730 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3731 4063
4064 coroapi.enterleave_hook = api_enterleave_hook;
4065 coroapi.enterleave_unhook = api_enterleave_unhook;
4066 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4067
3732 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3733 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3734 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3735 } 4071 }
3736} 4072}
3801 4137
3802void 4138void
3803_set_current (SV *current) 4139_set_current (SV *current)
3804 PROTOTYPE: $ 4140 PROTOTYPE: $
3805 CODE: 4141 CODE:
3806 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3807 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3808 4144
3809void 4145void
3810_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3811 PROTOTYPE: $ 4147 PROTOTYPE: $
3895 4231
3896 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
3897 { 4233 {
3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv); 4236 SvREFCNT_dec_NN (sv);
3901 } 4237 }
3902 4238
3903 { 4239 {
3904 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
3905 4241
3912 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
3913 4249
3914 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
3915 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3916 else 4252 else
3917 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
3918} 4254}
3919 4255
3920SV * 4256SV *
3921rouse_cb () 4257rouse_cb ()
3922 PROTOTYPE: 4258 PROTOTYPE:
3937 on_leave = 1 4273 on_leave = 1
3938 PROTOTYPE: & 4274 PROTOTYPE: &
3939 CODE: 4275 CODE:
3940{ 4276{
3941 struct coro *coro = SvSTATE_current; 4277 struct coro *coro = SvSTATE_current;
3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4278 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3943 4279
3944 block = s_get_cv_croak (block); 4280 block = s_get_cv_croak (block);
3945 4281
3946 if (!*avp) 4282 if (!*avp)
3947 *avp = newAV (); 4283 *avp = newAV ();
3967 4303
3968SV * 4304SV *
3969new (SV *klass, SV *count = 0) 4305new (SV *klass, SV *count = 0)
3970 CODE: 4306 CODE:
3971{ 4307{
3972 int semcnt = 1; 4308 int semcnt = 1;
3973 4309
3974 if (count) 4310 if (count)
3975 { 4311 {
3976 SvGETMAGIC (count); 4312 SvGETMAGIC (count);
3977 4313
4001 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4002 OUTPUT: 4338 OUTPUT:
4003 RETVAL 4339 RETVAL
4004 4340
4005void 4341void
4006up (SV *self, int adjust = 1) 4342up (SV *self)
4007 ALIAS:
4008 adjust = 1
4009 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
4010 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4011 4350
4012void 4351void
4013down (...) 4352down (...)
4014 CODE: 4353 CODE:
4015 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4037 XSRETURN_NO; 4376 XSRETURN_NO;
4038} 4377}
4039 4378
4040void 4379void
4041waiters (SV *self) 4380waiters (SV *self)
4042 PPCODE: 4381 PPCODE:
4043{ 4382{
4044 AV *av = (AV *)SvRV (self); 4383 AV *av = (AV *)SvRV (self);
4045 int wcount = AvFILLp (av) + 1 - 1; 4384 int wcount = AvFILLp (av) + 1 - 1;
4046 4385
4047 if (GIMME_V == G_SCALAR) 4386 if (GIMME_V == G_SCALAR)
4056} 4395}
4057 4396
4058MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4397MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4059 4398
4060void 4399void
4061_may_delete (SV *sem, int count, int extra_refs) 4400_may_delete (SV *sem, int count, unsigned int extra_refs)
4062 PPCODE: 4401 PPCODE:
4063{ 4402{
4064 AV *av = (AV *)SvRV (sem); 4403 AV *av = (AV *)SvRV (sem);
4065 4404
4066 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4405 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4067 && AvFILLp (av) == 0 /* no waiters, just count */ 4406 && AvFILLp (av) == 0 /* no waiters, just count */
4068 && SvIV (AvARRAY (av)[0]) == count) 4407 && SvIV (AvARRAY (av)[0]) == count)
4069 XSRETURN_YES; 4408 XSRETURN_YES;
4090 4429
4091void 4430void
4092broadcast (SV *self) 4431broadcast (SV *self)
4093 CODE: 4432 CODE:
4094{ 4433{
4095 AV *av = (AV *)SvRV (self); 4434 AV *av = (AV *)SvRV (self);
4096 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4435 coro_signal_wake (aTHX_ av, AvFILLp (av));
4097} 4436}
4098 4437
4099void 4438void
4100send (SV *self) 4439send (SV *self)
4108 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4109} 4448}
4110 4449
4111IV 4450IV
4112awaited (SV *self) 4451awaited (SV *self)
4113 CODE: 4452 CODE:
4114 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4115 OUTPUT: 4454 OUTPUT:
4116 RETVAL 4455 RETVAL
4117 4456
4118 4457
4123 4462
4124void 4463void
4125_schedule (...) 4464_schedule (...)
4126 CODE: 4465 CODE:
4127{ 4466{
4128 static int incede; 4467 static int incede;
4129 4468
4130 api_cede_notself (aTHX); 4469 api_cede_notself (aTHX);
4131 4470
4132 ++incede; 4471 ++incede;
4133 while (coro_nready >= incede && api_cede (aTHX)) 4472 while (coro_nready >= incede && api_cede (aTHX))
4177 { 4516 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4517 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0; 4518 coro_old_pp_sselect = 0;
4180 } 4519 }
4181 4520
4521MODULE = Coro::State PACKAGE = Coro::Util
4522
4523void
4524_exit (int code)
4525 CODE:
4526 _exit (code);
4527
4528NV
4529time ()
4530 CODE:
4531 RETVAL = nvtime (aTHX);
4532 OUTPUT:
4533 RETVAL
4534
4535NV
4536gettimeofday ()
4537 PPCODE:
4538{
4539 UV tv [2];
4540 u2time (aTHX_ tv);
4541 EXTEND (SP, 2);
4542 PUSHs (sv_2mortal (newSVuv (tv [0])));
4543 PUSHs (sv_2mortal (newSVuv (tv [1])));
4544}
4545

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines