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.402 by root, Sun May 22 13:07:23 2011 UTC vs.
Revision 1.473 by root, Sun Sep 3 23:36:01 2017 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
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 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
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# 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
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
120# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif 118# endif
123#endif 119#endif
124 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
125static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
127 141
128/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
144 158
145static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
147static SV *rv_diehook; 161static SV *rv_diehook;
148static SV *rv_warnhook; 162static SV *rv_warnhook;
149static HV *hv_sig; /* %SIG */
150 163
151/* async_pool helper stuff */ 164/* async_pool helper stuff */
152static SV *sv_pool_rss; 165static SV *sv_pool_rss;
153static SV *sv_pool_size; 166static SV *sv_pool_size;
154static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
182typedef struct coro_cctx 195typedef struct coro_cctx
183{ 196{
184 struct coro_cctx *next; 197 struct coro_cctx *next;
185 198
186 /* the stack */ 199 /* the stack */
187 void *sptr; 200 struct coro_stack stack;
188 size_t ssize;
189 201
190 /* cpu state */ 202 /* cpu state */
191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
192 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
193 JMPENV *top_env; 207 JMPENV *top_env;
194 coro_context cctx; 208 coro_context cctx;
195 209
196 U32 gen; 210 U32 gen;
197#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
217}; 231};
218 232
219/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
220typedef struct 234typedef struct
221{ 235{
222 SV *defsv;
223 AV *defav;
224 SV *errsv;
225 SV *irsgv;
226 HV *hinthv;
227#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
228# include "state.h" 237 #include "state.h"
229#undef VAR
230} perl_slots; 238} perl_slots;
231 239
232// how many context stack entries do we need for perl_slots 240/* how many context stack entries do we need for perl_slots */
233#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
234 242
235/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
236struct coro 244struct coro
237{ 245{
265 SV *saved_deffh; 273 SV *saved_deffh;
266 SV *invoke_cb; 274 SV *invoke_cb;
267 AV *invoke_av; 275 AV *invoke_av;
268 276
269 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
270 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
271 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
272 280
273 /* swap_sv */ 281 /* swap_sv */
274 AV *swap_sv; 282 AV *swap_sv;
275 283
276 /* times */ 284 /* times */
303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
304static CV *cv_coro_run; 312static CV *cv_coro_run;
305static struct coro *coro_first; 313static struct coro *coro_first;
306#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
307 315
316/** JIT *********************************************************************/
317
318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
321 #ifndef CORO_JIT_TYPE
322 #if ECB_AMD64 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "amd64-unix"
324 #elif __i386 && CORO_JIT_UNIXY
325 #define CORO_JIT_TYPE "x86-unix"
326 #endif
327 #endif
328#endif
329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
334#if CORO_JIT
335 typedef void (*load_save_perl_slots_type)(perl_slots *);
336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
337#endif
338
308/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
309 340
310static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select; 342static SV *coro_select_select;
312 343
327 358
328/** time stuff **************************************************************/ 359/** time stuff **************************************************************/
329 360
330#ifdef HAS_GETTIMEOFDAY 361#ifdef HAS_GETTIMEOFDAY
331 362
332static void 363ecb_inline void
333coro_u2time (pTHX_ UV ret[2]) 364coro_u2time (pTHX_ UV ret[2])
334{ 365{
335 struct timeval tv; 366 struct timeval tv;
336 gettimeofday (&tv, 0); 367 gettimeofday (&tv, 0);
337 368
338 ret [0] = tv.tv_sec; 369 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec; 370 ret [1] = tv.tv_usec;
340} 371}
341 372
342static double 373ecb_inline double
343coro_nvtime () 374coro_nvtime (void)
344{ 375{
345 struct timeval tv; 376 struct timeval tv;
346 gettimeofday (&tv, 0); 377 gettimeofday (&tv, 0);
347 378
348 return tv.tv_sec + tv.tv_usec * 1e-6; 379 return tv.tv_sec + tv.tv_usec * 1e-6;
349} 380}
350 381
351static void 382ecb_inline void
352time_init (pTHX) 383time_init (pTHX)
353{ 384{
354 nvtime = coro_nvtime; 385 nvtime = coro_nvtime;
355 u2time = coro_u2time; 386 u2time = coro_u2time;
356} 387}
357 388
358#else 389#else
359 390
360static void 391ecb_inline void
361time_init (pTHX) 392time_init (pTHX)
362{ 393{
363 SV **svp; 394 SV **svp;
364 395
365 require_pv ("Time/HiRes.pm"); 396 require_pv ("Time/HiRes.pm");
366 397
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368 399
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371 402
377 408
378#endif 409#endif
379 410
380/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
381 412
382static SV * 413static SV * ecb_noinline
383coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
384{ 415{
385#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 417 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
387 get_sv (name, create); 418 get_sv (name, create);
388#endif 419#endif
389 return get_sv (name, create); 420 return get_sv (name, create);
390} 421}
391 422
392static AV * 423static AV * ecb_noinline
393coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
394{ 425{
395#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 427 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
397 get_av (name, create); 428 get_av (name, create);
398#endif 429#endif
399 return get_av (name, create); 430 return get_av (name, create);
400} 431}
401 432
402static HV * 433static HV * ecb_noinline
403coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
404{ 435{
405#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
407 get_hv (name, create); 438 get_hv (name, create);
408#endif 439#endif
409 return get_hv (name, create); 440 return get_hv (name, create);
410} 441}
411 442
412INLINE void 443ecb_inline void
413coro_times_update () 444coro_times_update (void)
414{ 445{
415#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
416 struct timespec ts; 447 struct timespec ts;
417 448
418 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
430 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
432#endif 463#endif
433} 464}
434 465
435INLINE void 466ecb_inline void
436coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
437{ 468{
438 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
442 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
445} 476}
446 477
447INLINE void 478ecb_inline void
448coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
449{ 480{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
460/* magic glue */ 491/* magic glue */
461 492
462#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
463#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
464 495
465#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
466 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
467 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
468 : mg_find (sv, type)) 499 : mg_find (sv, type))
469 500
470#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
471 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
472 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
473 : 0) 504 : 0)
474 505
475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
477 508
478INLINE MAGIC * 509ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
480{ 511{
481 MAGIC *mg; 512 MAGIC *mg;
482 513
483 if (expect_true ( 514 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV 515 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro)) 516 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl 517 && mg->mg_virtual == &coro_state_vtbl
487 )) 518 ))
488 return mg; 519 return mg;
489 520
490 return 0; 521 return 0;
491} 522}
492 523
493INLINE struct coro * 524ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
495{ 526{
496 MAGIC *mg; 527 MAGIC *mg;
497 528
498 if (SvROK (coro)) 529 if (SvROK (coro_sv))
499 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
500 531
501 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 533 if (!mg)
503 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
504 535
505 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
506} 537}
512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
513 544
514/*****************************************************************************/ 545/*****************************************************************************/
515/* padlist management and caching */ 546/* padlist management and caching */
516 547
517static AV * 548ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
519{ 550{
520 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
521 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
522 556
523 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
524 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
525#if PERL_VERSION_ATLEAST (5,10,0)
526 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
527#else
528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
529#endif 586#endif
530 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
531 --AvFILLp (padlist);
532 587
533 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
534 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
535 596
536 return newpadlist; 597 return newpadlist;
537} 598}
538 599
539static void 600ecb_inline void
540free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
541{ 602{
542 /* may be during global destruction */ 603 /* may be during global destruction */
543 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
544 { 605 {
545 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
546 607
547 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
548 { 609 {
549 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
550 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
551 I32 j = AvFILLp (av);
552 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
553 while (j >= 0) 617 while (j >= 0)
554 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 619
556 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
557 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
558 } 623 }
559 624
560 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
562 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
563 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
564 } 635 }
565} 636}
566 637
567static int 638static int
568coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
569{ 640{
570 AV *padlist; 641 PADLIST *padlist;
571 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
572 644
573 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
574 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
575 return 0; 647 return 0;
576 648
577 /* casting is fun. */ 649 while (len--)
578 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
579 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
580
581 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
582 651
583 return 0; 652 return 0;
584} 653}
585 654
586static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
587 0, 0, 0, 0, 656 0, 0, 0, 0,
588 coro_cv_free 657 coro_cv_free
589}; 658};
590 659
591/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
592static void 661ecb_inline void
593get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
594{ 663{
595 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
596 AV *av; 665 size_t *lenp;
597 666
598 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
599 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
600 else 669 else
601 { 670 {
602#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
603 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
604 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
610 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
611#endif 680#endif
612 } 681 }
613} 682}
614 683
615static void 684ecb_inline void
616put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
617{ 686{
618 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
619 AV *av;
620 688
621 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
622 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
623 699
624 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
625
626 if (expect_false (AvFILLp (av) >= AvMAX (av)))
627 av_extend (av, AvFILLp (av) + 1);
628
629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
630} 701}
631 702
632/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
633 704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
634/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
635static void 748static void
636swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
637{ 750{
638 int i; 751 int i;
639 752
640 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
641 { 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
642 SV *a = AvARRAY (c->swap_sv)[i++];
643 SV *b = AvARRAY (c->swap_sv)[i++];
644
645 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
646 SV tmp;
647
648 /* swap sv_any */
649 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
650
651 /* swap sv_flags */
652 SvFLAGS (&tmp) = SvFLAGS (a);
653 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
654 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
655
656#if PERL_VERSION_ATLEAST (5,10,0)
657 /* perl 5.10 complicates this _quite_ a bit, but it also is
658 * much faster, so no quarrels here. alternatively, we could
659 * sv_upgrade to avoid this.
660 */
661 {
662 /* swap sv_u */
663 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
664
665 /* if SvANY points to the head, we need to adjust the pointers,
666 * as the pointer for a still points to b, and maybe vice versa.
667 */
668 #define svany_in_head(type) \
669 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
670
671 if (svany_in_head (SvTYPE (a)))
672 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
673
674 if (svany_in_head (SvTYPE (b)))
675 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
676 }
677#endif
678 }
679} 755}
680 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
681#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
682 if (expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
683 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
684 773
685static void 774static void
686on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
687 776
688static void 777static void
691 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
692 c->slot = 0; 781 c->slot = 0;
693 782
694 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
695 784
696 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
697 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
698 GvSV (PL_errgv) = slot->errsv; 787#else
699 GvSV (irsgv) = slot->irsgv;
700 GvHV (PL_hintgv) = slot->hinthv;
701
702 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
703 # include "state.h" 789 #include "state.h"
704 #undef VAR 790#endif
705 791
706 { 792 {
707 dSP; 793 dSP;
708 794
709 CV *cv; 795 CV *cv;
710 796
711 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
712 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
713 { 799 {
714 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
715 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
716 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
717 } 803 }
718 804
719 PUTBACK; 805 PUTBACK;
720 } 806 }
721 807
722 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
723 CORO_THROW = c->except; 809 CORO_THROW = c->except;
724 810
725 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
726 { 812 {
727 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
728 coro_times_update (); 814 coro_times_update ();
729 815
730 coro_times_sub (c); 816 coro_times_sub (c);
731 } 817 }
732 818
733 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
734 { 820 {
735 int i; 821 int i;
736 822
737 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
739 } 825 }
740 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
741 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
742} 836}
743 837
744static void 838static void
745save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
746{ 840{
747 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
748 842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
850
749 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
750 { 852 {
751 int i; 853 int i;
752 854
753 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
755 } 857 }
756 858
757 times_valid = 0; 859 times_valid = 0;
758 860
759 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
760 { 862 {
761 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
762 coro_times_add (c); 864 coro_times_add (c);
763 } 865 }
764 866
778 880
779 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
780 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
781 for (;;) 883 for (;;)
782 { 884 {
783 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
784 { 886 {
785 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
786 888
787 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 889 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
788 { 890 {
789 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
790 892
791 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
792 { 894 {
793 EXTEND (SP, 3); 895 EXTEND (SP, 3);
794 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
796 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
799 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
800 } 902 }
801 } 903 }
802 } 904 }
803 905
804 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
805 break; 907 break;
806 908
807 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
808 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
809 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
811 913
812 PUTBACK; 914 PUTBACK;
813 } 915 }
814 916
815 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
817 { 919 {
818 unsigned int i; 920 unsigned int i;
819 921
820 for (i = 0; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
821 CXINC; 923 CXINC;
826 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
827 929
828 { 930 {
829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
830 932
831 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
832 slot->defsv = DEFSV; 934 save_perl_slots (slot);
833 slot->errsv = ERRSV; 935#else
834 slot->irsgv = GvSV (irsgv);
835 slot->hinthv = GvHV (PL_hintgv);
836
837 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 937 #include "state.h"
839 #undef VAR 938#endif
840 } 939 }
841} 940}
842 941
843/* 942/*
844 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
875#endif 974#endif
876 975
877 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
880 982
881 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
884 991
885#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 995 PL_retstack_max = 4;
912 } 1019 }
913 1020
914 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
917 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
920#endif 1030#endif
921} 1031}
951 } 1061 }
952 1062
953 return rss; 1063 return rss;
954} 1064}
955 1065
956/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
957
958static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
959static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
961 1067
962/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
963#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
964#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
965 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
966 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
967#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
968 1102
969/* 1103/*
970 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
972 * and instead of trying to save and restore the hash elements (extremely slow), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
973 * we just provide our own readback here. 1107 * we just provide our own readback here.
974 */ 1108 */
975static int 1109static int ecb_cold
976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
977{ 1111{
978 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
979 1115
980 if (*s == '_') 1116 SV *ssv;
981 {
982 SV **svp = 0;
983 1117
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986
987 if (svp) 1118 if (!*svp)
988 { 1119 ssv = &PL_sv_undef;
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
990 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
991 } 1122 else
992 } 1123 ssv = *svp;
993 1124
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
995} 1127}
996 1128
997static int 1129static int ecb_cold
998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
999{ 1131{
1000 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1001 1135
1002 if (*s == '_')
1003 {
1004 SV **svp = 0;
1005
1006 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1007 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1008
1009 if (svp)
1010 {
1011 SV *old = *svp; 1136 SV *old = *svp;
1012 *svp = 0; 1137 *svp = 0;
1013 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1014 return 0; 1139 return 0;
1015 }
1016 }
1017
1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1019} 1140}
1020 1141
1021static int 1142static int ecb_cold
1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1023{ 1144{
1024 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1025 1148
1026 if (*s == '_')
1027 {
1028 SV **svp = 0;
1029
1030 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1031 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1032
1033 if (svp)
1034 {
1035 SV *old = *svp; 1149 SV *old = *svp;
1036 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1037 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1038 return 0; 1152 return 0;
1039 }
1040 }
1041
1042 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1043} 1153}
1044 1154
1045static void 1155static void
1046prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1047{ 1157{
1059slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{ 1170{
1061 return 1; 1171 return 1;
1062} 1172}
1063 1173
1174/** coroutine stack handling ************************************************/
1175
1064static UNOP init_perl_op; 1176static UNOP init_perl_op;
1065 1177
1066static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1067init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1068{ 1180{
1069 /* 1181 /*
1070 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
1071 */ 1183 */
1088 PL_hints = 0; 1200 PL_hints = 0;
1089 1201
1090 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1205
1094 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1216
1102 { 1217 {
1103 dSP; 1218 dSP;
1107 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
1108 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
1109 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
1110 1225
1111 PUSHMARK (SP); 1226 PUSHMARK (SP);
1112 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
1113 PUTBACK; 1228 PUTBACK;
1114 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
1115 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1116 } 1231 }
1117 1232
1131 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1132 1247
1133 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1135 1250
1136 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1137 1252
1138 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1139 { 1254 {
1140 coro_times_update (); 1255 coro_times_update ();
1141 coro_times_sub (coro); 1256 coro_times_sub (coro);
1142 } 1257 }
1143} 1258}
1179 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1181 1296
1182 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1183 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1184 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1185 1303
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1190 1305
1191 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
1213 1328
1214 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1335 }
1219} 1336}
1220 1337
1221INLINE void 1338ecb_inline void
1222free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1223{ 1340{
1224 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1225 { 1342 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1227 coro_mortal = 0; 1344 coro_mortal = 0;
1228 } 1345 }
1229} 1346}
1263 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
1264 1381
1265 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
1266 ENTER; 1383 ENTER;
1267 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
1268 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
1269 PUSHMARK (SP);
1270 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
1271 PUSHs (fullname); 1388 PUSHs (fullname);
1272 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1273 PUTBACK; 1390 PUTBACK;
1274 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1391 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1285 1402
1286 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1287 { 1404 {
1288 SV **cb; 1405 SV **cb;
1289 1406
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1408 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1410
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1412 {
1301 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1302 1419
1303 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1304 ENTER; 1421 ENTER;
1305 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1306 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1307 PUSHMARK (SP);
1308 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1309 PUSHs (fullname); 1426 PUSHs (fullname);
1310 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1311 PUTBACK; 1428 PUTBACK;
1312 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1313 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1314 SPAGAIN; 1431 SPAGAIN;
1315 FREETMPS; 1432 FREETMPS;
1325 dSP; 1442 dSP;
1326 1443
1327 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1328 ENTER; 1445 ENTER;
1329 SAVETMPS; 1446 SAVETMPS;
1330 EXTEND (SP, 3);
1331 PL_runops = RUNOPS_DEFAULT;
1332 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1333 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1334 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1335 PUTBACK; 1451 PUTBACK;
1336 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1452 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1337 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1453 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1364 1480
1365 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1481 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1366} 1482}
1367 1483
1368/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1484/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1369static void NOINLINE 1485static void ecb_noinline
1370cctx_prepare (pTHX) 1486cctx_prepare (pTHX)
1371{ 1487{
1372 PL_top_env = &PL_start_env; 1488 PL_top_env = &PL_start_env;
1373 1489
1374 if (cctx_current->flags & CC_TRACE) 1490 if (cctx_current->flags & CC_TRACE)
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1501 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1502 slf_frame.check = slf_check_set_stacklevel;
1387} 1503}
1388 1504
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1505/* the tail of transfer: execute stuff we can only do after a transfer */
1390INLINE void 1506ecb_inline void
1391transfer_tail (pTHX) 1507transfer_tail (pTHX)
1392{ 1508{
1393 free_coro_mortal (aTHX); 1509 free_coro_mortal (aTHX);
1510}
1511
1512/* try to exit the same way perl's main function would do */
1513/* we do not bother resetting the environment or other things *7
1514/* that are not, uhm, essential */
1515/* this obviously also doesn't work when perl is embedded */
1516static void ecb_noinline ecb_cold
1517perlish_exit (pTHX)
1518{
1519 int exitstatus = perl_destruct (PL_curinterp);
1520 perl_free (PL_curinterp);
1521 exit (exitstatus);
1394} 1522}
1395 1523
1396/* 1524/*
1397 * this is a _very_ stripped down perl interpreter ;) 1525 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1526 */
1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1553 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread. 1554 * runtime errors here, as this is just a random interpreter, not a thread.
1427 */ 1555 */
1428 1556
1429 /* 1557 /*
1558 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1559 * requires PL_scopestack_ix, so do it here if required.
1560 */
1561 if (!PL_scopestack_ix)
1562 ENTER;
1563
1564 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1565 * If perl-run returns we assume exit() was being called or the coro
1431 * fell off the end, which seems to be the only valid (non-bug) 1566 * fell off the end, which seems to be the only valid (non-bug)
1432 * reason for perl_run to return. We try to exit by jumping to the 1567 * reason for perl_run to return. We try to mimic whatever perl is normally
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1568 * doing in that case. YMMV.
1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1437 */ 1569 */
1438 PL_top_env = main_top_env; 1570 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1571 }
1441} 1572}
1442 1573
1443static coro_cctx * 1574static coro_cctx *
1444cctx_new () 1575cctx_new (void)
1445{ 1576{
1446 coro_cctx *cctx; 1577 coro_cctx *cctx;
1447 1578
1448 ++cctx_count; 1579 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1580 New (0, cctx, 1, coro_cctx);
1455 return cctx; 1586 return cctx;
1456} 1587}
1457 1588
1458/* create a new cctx only suitable as source */ 1589/* create a new cctx only suitable as source */
1459static coro_cctx * 1590static coro_cctx *
1460cctx_new_empty () 1591cctx_new_empty (void)
1461{ 1592{
1462 coro_cctx *cctx = cctx_new (); 1593 coro_cctx *cctx = cctx_new ();
1463 1594
1464 cctx->sptr = 0; 1595 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1596 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1597
1467 return cctx; 1598 return cctx;
1468} 1599}
1469 1600
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1601/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1602static coro_cctx *
1472cctx_new_run () 1603cctx_new_run (void)
1473{ 1604{
1474 coro_cctx *cctx = cctx_new (); 1605 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1606
1478#if HAVE_MMAP 1607 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1479 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1480 /* mmap supposedly does allocate-on-write for us */
1481 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1482
1483 if (cctx->sptr != (void *)-1)
1484 {
1485 #if CORO_STACKGUARD
1486 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1487 #endif
1488 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1489 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1490 cctx->flags |= CC_MAPPED;
1491 } 1608 {
1492 else
1493#endif
1494 {
1495 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1496 New (0, cctx->sptr, cctx_stacksize, long);
1497
1498 if (!cctx->sptr)
1499 {
1500 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1609 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1610 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1611 }
1507 1612
1508 #if CORO_USE_VALGRIND
1509 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1510 #endif
1511
1512 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1613 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1614
1514 return cctx; 1615 return cctx;
1515} 1616}
1516 1617
1517static void 1618static void
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1624 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1625
1525 --cctx_count; 1626 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1627 coro_destroy (&cctx->cctx);
1527 1628
1528 /* coro_transfer creates new, empty cctx's */ 1629 coro_stack_free (&cctx->stack);
1529 if (cctx->sptr)
1530 {
1531 #if CORO_USE_VALGRIND
1532 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1533 #endif
1534
1535#if HAVE_MMAP
1536 if (cctx->flags & CC_MAPPED)
1537 munmap (cctx->sptr, cctx->ssize);
1538 else
1539#endif
1540 Safefree (cctx->sptr);
1541 }
1542 1630
1543 Safefree (cctx); 1631 Safefree (cctx);
1544} 1632}
1545 1633
1546/* wether this cctx should be destructed */ 1634/* wether this cctx should be destructed */
1547#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1635#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1548 1636
1549static coro_cctx * 1637static coro_cctx *
1550cctx_get (pTHX) 1638cctx_get (pTHX)
1551{ 1639{
1552 while (expect_true (cctx_first)) 1640 while (ecb_expect_true (cctx_first))
1553 { 1641 {
1554 coro_cctx *cctx = cctx_first; 1642 coro_cctx *cctx = cctx_first;
1555 cctx_first = cctx->next; 1643 cctx_first = cctx->next;
1556 --cctx_idle; 1644 --cctx_idle;
1557 1645
1558 if (expect_true (!CCTX_EXPIRED (cctx))) 1646 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1559 return cctx; 1647 return cctx;
1560 1648
1561 cctx_destroy (cctx); 1649 cctx_destroy (cctx);
1562 } 1650 }
1563 1651
1565} 1653}
1566 1654
1567static void 1655static void
1568cctx_put (coro_cctx *cctx) 1656cctx_put (coro_cctx *cctx)
1569{ 1657{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1658 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1659
1572 /* free another cctx if overlimit */ 1660 /* free another cctx if overlimit */
1573 if (expect_false (cctx_idle >= cctx_max_idle)) 1661 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1662 {
1575 coro_cctx *first = cctx_first; 1663 coro_cctx *first = cctx_first;
1576 cctx_first = first->next; 1664 cctx_first = first->next;
1577 --cctx_idle; 1665 --cctx_idle;
1578 1666
1589static void 1677static void
1590transfer_check (pTHX_ struct coro *prev, struct coro *next) 1678transfer_check (pTHX_ struct coro *prev, struct coro *next)
1591{ 1679{
1592 /* TODO: throwing up here is considered harmful */ 1680 /* TODO: throwing up here is considered harmful */
1593 1681
1594 if (expect_true (prev != next)) 1682 if (ecb_expect_true (prev != next))
1595 { 1683 {
1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1684 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1685 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1598 1686
1599 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1687 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1688 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1601 1689
1602#if !PERL_VERSION_ATLEAST (5,10,0) 1690#if !PERL_VERSION_ATLEAST (5,10,0)
1603 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1691 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1692 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1605#endif 1693#endif
1606 } 1694 }
1607} 1695}
1608 1696
1609/* always use the TRANSFER macro */ 1697/* always use the TRANSFER macro */
1610static void NOINLINE /* noinline so we have a fixed stackframe */ 1698static void ecb_noinline /* noinline so we have a fixed stackframe */
1611transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1699transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1612{ 1700{
1613 dSTACKLEVEL; 1701 dSTACKLEVEL;
1614 1702
1615 /* sometimes transfer is only called to set idle_sp */ 1703 /* sometimes transfer is only called to set idle_sp */
1616 if (expect_false (!prev)) 1704 if (ecb_expect_false (!prev))
1617 { 1705 {
1618 cctx_current->idle_sp = STACKLEVEL; 1706 cctx_current->idle_sp = STACKLEVEL;
1619 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1707 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1620 } 1708 }
1621 else if (expect_true (prev != next)) 1709 else if (ecb_expect_true (prev != next))
1622 { 1710 {
1623 coro_cctx *cctx_prev; 1711 coro_cctx *cctx_prev;
1624 1712
1625 if (expect_false (prev->flags & CF_NEW)) 1713 if (ecb_expect_false (prev->flags & CF_NEW))
1626 { 1714 {
1627 /* create a new empty/source context */ 1715 /* create a new empty/source context */
1628 prev->flags &= ~CF_NEW; 1716 prev->flags &= ~CF_NEW;
1629 prev->flags |= CF_RUNNING; 1717 prev->flags |= CF_RUNNING;
1630 } 1718 }
1633 next->flags |= CF_RUNNING; 1721 next->flags |= CF_RUNNING;
1634 1722
1635 /* first get rid of the old state */ 1723 /* first get rid of the old state */
1636 save_perl (aTHX_ prev); 1724 save_perl (aTHX_ prev);
1637 1725
1638 if (expect_false (next->flags & CF_NEW)) 1726 if (ecb_expect_false (next->flags & CF_NEW))
1639 { 1727 {
1640 /* need to start coroutine */ 1728 /* need to start coroutine */
1641 next->flags &= ~CF_NEW; 1729 next->flags &= ~CF_NEW;
1642 /* setup coroutine call */ 1730 /* setup coroutine call */
1643 init_perl (aTHX_ next); 1731 init_perl (aTHX_ next);
1644 } 1732 }
1645 else 1733 else
1646 load_perl (aTHX_ next); 1734 load_perl (aTHX_ next);
1647 1735
1648 /* possibly untie and reuse the cctx */ 1736 /* possibly untie and reuse the cctx */
1649 if (expect_true ( 1737 if (ecb_expect_true (
1650 cctx_current->idle_sp == STACKLEVEL 1738 cctx_current->idle_sp == STACKLEVEL
1651 && !(cctx_current->flags & CC_TRACE) 1739 && !(cctx_current->flags & CC_TRACE)
1652 && !force_cctx 1740 && !force_cctx
1653 )) 1741 ))
1654 { 1742 {
1655 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1743 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1656 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1744 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1657 1745
1658 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1746 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1659 /* without this the next cctx_get might destroy the running cctx while still in use */ 1747 /* without this the next cctx_get might destroy the running cctx while still in use */
1660 if (expect_false (CCTX_EXPIRED (cctx_current))) 1748 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1661 if (expect_true (!next->cctx)) 1749 if (ecb_expect_true (!next->cctx))
1662 next->cctx = cctx_get (aTHX); 1750 next->cctx = cctx_get (aTHX);
1663 1751
1664 cctx_put (cctx_current); 1752 cctx_put (cctx_current);
1665 } 1753 }
1666 else 1754 else
1667 prev->cctx = cctx_current; 1755 prev->cctx = cctx_current;
1668 1756
1669 ++next->usecount; 1757 ++next->usecount;
1670 1758
1671 cctx_prev = cctx_current; 1759 cctx_prev = cctx_current;
1672 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1760 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1673 1761
1674 next->cctx = 0; 1762 next->cctx = 0;
1675 1763
1676 if (expect_false (cctx_prev != cctx_current)) 1764 if (ecb_expect_false (cctx_prev != cctx_current))
1677 { 1765 {
1678 cctx_prev->top_env = PL_top_env; 1766 cctx_prev->top_env = PL_top_env;
1679 PL_top_env = cctx_current->top_env; 1767 PL_top_env = cctx_current->top_env;
1680 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1768 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1681 } 1769 }
1701 return; 1789 return;
1702 1790
1703 slf_destroy (aTHX_ coro); 1791 slf_destroy (aTHX_ coro);
1704 1792
1705 coro->flags |= CF_ZOMBIE; 1793 coro->flags |= CF_ZOMBIE;
1706 1794
1707 if (coro->flags & CF_READY) 1795 if (coro->flags & CF_READY)
1708 { 1796 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1797 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1798 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1799 --coro_nready;
1747 Safefree (coro); 1835 Safefree (coro);
1748 1836
1749 return 0; 1837 return 0;
1750} 1838}
1751 1839
1752static int 1840static int ecb_cold
1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1841coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1754{ 1842{
1755 /* called when perl clones the current process the slow way (windows process emulation) */ 1843 /* called when perl clones the current process the slow way (windows process emulation) */
1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1844 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1757 mg->mg_ptr = 0; 1845 mg->mg_ptr = 0;
1788 TRANSFER (ta, 1); 1876 TRANSFER (ta, 1);
1789} 1877}
1790 1878
1791/** Coro ********************************************************************/ 1879/** Coro ********************************************************************/
1792 1880
1793INLINE void 1881ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1882coro_enq (pTHX_ struct coro *coro)
1795{ 1883{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1884 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1885
1798 SvREFCNT_inc_NN (coro->hv); 1886 SvREFCNT_inc_NN (coro->hv);
1800 coro->next_ready = 0; 1888 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1889 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1890 ready [1] = coro;
1803} 1891}
1804 1892
1805INLINE struct coro * 1893ecb_inline struct coro *
1806coro_deq (pTHX) 1894coro_deq (pTHX)
1807{ 1895{
1808 int prio; 1896 int prio;
1809 1897
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1898 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1863{ 1951{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1952 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1953}
1866 1954
1867/* expects to own a reference to next->hv */ 1955/* expects to own a reference to next->hv */
1868INLINE void 1956ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1957prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1958{
1871 SV *prev_sv = SvRV (coro_current); 1959 SV *prev_sv = SvRV (coro_current);
1872 1960
1873 ta->prev = SvSTATE_hv (prev_sv); 1961 ta->prev = SvSTATE_hv (prev_sv);
1886{ 1974{
1887 for (;;) 1975 for (;;)
1888 { 1976 {
1889 struct coro *next = coro_deq (aTHX); 1977 struct coro *next = coro_deq (aTHX);
1890 1978
1891 if (expect_true (next)) 1979 if (ecb_expect_true (next))
1892 { 1980 {
1893 /* cannot transfer to destroyed coros, skip and look for next */ 1981 /* cannot transfer to destroyed coros, skip and look for next */
1894 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 1982 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1983 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1896 else 1984 else
1897 { 1985 {
1898 next->flags &= ~CF_READY; 1986 next->flags &= ~CF_READY;
1899 --coro_nready; 1987 --coro_nready;
1907 /* nothing to schedule: call the idle handler */ 1995 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 1996 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 1997 && SvOBJECT (SvRV (sv_idle)))
1910 { 1998 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 1999 if (SvRV (sv_idle) == SvRV (coro_current))
2000 {
2001 require_pv ("Carp");
2002
2003 {
2004 dSP;
2005
2006 ENTER;
2007 SAVETMPS;
2008
2009 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2010 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2011 PUTBACK;
2012 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2013
2014 FREETMPS;
2015 LEAVE;
2016 }
2017 }
1913 2018
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2019 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2020 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2021 --coro_nready;
1917 } 2022 }
1932 } 2037 }
1933 } 2038 }
1934 } 2039 }
1935} 2040}
1936 2041
1937INLINE void 2042ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2043prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2044{
1940 api_ready (aTHX_ coro_current); 2045 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2046 prepare_schedule (aTHX_ ta);
1942} 2047}
1943 2048
1944INLINE void 2049ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2050prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2051{
1947 SV *prev = SvRV (coro_current); 2052 SV *prev = SvRV (coro_current);
1948 2053
1949 if (coro_nready) 2054 if (coro_nready)
1979{ 2084{
1980 struct coro_transfer_args ta; 2085 struct coro_transfer_args ta;
1981 2086
1982 prepare_cede (aTHX_ &ta); 2087 prepare_cede (aTHX_ &ta);
1983 2088
1984 if (expect_true (ta.prev != ta.next)) 2089 if (ecb_expect_true (ta.prev != ta.next))
1985 { 2090 {
1986 TRANSFER (ta, 1); 2091 TRANSFER (ta, 1);
1987 return 1; 2092 return 1;
1988 } 2093 }
1989 else 2094 else
2114{ 2219{
2115 AV *od = coro->on_destroy; 2220 AV *od = coro->on_destroy;
2116 2221
2117 if (!od) 2222 if (!od)
2118 return; 2223 return;
2224
2225 coro->on_destroy = 0;
2226 sv_2mortal ((SV *)od);
2119 2227
2120 while (AvFILLp (od) >= 0) 2228 while (AvFILLp (od) >= 0)
2121 { 2229 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2230 SV *cb = sv_2mortal (av_pop (od));
2123 2231
2144 2252
2145static void 2253static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2254coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2255{
2148 AV *av; 2256 AV *av;
2149 2257
2150 if (coro->status) 2258 if (coro->status)
2151 { 2259 {
2152 av = coro->status; 2260 av = coro->status;
2153 av_clear (av); 2261 av_clear (av);
2154 } 2262 }
2201 2309
2202 coro = SvSTATE (arg [0]); 2310 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2311 coro_hv = coro->hv;
2204 2312
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2313 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2314
2207 if (expect_false (coro->flags & CF_NOCANCEL)) 2315 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2316 {
2209 /* coro currently busy cancelling something, so just notify it */ 2317 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2318 coro->slf_frame.data = (void *)coro;
2211 2319
2212 frame->prepare = prepare_nop; 2320 frame->prepare = prepare_nop;
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2326 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2327 }
2220 else 2328 else
2221 { 2329 {
2222 struct coro *self = SvSTATE_current; 2330 struct coro *self = SvSTATE_current;
2331
2332 if (!self)
2333 croak ("Coro::cancel called outside of thread content,");
2223 2334
2224 /* otherwise we cancel directly, purely for speed reasons 2335 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2336 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2337 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2338 * this is ugly, and hopefully fully worth the extra speed.
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2371safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{ 2372{
2262 if (coro->cctx) 2373 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught"); 2374 croak ("coro inside C callback, unable to cancel at this time, caught");
2264 2375
2265 if (coro->flags & CF_NEW) 2376 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2266 { 2377 {
2267 coro_set_status (aTHX_ coro, arg, items); 2378 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro); 2379 coro_state_destroy (aTHX_ coro);
2269 } 2380 }
2270 else 2381 else
2320slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2431slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2321{ 2432{
2322 HV *hv = (HV *)SvRV (coro_current); 2433 HV *hv = (HV *)SvRV (coro_current);
2323 struct coro *coro = SvSTATE_hv ((SV *)hv); 2434 struct coro *coro = SvSTATE_hv ((SV *)hv);
2324 2435
2325 if (expect_true (coro->saved_deffh)) 2436 if (ecb_expect_true (coro->saved_deffh))
2326 { 2437 {
2327 /* subsequent iteration */ 2438 /* subsequent iteration */
2328 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2439 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2329 coro->saved_deffh = 0; 2440 coro->saved_deffh = 0;
2330 2441
2337 else 2448 else
2338 { 2449 {
2339 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2451 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2452
2453 if (ecb_expect_false (coro->swap_sv))
2454 {
2455 SWAP_SVS_LEAVE (coro);
2456 SvREFCNT_dec_NN (coro->swap_sv);
2457 coro->swap_sv = 0;
2458 }
2459
2342 coro->prio = 0; 2460 coro->prio = 0;
2343 2461
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
2346 2464
2347 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2467 }
2390 2508
2391static int 2509static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2510slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2511{
2394 SV *data = (SV *)frame->data; 2512 SV *data = (SV *)frame->data;
2395 2513
2396 if (CORO_THROW) 2514 if (CORO_THROW)
2397 return 0; 2515 return 0;
2398 2516
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2517 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2518 return 1;
2436 cb = sv_2mortal (coro->rouse_cb); 2554 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2555 coro->rouse_cb = 0;
2438 } 2556 }
2439 2557
2440 if (!SvROK (cb) 2558 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2559 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2560 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2561 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2562
2445 { 2563 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2564 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2569 2687
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2688/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2689static void
2572slf_destroy (pTHX_ struct coro *coro) 2690slf_destroy (pTHX_ struct coro *coro)
2573{ 2691{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2692 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2693
2578 /* 2694 /*
2579 * The on_destroy above most likely is from an SLF call. 2695 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2696 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2697 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2698 * cleanup functions cannot call SLF functions.
2583 */ 2699 */
2584 coro->slf_frame.prepare = 0; 2700 coro->slf_frame.prepare = 0;
2701
2702 /* this callback is reserved for slf functions needing to do cleanup */
2703 if (frame.destroy && frame.prepare && !PL_dirty)
2704 frame.destroy (aTHX_ &frame);
2585} 2705}
2586 2706
2587/* 2707/*
2588 * these not obviously related functions are all rolled into one 2708 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2709 * function to increase chances that they all will call transfer with the same
2596 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2716 I32 checkmark; /* mark SP to see how many elements check has pushed */
2597 2717
2598 /* set up the slf frame, unless it has already been set-up */ 2718 /* set up the slf frame, unless it has already been set-up */
2599 /* the latter happens when a new coro has been started */ 2719 /* the latter happens when a new coro has been started */
2600 /* or when a new cctx was attached to an existing coroutine */ 2720 /* or when a new cctx was attached to an existing coroutine */
2601 if (expect_true (!slf_frame.prepare)) 2721 if (ecb_expect_true (!slf_frame.prepare))
2602 { 2722 {
2603 /* first iteration */ 2723 /* first iteration */
2604 dSP; 2724 dSP;
2605 SV **arg = PL_stack_base + TOPMARK + 1; 2725 SV **arg = PL_stack_base + TOPMARK + 1;
2606 int items = SP - arg; /* args without function object */ 2726 int items = SP - arg; /* args without function object */
2647 while (slf_frame.check (aTHX_ &slf_frame)); 2767 while (slf_frame.check (aTHX_ &slf_frame));
2648 2768
2649 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2769 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2650 2770
2651 /* exception handling */ 2771 /* exception handling */
2652 if (expect_false (CORO_THROW)) 2772 if (ecb_expect_false (CORO_THROW))
2653 { 2773 {
2654 SV *exception = sv_2mortal (CORO_THROW); 2774 SV *exception = sv_2mortal (CORO_THROW);
2655 2775
2656 CORO_THROW = 0; 2776 CORO_THROW = 0;
2657 sv_setsv (ERRSV, exception); 2777 sv_setsv (ERRSV, exception);
2659 } 2779 }
2660 2780
2661 /* return value handling - mostly like entersub */ 2781 /* return value handling - mostly like entersub */
2662 /* make sure we put something on the stack in scalar context */ 2782 /* make sure we put something on the stack in scalar context */
2663 if (GIMME_V == G_SCALAR 2783 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2784 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2665 { 2785 {
2666 dSP; 2786 dSP;
2667 SV **bot = PL_stack_base + checkmark; 2787 SV **bot = PL_stack_base + checkmark;
2668 2788
2669 if (sp == bot) /* too few, push undef */ 2789 if (sp == bot) /* too few, push undef */
2774{ 2894{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2895 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2896 on_enterleave_call (aTHX_ sv_2mortal (cb));
2777} 2897}
2778 2898
2899static void
2900enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2901{
2902 if (!hook)
2903 return;
2904
2905 if (!*avp)
2906 {
2907 *avp = newAV ();
2908 AvREAL_off (*avp);
2909 }
2910
2911 av_push (*avp, (SV *)hook);
2912 av_push (*avp, (SV *)arg);
2913}
2914
2915static void
2916enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2917{
2918 AV *av = *avp;
2919 int i;
2920
2921 if (!av)
2922 return;
2923
2924 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2925 if (AvARRAY (av)[i] == (SV *)hook)
2926 {
2927 if (execute)
2928 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2929
2930 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2931 av_pop (av);
2932 av_pop (av);
2933 break;
2934 }
2935
2936 if (AvFILLp (av) >= 0)
2937 {
2938 *avp = 0;
2939 SvREFCNT_dec_NN (av);
2940 }
2941}
2942
2943static void
2944api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2945{
2946 struct coro *coro = SvSTATE (coro_sv);
2947
2948 if (SvSTATE_current == coro)
2949 if (enter)
2950 enter (aTHX_ enter_arg);
2951
2952 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2954}
2955
2956static void
2957api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2963}
2964
2965static void
2966savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2967{
2968 struct coro *coro = SvSTATE_current;
2969
2970 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2971}
2972
2973static void
2974savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2975{
2976 struct coro *coro = SvSTATE_current;
2977
2978 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2979}
2980
2981static void
2982api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2983{
2984 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2985
2986 /* this ought to be much cheaper than malloc + a single destructor call */
2987 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2988 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2989}
2990
2779/*****************************************************************************/ 2991/*****************************************************************************/
2780/* PerlIO::cede */ 2992/* PerlIO::cede */
2781 2993
2782typedef struct 2994typedef struct
2783{ 2995{
2784 PerlIOBuf base; 2996 PerlIOBuf base;
2785 NV next, every; 2997 NV next, every;
2786} PerlIOCede; 2998} PerlIOCede;
2787 2999
2788static IV 3000static IV ecb_cold
2789PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3001PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2790{ 3002{
2791 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2792 3004
2793 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3005 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2794 self->next = nvtime () + self->every; 3006 self->next = nvtime () + self->every;
2795 3007
2796 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3008 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2797} 3009}
2798 3010
2799static SV * 3011static SV * ecb_cold
2800PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3012PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2801{ 3013{
2802 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3014 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2803 3015
2804 return newSVnv (self->every); 3016 return newSVnv (self->every);
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3124 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3126 }
2915 3127
2916 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2917 } 3129 }
2918} 3130}
2919 3131
2920static void 3132static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2929{ 3141{
2930 AV *av = (AV *)frame->data; 3142 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3143 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3144 SV *coro_hv = SvRV (coro_current);
2933 3145
3146 frame->destroy = 0;
3147
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3148 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3149 if (ecb_expect_false (CORO_THROW))
3150 {
3151 /* we still might be responsible for the semaphore, so wake up others */
3152 coro_semaphore_adjust (aTHX_ av, 0);
3153
2936 return 0; 3154 return 0;
3155 }
2937 else if (SvIVX (count_sv) > 0) 3156 else if (SvIVX (count_sv) > 0)
2938 { 3157 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3158 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3159 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3160 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3161 coro_semaphore_adjust (aTHX_ av, 0);
2945 3162
2949 { 3166 {
2950 int i; 3167 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3168 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 3169 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3170 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3171 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3172 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3173 return 1;
2957 3174
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3175 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3176 return 1;
3056 { 3273 {
3057 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
3059 } 3276 }
3060 3277
3061 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
3062 3279
3063 --count; 3280 --count;
3064 } 3281 }
3065} 3282}
3066 3283
3151 } 3368 }
3152 3369
3153 av_push (state, data_sv); 3370 av_push (state, data_sv);
3154 3371
3155 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
3158} 3375}
3159 3376
3160static int 3377static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3379{
3167 /* it quickly returns */ 3384 /* it quickly returns */
3168 if (CORO_THROW) 3385 if (CORO_THROW)
3169 return 0; 3386 return 0;
3170 3387
3171 /* one element that is an RV? repeat! */ 3388 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3389 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3390 return 1;
3174 3391
3175 /* restore status */ 3392 /* restore status */
3176 { 3393 {
3177 SV *data_sv = av_pop (state); 3394 SV *data_sv = av_pop (state);
3180 errno = data->errorno; 3397 errno = data->errorno;
3181 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
3184 3401
3185 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
3186 } 3403 }
3187 3404
3188 /* push result values */ 3405 /* push result values */
3189 { 3406 {
3190 dSP; 3407 dSP;
3216 dSP; 3433 dSP;
3217 3434
3218 static SV *prio_cv; 3435 static SV *prio_cv;
3219 static SV *prio_sv; 3436 static SV *prio_sv;
3220 3437
3221 if (expect_false (!prio_cv)) 3438 if (ecb_expect_false (!prio_cv))
3222 { 3439 {
3223 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3440 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3224 prio_sv = newSViv (0); 3441 prio_sv = newSViv (0);
3225 } 3442 }
3226 3443
3332 } 3549 }
3333 3550
3334 return coro_sv; 3551 return coro_sv;
3335} 3552}
3336 3553
3554#ifndef __cplusplus
3555ecb_cold XS(boot_Coro__State);
3556#endif
3557
3558#if CORO_JIT
3559
3560static void ecb_noinline ecb_cold
3561pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3562{
3563 dSP;
3564 AV *av = newAV ();
3565
3566 av_store (av, 3, newSVuv (d));
3567 av_store (av, 2, newSVuv (c));
3568 av_store (av, 1, newSVuv (b));
3569 av_store (av, 0, newSVuv (a));
3570
3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3572
3573 PUTBACK;
3574}
3575
3576static void ecb_noinline ecb_cold
3577jit_init (pTHX)
3578{
3579 dSP;
3580 SV *load, *save;
3581 char *map_base;
3582 char *load_ptr, *save_ptr;
3583 STRLEN load_len, save_len, map_len;
3584 int count;
3585
3586 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3587
3588 PUSHMARK (SP);
3589 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3590 #include "state.h"
3591 count = call_pv ("Coro::State::_jit", G_ARRAY);
3592 SPAGAIN;
3593
3594 save = POPs; save_ptr = SvPVbyte (save, save_len);
3595 load = POPs; load_ptr = SvPVbyte (load, load_len);
3596
3597 map_len = load_len + save_len + 16;
3598
3599 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3600
3601 if (map_base == (char *)MAP_FAILED)
3602 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3603
3604 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3605
3606 load_perl_slots = (load_save_perl_slots_type)map_base;
3607 memcpy (map_base, load_ptr, load_len);
3608
3609 map_base += (load_len + 15) & ~15;
3610
3611 save_perl_slots = (load_save_perl_slots_type)map_base;
3612 memcpy (map_base, save_ptr, save_len);
3613
3614 /* we are good citizens and try to make the page read-only, so the evil evil */
3615 /* hackers might have it a bit more difficult */
3616 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3617
3618 PUTBACK;
3619 eval_pv ("undef &Coro::State::_jit", 1);
3620}
3621
3622#endif
3623
3337MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3338 3625
3339PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
3340 3627
3341BOOT: 3628BOOT:
3342{ 3629{
3630#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3631#include "state.h"
3343#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
3344# if CORO_PTHREAD 3633# if CORO_PTHREAD
3345 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
3346# endif 3635# endif
3347#endif 3636#endif
3348 BOOT_PAGESIZE; 3637 /* perl defines these to check for existance first, but why it doesn't */
3638 /* just create them one at init time is not clear to me, except for */
3639 /* programs trying to delete them, but... */
3640 /* anyway, we declare this as invalid and make sure they are initialised here */
3641 DEFSV;
3642 ERRSV;
3349 3643
3350 cctx_current = cctx_new_empty (); 3644 cctx_current = cctx_new_empty ();
3351 3645
3352 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3353 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3354 3648
3355 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
3356 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
3357 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3651 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3652 * by coro_sig_vtbl in hash values.
3653 */
3654 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3655
3656 /* this only works if perl doesn't have a vtbl for %SIG */
3657 assert (!mg->mg_virtual);
3658
3659 /*
3660 * The irony is that the perl API itself asserts that mg_virtual
3661 * must be non-const, yet perl5porters insisted on marking their
3662 * vtbls as read-only, just to thwart perl modules from patching
3663 * them.
3664 */
3665 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3666 mg->mg_flags |= MGf_COPY;
3667
3668 coro_sigelem_vtbl = PL_vtbl_sigelem;
3669 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3670 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3671 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3672 }
3358 3673
3359 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3360 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3674 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3361 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3675 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3362 3676
3363 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3364 3678
3396 coroapi.prepare_cede_notself = prepare_cede_notself; 3710 coroapi.prepare_cede_notself = prepare_cede_notself;
3397 3711
3398 time_init (aTHX); 3712 time_init (aTHX);
3399 3713
3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3714 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3715#if CORO_JIT
3716 PUTBACK;
3717 jit_init (aTHX);
3718 SPAGAIN;
3719#endif
3401} 3720}
3402 3721
3403SV * 3722SV *
3404new (SV *klass, ...) 3723new (SV *klass, ...)
3405 ALIAS: 3724 ALIAS:
3412void 3731void
3413transfer (...) 3732transfer (...)
3414 PROTOTYPE: $$ 3733 PROTOTYPE: $$
3415 CODE: 3734 CODE:
3416 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3735 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3417
3418void
3419_exit (int code)
3420 PROTOTYPE: $
3421 CODE:
3422 _exit (code);
3423 3736
3424SV * 3737SV *
3425clone (Coro::State coro) 3738clone (Coro::State coro)
3426 CODE: 3739 CODE:
3427{ 3740{
3482void 3795void
3483list () 3796list ()
3484 PROTOTYPE: 3797 PROTOTYPE:
3485 PPCODE: 3798 PPCODE:
3486{ 3799{
3487 struct coro *coro; 3800 struct coro *coro;
3488 for (coro = coro_first; coro; coro = coro->next) 3801 for (coro = coro_first; coro; coro = coro->next)
3489 if (coro->hv) 3802 if (coro->hv)
3490 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3803 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3491} 3804}
3492 3805
3556 RETVAL = boolSV (coro->flags & ix); 3869 RETVAL = boolSV (coro->flags & ix);
3557 OUTPUT: 3870 OUTPUT:
3558 RETVAL 3871 RETVAL
3559 3872
3560void 3873void
3561throw (Coro::State self, SV *exception = &PL_sv_undef) 3874throw (SV *self, SV *exception = &PL_sv_undef)
3562 PROTOTYPE: $;$ 3875 PROTOTYPE: $;$
3563 CODE: 3876 CODE:
3564{ 3877{
3878 struct coro *coro = SvSTATE (self);
3565 struct coro *current = SvSTATE_current; 3879 struct coro *current = SvSTATE_current;
3566 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3880 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3567 SvREFCNT_dec (*exceptionp); 3881 SvREFCNT_dec (*exceptionp);
3568 SvGETMAGIC (exception); 3882 SvGETMAGIC (exception);
3569 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3883 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3884
3885 api_ready (aTHX_ self);
3570} 3886}
3571 3887
3572void 3888void
3573api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3889api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3574 PROTOTYPE: $;$ 3890 PROTOTYPE: $;$
3651 3967
3652void 3968void
3653times (Coro::State self) 3969times (Coro::State self)
3654 PPCODE: 3970 PPCODE:
3655{ 3971{
3656 struct coro *current = SvSTATE (coro_current); 3972 struct coro *current = SvSTATE (coro_current);
3657 3973
3658 if (expect_false (current == self)) 3974 if (ecb_expect_false (current == self))
3659 { 3975 {
3660 coro_times_update (); 3976 coro_times_update ();
3661 coro_times_add (SvSTATE (coro_current)); 3977 coro_times_add (SvSTATE (coro_current));
3662 } 3978 }
3663 3979
3664 EXTEND (SP, 2); 3980 EXTEND (SP, 2);
3665 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3981 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3666 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3667 3983
3668 if (expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3669 coro_times_sub (SvSTATE (coro_current)); 3985 coro_times_sub (SvSTATE (coro_current));
3670} 3986}
3671 3987
3672void 3988void
3673swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3989swap_sv (Coro::State coro, SV *sva, SV *svb)
3674 CODE: 3990 CODE:
3675{ 3991{
3676 struct coro *current = SvSTATE_current; 3992 struct coro *current = SvSTATE_current;
3993 AV *swap_sv;
3994 int i;
3995
3996 sva = SvRV (sva);
3997 svb = SvRV (svb);
3677 3998
3678 if (current == coro) 3999 if (current == coro)
3679 SWAP_SVS (current); 4000 SWAP_SVS_LEAVE (current);
3680 4001
3681 if (!coro->swap_sv) 4002 if (!coro->swap_sv)
3682 coro->swap_sv = newAV (); 4003 coro->swap_sv = newAV ();
3683 4004
4005 swap_sv = coro->swap_sv;
4006
4007 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4008 {
4009 SV *a = AvARRAY (swap_sv)[i ];
4010 SV *b = AvARRAY (swap_sv)[i + 1];
4011
4012 if (a == sva && b == svb)
4013 {
4014 SvREFCNT_dec_NN (a);
4015 SvREFCNT_dec_NN (b);
4016
4017 for (; i <= AvFILLp (swap_sv) - 2; i++)
4018 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4019
4020 AvFILLp (swap_sv) -= 2;
4021
4022 goto removed;
4023 }
4024 }
4025
3684 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4026 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4028
4029 removed:
3686 4030
3687 if (current == coro) 4031 if (current == coro)
3688 SWAP_SVS (current); 4032 SWAP_SVS_ENTER (current);
3689} 4033}
3690 4034
3691 4035
3692MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
3693 4037
3694BOOT: 4038BOOT:
3695{ 4039{
4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4042
3696 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3697 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3698 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3699 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4046 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3700 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3704 4051
3705 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4052 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3706 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4053 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3707 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4054 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3708 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4055 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3709 4056
3710 coro_stash = gv_stashpv ("Coro", TRUE); 4057 coro_stash = gv_stashpv ("Coro", TRUE);
3711 4058
3712 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4059 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3713 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4060 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3714 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4061 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3726 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
3727 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
3728 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
3729 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
3730 4077
4078 coroapi.enterleave_hook = api_enterleave_hook;
4079 coroapi.enterleave_unhook = api_enterleave_unhook;
4080 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4081
3731 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
3732 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3733 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3734 } 4085 }
3735} 4086}
3736 4087
3737SV * 4088SV *
3800 4151
3801void 4152void
3802_set_current (SV *current) 4153_set_current (SV *current)
3803 PROTOTYPE: $ 4154 PROTOTYPE: $
3804 CODE: 4155 CODE:
3805 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3806 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3807 4158
3808void 4159void
3809_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3810 PROTOTYPE: $ 4161 PROTOTYPE: $
3894 4245
3895 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
3896 { 4247 {
3897 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3898 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3899 SvREFCNT_dec (sv); 4250 SvREFCNT_dec_NN (sv);
3900 } 4251 }
3901 4252
3902 { 4253 {
3903 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
3904 4255
3911 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
3912 4263
3913 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
3914 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3915 else 4266 else
3916 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
3917} 4268}
3918 4269
3919SV * 4270SV *
3920rouse_cb () 4271rouse_cb ()
3921 PROTOTYPE: 4272 PROTOTYPE:
3936 on_leave = 1 4287 on_leave = 1
3937 PROTOTYPE: & 4288 PROTOTYPE: &
3938 CODE: 4289 CODE:
3939{ 4290{
3940 struct coro *coro = SvSTATE_current; 4291 struct coro *coro = SvSTATE_current;
3941 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4292 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3942 4293
3943 block = s_get_cv_croak (block); 4294 block = s_get_cv_croak (block);
3944 4295
3945 if (!*avp) 4296 if (!*avp)
3946 *avp = newAV (); 4297 *avp = newAV ();
3966 4317
3967SV * 4318SV *
3968new (SV *klass, SV *count = 0) 4319new (SV *klass, SV *count = 0)
3969 CODE: 4320 CODE:
3970{ 4321{
3971 int semcnt = 1; 4322 int semcnt = 1;
3972 4323
3973 if (count) 4324 if (count)
3974 { 4325 {
3975 SvGETMAGIC (count); 4326 SvGETMAGIC (count);
3976 4327
4000 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4001 OUTPUT: 4352 OUTPUT:
4002 RETVAL 4353 RETVAL
4003 4354
4004void 4355void
4005up (SV *self, int adjust = 1) 4356up (SV *self)
4006 ALIAS:
4007 adjust = 1
4008 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
4009 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4010 4364
4011void 4365void
4012down (...) 4366down (...)
4013 CODE: 4367 CODE:
4014 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4036 XSRETURN_NO; 4390 XSRETURN_NO;
4037} 4391}
4038 4392
4039void 4393void
4040waiters (SV *self) 4394waiters (SV *self)
4041 PPCODE: 4395 PPCODE:
4042{ 4396{
4043 AV *av = (AV *)SvRV (self); 4397 AV *av = (AV *)SvRV (self);
4044 int wcount = AvFILLp (av) + 1 - 1; 4398 int wcount = AvFILLp (av) + 1 - 1;
4045 4399
4046 if (GIMME_V == G_SCALAR) 4400 if (GIMME_V == G_SCALAR)
4055} 4409}
4056 4410
4057MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4411MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4058 4412
4059void 4413void
4060_may_delete (SV *sem, int count, int extra_refs) 4414_may_delete (SV *sem, int count, unsigned int extra_refs)
4061 PPCODE: 4415 PPCODE:
4062{ 4416{
4063 AV *av = (AV *)SvRV (sem); 4417 AV *av = (AV *)SvRV (sem);
4064 4418
4065 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4419 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4066 && AvFILLp (av) == 0 /* no waiters, just count */ 4420 && AvFILLp (av) == 0 /* no waiters, just count */
4067 && SvIV (AvARRAY (av)[0]) == count) 4421 && SvIV (AvARRAY (av)[0]) == count)
4068 XSRETURN_YES; 4422 XSRETURN_YES;
4089 4443
4090void 4444void
4091broadcast (SV *self) 4445broadcast (SV *self)
4092 CODE: 4446 CODE:
4093{ 4447{
4094 AV *av = (AV *)SvRV (self); 4448 AV *av = (AV *)SvRV (self);
4095 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4449 coro_signal_wake (aTHX_ av, AvFILLp (av));
4096} 4450}
4097 4451
4098void 4452void
4099send (SV *self) 4453send (SV *self)
4107 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4461 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4108} 4462}
4109 4463
4110IV 4464IV
4111awaited (SV *self) 4465awaited (SV *self)
4112 CODE: 4466 CODE:
4113 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4467 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4114 OUTPUT: 4468 OUTPUT:
4115 RETVAL 4469 RETVAL
4116 4470
4117 4471
4122 4476
4123void 4477void
4124_schedule (...) 4478_schedule (...)
4125 CODE: 4479 CODE:
4126{ 4480{
4127 static int incede; 4481 static int incede;
4128 4482
4129 api_cede_notself (aTHX); 4483 api_cede_notself (aTHX);
4130 4484
4131 ++incede; 4485 ++incede;
4132 while (coro_nready >= incede && api_cede (aTHX)) 4486 while (coro_nready >= incede && api_cede (aTHX))
4176 { 4530 {
4177 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4531 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4178 coro_old_pp_sselect = 0; 4532 coro_old_pp_sselect = 0;
4179 } 4533 }
4180 4534
4535MODULE = Coro::State PACKAGE = Coro::Util
4536
4537void
4538_exit (int code)
4539 CODE:
4540 _exit (code);
4541
4542NV
4543time ()
4544 CODE:
4545 RETVAL = nvtime (aTHX);
4546 OUTPUT:
4547 RETVAL
4548
4549NV
4550gettimeofday ()
4551 PPCODE:
4552{
4553 UV tv [2];
4554 u2time (aTHX_ tv);
4555 EXTEND (SP, 2);
4556 PUSHs (sv_2mortal (newSVuv (tv [0])));
4557 PUSHs (sv_2mortal (newSVuv (tv [1])));
4558}
4559

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines