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.410 by root, Sun Jun 12 08:14:12 2011 UTC vs.
Revision 1.475 by root, Tue Aug 14 16:51:38 2018 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
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
12#include "perl.h" 32#include "perl.h"
13#include "XSUB.h" 33#include "XSUB.h"
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
17#include "ecb.h" 40#include "ecb.h"
18 41
19#include <stddef.h> 42#include <stddef.h>
20#include <stdio.h> 43#include <stdio.h>
21#include <errno.h> 44#include <errno.h>
22#include <assert.h> 45#include <assert.h>
23 46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
24#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
57#endif
58
59#ifdef PadARRAY
60# define NEWPADAPI 1
61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
62#else
63typedef AV PADNAMELIST;
64# if !PERL_VERSION_ATLEAST(5,8,0)
65typedef AV PADLIST;
66typedef AV PAD;
67# endif
68# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
69# define PadlistMAX(pl) AvFILLp (pl)
70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
71# define PadARRAY AvARRAY
72# define PadMAX AvFILLp
73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
26#endif 86#endif
27 87
28#if defined(_WIN32) 88#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
30# undef setjmp 90# undef setjmp
33# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
34#else 94#else
35# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
36#endif 96#endif
37 97
38#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
67 100
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 103#endif
75 104
76/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
97# if CORO_PTHREAD 126# if CORO_PTHREAD
98static void *coro_thx; 127static void *coro_thx;
99# endif 128# endif
100#endif 129#endif
101 130
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 131#ifdef __linux
106# include <time.h> /* for timespec */ 132# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 133# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 134# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 135# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 138# endif
113#endif 139#endif
114 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
115static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
117 161
118/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
134 178
135static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 181static SV *rv_diehook;
138static SV *rv_warnhook; 182static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 183
141/* async_pool helper stuff */ 184/* async_pool helper stuff */
142static SV *sv_pool_rss; 185static SV *sv_pool_rss;
143static SV *sv_pool_size; 186static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
172typedef struct coro_cctx 215typedef struct coro_cctx
173{ 216{
174 struct coro_cctx *next; 217 struct coro_cctx *next;
175 218
176 /* the stack */ 219 /* the stack */
177 void *sptr; 220 struct coro_stack stack;
178 size_t ssize;
179 221
180 /* cpu state */ 222 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
224#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env */
226#endif
183 JMPENV *top_env; 227 JMPENV *top_env;
184 coro_context cctx; 228 coro_context cctx;
185 229
186 U32 gen; 230 U32 gen;
187#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
207}; 251};
208 252
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 253/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 254typedef struct
211{ 255{
212#define VARx(name,expr,type) type name; 256 #define VARx(name,expr,type) type name;
213# include "state.h" 257 #include "state.h"
214#undef VARx
215} perl_slots; 258} perl_slots;
216 259
217/* how many context stack entries do we need for perl_slots */ 260/* how many context stack entries do we need for perl_slots */
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 261#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 262
250 SV *saved_deffh; 293 SV *saved_deffh;
251 SV *invoke_cb; 294 SV *invoke_cb;
252 AV *invoke_av; 295 AV *invoke_av;
253 296
254 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
255 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
257 300
258 /* swap_sv */ 301 /* swap_sv */
259 AV *swap_sv; 302 AV *swap_sv;
260 303
261 /* times */ 304 /* times */
291#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
292 335
293/** JIT *********************************************************************/ 336/** JIT *********************************************************************/
294 337
295#if CORO_JIT 338#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */ 339 /* APPLE doesn't have mmap though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 340 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE 341 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY 342 #if ECB_AMD64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix" 343 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY 344 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix" 345 #define CORO_JIT_TYPE "x86-unix"
303 #endif 346 #endif
304 #endif 347 #endif
305#endif 348#endif
306 349
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
308 #undef CORO_JIT 351 #undef CORO_JIT
309#endif 352#endif
310 353
311#if CORO_JIT 354#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *); 355 typedef void (*load_save_perl_slots_type)(perl_slots *);
335 378
336/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
337 380
338#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
339 382
340ECB_INLINE void 383ecb_inline void
341coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
342{ 385{
343 struct timeval tv; 386 struct timeval tv;
344 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
345 388
346 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
347 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
348} 391}
349 392
350ECB_INLINE double 393ecb_inline double
351coro_nvtime (void) 394coro_nvtime (void)
352{ 395{
353 struct timeval tv; 396 struct timeval tv;
354 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
355 398
356 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
357} 400}
358 401
359ECB_INLINE void 402ecb_inline void
360time_init (pTHX) 403time_init (pTHX)
361{ 404{
362 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
363 u2time = coro_u2time; 406 u2time = coro_u2time;
364} 407}
365 408
366#else 409#else
367 410
368ECB_INLINE void 411ecb_inline void
369time_init (pTHX) 412time_init (pTHX)
370{ 413{
371 SV **svp; 414 SV **svp;
372 415
373 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
374 417
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376 419
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 421 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
379 422
415 get_hv (name, create); 458 get_hv (name, create);
416#endif 459#endif
417 return get_hv (name, create); 460 return get_hv (name, create);
418} 461}
419 462
420ECB_INLINE void 463ecb_inline void
421coro_times_update (void) 464coro_times_update (void)
422{ 465{
423#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
424 struct timespec ts; 467 struct timespec ts;
425 468
438 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
439 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
440#endif 483#endif
441} 484}
442 485
443ECB_INLINE void 486ecb_inline void
444coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
445{ 488{
446 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
447 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
448 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
450 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
451 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
452 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
453} 496}
454 497
455ECB_INLINE void 498ecb_inline void
456coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
457{ 500{
458 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
459 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
460 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
481 : 0) 524 : 0)
482 525
483#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 526#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
484#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 527#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
485 528
486ECB_INLINE MAGIC * 529ecb_inline MAGIC *
487SvSTATEhv_p (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
488{ 531{
489 MAGIC *mg; 532 MAGIC *mg;
490 533
491 if (ecb_expect_true ( 534 if (ecb_expect_true (
496 return mg; 539 return mg;
497 540
498 return 0; 541 return 0;
499} 542}
500 543
501ECB_INLINE struct coro * 544ecb_inline struct coro *
502SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
503{ 546{
504 MAGIC *mg; 547 MAGIC *mg;
505 548
506 if (SvROK (coro)) 549 if (SvROK (coro_sv))
507 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
508 551
509 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
510 if (!mg) 553 if (!mg)
511 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
512 555
513 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
514} 557}
520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
521 564
522/*****************************************************************************/ 565/*****************************************************************************/
523/* padlist management and caching */ 566/* padlist management and caching */
524 567
525ECB_INLINE AV * 568ecb_inline PADLIST *
526coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
527{ 570{
528 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
529 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
530 576
531 newpadlist = newAV (); 577#if NEWPADAPI
578
579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
591#if PERL_VERSION_ATLEAST (5,10,0)
592 Perl_pad_push (aTHX_ padlist, off);
593#else
594 Perl_pad_push (aTHX_ padlist, off, 1);
595#endif
596
597 newpad = PadlistARRAY (padlist)[off];
598 PadlistMAX (padlist) = off - 1;
599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
532 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
533#if PERL_VERSION_ATLEAST (5,10,0)
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
535#else
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
537#endif 606#endif
538 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
539 --AvFILLp (padlist);
540 607
541 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
542 av_store (newpadlist, 1, (SV *)newpad); 609 PadlistMAX (newpadlist) = 1;
610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
615 PadlistARRAY (newpadlist)[1] = newpad;
543 616
544 return newpadlist; 617 return newpadlist;
545} 618}
546 619
547ECB_INLINE void 620ecb_inline void
548free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
549{ 622{
550 /* may be during global destruction */ 623 /* may be during global destruction */
551 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
552 { 625 {
553 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
554 627
555 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
556 { 629 {
557 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
558 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
559 I32 j = AvFILLp (av);
560 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
561 while (j >= 0) 637 while (j >= 0)
562 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
563 639
564 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
565 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
566 } 643 }
567 644
568 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
569 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
570 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
571 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
572 } 655 }
573} 656}
574 657
575static int 658static int
576coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
577{ 660{
578 AV *padlist; 661 PADLIST *padlist;
579 AV *av = (AV *)mg->mg_obj; 662 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
663 size_t len = *(size_t *)mg->mg_ptr;
580 664
581 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
582 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
583 return 0; 667 return 0;
584 668
585 /* casting is fun. */ 669 while (len--)
586 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
587 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
588
589 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
590 671
591 return 0; 672 return 0;
592} 673}
593 674
594static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
595 0, 0, 0, 0, 676 0, 0, 0, 0,
596 coro_cv_free 677 coro_cv_free
597}; 678};
598 679
599/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
600ECB_INLINE void 681ecb_inline void
601get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
602{ 683{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 685 size_t *lenp;
605 686
606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
608 else 689 else
609 { 690 {
610#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
611 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
612 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
619#endif 700#endif
620 } 701 }
621} 702}
622 703
623ECB_INLINE void 704ecb_inline void
624put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
625{ 706{
626 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
627 AV *av;
628 708
629 if (ecb_expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
630 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 711 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
712 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
713 mg->mg_len = 1; /* so mg_free frees mg_ptr */
714 }
715 else
716 Renew (mg->mg_ptr,
717 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
718 char);
631 719
632 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
633
634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
635 av_extend (av, AvFILLp (av) + 1);
636
637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
638} 721}
639 722
640/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
641 724
725ecb_inline void
726swap_sv (SV *a, SV *b)
727{
728 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
729 SV tmp;
730
731 /* swap sv_any */
732 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
733
734 /* swap sv_flags */
735 SvFLAGS (&tmp) = SvFLAGS (a);
736 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
737 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
738
739#if PERL_VERSION_ATLEAST (5,10,0)
740 /* perl 5.10 and later complicates this _quite_ a bit, but it also
741 * is much faster, so no quarrels here. alternatively, we could
742 * sv_upgrade to avoid this.
743 */
744 {
745 /* swap sv_u */
746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
747
748 /* if SvANY points to the head, we need to adjust the pointers,
749 * as the pointer for a still points to b, and maybe vice versa.
750 */
751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
757
758 if (svany_in_head (SvTYPE (a)))
759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
760
761 if (svany_in_head (SvTYPE (b)))
762 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
763 }
764#endif
765}
766
642/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
643static void 768static void
644swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
645{ 770{
646 int i; 771 int i;
647 772
648 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
649 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
650 SV *a = AvARRAY (c->swap_sv)[i++];
651 SV *b = AvARRAY (c->swap_sv)[i++];
652
653 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
654 SV tmp;
655
656 /* swap sv_any */
657 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
658
659 /* swap sv_flags */
660 SvFLAGS (&tmp) = SvFLAGS (a);
661 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
662 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
663
664#if PERL_VERSION_ATLEAST (5,10,0)
665 /* perl 5.10 complicates this _quite_ a bit, but it also is
666 * much faster, so no quarrels here. alternatively, we could
667 * sv_upgrade to avoid this.
668 */
669 {
670 /* swap sv_u */
671 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
672
673 /* if SvANY points to the head, we need to adjust the pointers,
674 * as the pointer for a still points to b, and maybe vice versa.
675 */
676 #define svany_in_head(type) \
677 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
678
679 if (svany_in_head (SvTYPE (a)))
680 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
681
682 if (svany_in_head (SvTYPE (b)))
683 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
684 }
685#endif
686 }
687} 775}
688 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
689#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
690 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
691 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
692 793
693static void 794static void
694on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
695 796
696static void 797static void
703 804
704#if CORO_JIT 805#if CORO_JIT
705 load_perl_slots (slot); 806 load_perl_slots (slot);
706#else 807#else
707 #define VARx(name,expr,type) expr = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
708 # include "state.h" 809 #include "state.h"
709 #undef VARx
710#endif 810#endif
711 811
712 { 812 {
713 dSP; 813 dSP;
714 814
717 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
718 while (ecb_expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
719 { 819 {
720 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
721 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
722 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
723 } 823 }
724 824
725 PUTBACK; 825 PUTBACK;
726 } 826 }
727 827
742 842
743 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
744 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
745 } 845 }
746 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
747 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
748} 856}
749 857
750static void 858static void
751save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
752{ 860{
753 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
754 870
755 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
756 { 872 {
757 int i; 873 int i;
758 874
817 933
818 PUTBACK; 934 PUTBACK;
819 } 935 }
820 936
821 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
822 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
823 { 939 {
824 unsigned int i; 940 unsigned int i;
825 941
826 for (i = 0; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
827 CXINC; 943 CXINC;
836 952
837#if CORO_JIT 953#if CORO_JIT
838 save_perl_slots (slot); 954 save_perl_slots (slot);
839#else 955#else
840 #define VARx(name,expr,type) slot->name = expr; 956 #define VARx(name,expr,type) slot->name = expr;
841 # include "state.h" 957 #include "state.h"
842 #undef VARx
843#endif 958#endif
844 } 959 }
845} 960}
846 961
847/* 962/*
879#endif 994#endif
880 995
881 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
882 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
883 PL_scopestack_max = 8; 998 PL_scopestack_max = 8;
999#if HAS_SCOPESTACK_NAME
1000 New(54,PL_scopestack_name,8,const char*);
1001#endif
884 1002
885 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
888 1011
889#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
890 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
891 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
892 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
916 } 1039 }
917 1040
918 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
919 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
920 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
921 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
922#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
923 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
924#endif 1050#endif
925} 1051}
955 } 1081 }
956 1082
957 return rss; 1083 return rss;
958} 1084}
959 1085
960/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
961
962static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
963static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
964static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
965 1087
966/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
967#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
968#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
969 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
970 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
971#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
972 1122
973/* 1123/*
974 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
975 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1125 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
976 * and instead of trying to save and restore the hash elements (extremely slow), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
978 */ 1128 */
979static int ecb_cold 1129static int ecb_cold
980coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
981{ 1131{
982 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;
983 1135
984 if (*s == '_') 1136 SV *ssv;
985 {
986 SV **svp = 0;
987 1137
988 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
989 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
990
991 if (svp) 1138 if (!*svp)
992 { 1139 ssv = &PL_sv_undef;
993 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
994 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
995 } 1142 else
996 } 1143 ssv = *svp;
997 1144
998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
999} 1147}
1000 1148
1001static int ecb_cold 1149static int ecb_cold
1002coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1003{ 1151{
1004 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1005 1155
1006 if (*s == '_')
1007 {
1008 SV **svp = 0;
1009
1010 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1011 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1012
1013 if (svp)
1014 {
1015 SV *old = *svp; 1156 SV *old = *svp;
1016 *svp = 0; 1157 *svp = 0;
1017 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1018 return 0; 1159 return 0;
1019 }
1020 }
1021
1022 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1023} 1160}
1024 1161
1025static int ecb_cold 1162static int ecb_cold
1026coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1027{ 1164{
1028 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1029 1168
1030 if (*s == '_')
1031 {
1032 SV **svp = 0;
1033
1034 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1035 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1036
1037 if (svp)
1038 {
1039 SV *old = *svp; 1169 SV *old = *svp;
1040 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1041 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1042 return 0; 1172 return 0;
1043 }
1044 }
1045
1046 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1047} 1173}
1048 1174
1049static void 1175static void
1050prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1051{ 1177{
1062static int 1188static int
1063slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1064{ 1190{
1065 return 1; 1191 return 1;
1066} 1192}
1193
1194/** coroutine stack handling ************************************************/
1067 1195
1068static UNOP init_perl_op; 1196static UNOP init_perl_op;
1069 1197
1070ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1071init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1092 PL_hints = 0; 1220 PL_hints = 0;
1093 1221
1094 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1095 PL_diehook = SvREFCNT_inc (rv_diehook); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1096 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1097 1225
1098 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1099 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1100 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1101 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1102 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1103 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1104 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1105 1236
1106 { 1237 {
1107 dSP; 1238 dSP;
1111 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1112 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1113 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1114 1245
1115 PUSHMARK (SP); 1246 PUSHMARK (SP);
1116 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1117 PUTBACK; 1248 PUTBACK;
1118 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1119 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1120 } 1251 }
1121 1252
1135 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1136 1267
1137 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1138 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1139 1270
1140 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1141 1272
1142 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1143 { 1274 {
1144 coro_times_update (); 1275 coro_times_update ();
1145 coro_times_sub (coro); 1276 coro_times_sub (coro);
1183 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1184 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1185 1316
1186 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1187 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1188 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1189
1190 /* restore swapped sv's */
1191 SWAP_SVS (coro);
1192 1323
1193 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1194 1325
1195 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1196 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1217 1348
1218 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1219 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1220 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1221 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1222 } 1355 }
1223} 1356}
1224 1357
1225ECB_INLINE void 1358ecb_inline void
1226free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1227{ 1360{
1228 if (ecb_expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1229 { 1362 {
1230 SvREFCNT_dec ((SV *)coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1267 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1268 1401
1269 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1270 ENTER; 1403 ENTER;
1271 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1272 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1273 PUSHMARK (SP);
1274 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1275 PUSHs (fullname); 1408 PUSHs (fullname);
1276 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1277 PUTBACK; 1410 PUTBACK;
1278 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1289 1422
1290 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1291 { 1424 {
1292 SV **cb; 1425 SV **cb;
1293 1426
1294 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1295 { 1428 {
1296 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1297 1430
1298 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1299 { 1432 {
1305 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1306 1439
1307 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1308 ENTER; 1441 ENTER;
1309 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1310 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1311 PUSHMARK (SP);
1312 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1313 PUSHs (fullname); 1446 PUSHs (fullname);
1314 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1315 PUTBACK; 1448 PUTBACK;
1316 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1317 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1318 SPAGAIN; 1451 SPAGAIN;
1319 FREETMPS; 1452 FREETMPS;
1329 dSP; 1462 dSP;
1330 1463
1331 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1332 ENTER; 1465 ENTER;
1333 SAVETMPS; 1466 SAVETMPS;
1334 EXTEND (SP, 3);
1335 PL_runops = RUNOPS_DEFAULT;
1336 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1337 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1338 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1339 PUTBACK; 1471 PUTBACK;
1340 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1341 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1389 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1390 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1391} 1523}
1392 1524
1393/* the tail of transfer: execute stuff we can only do after a transfer */ 1525/* the tail of transfer: execute stuff we can only do after a transfer */
1394ECB_INLINE void 1526ecb_inline void
1395transfer_tail (pTHX) 1527transfer_tail (pTHX)
1396{ 1528{
1397 free_coro_mortal (aTHX); 1529 free_coro_mortal (aTHX);
1530}
1531
1532/* try to exit the same way perl's main function would do */
1533/* we do not bother resetting the environment or other things *7
1534/* that are not, uhm, essential */
1535/* this obviously also doesn't work when perl is embedded */
1536static void ecb_noinline ecb_cold
1537perlish_exit (pTHX)
1538{
1539 int exitstatus = perl_destruct (PL_curinterp);
1540 perl_free (PL_curinterp);
1541 exit (exitstatus);
1398} 1542}
1399 1543
1400/* 1544/*
1401 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1402 */ 1546 */
1429 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1430 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1431 */ 1575 */
1432 1576
1433 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1434 * If perl-run returns we assume exit() was being called or the coro 1585 * If perl-run returns we assume exit() was being called or the coro
1435 * fell off the end, which seems to be the only valid (non-bug) 1586 * fell off the end, which seems to be the only valid (non-bug)
1436 * reason for perl_run to return. We try to exit by jumping to the 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1437 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1438 * coroutine as Coro has no such concept.
1439 * This actually isn't valid with the pthread backend, but OSes requiring
1440 * that backend are too broken to do it in a standards-compliant way.
1441 */ 1589 */
1442 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1444 } 1591 }
1445} 1592}
1446 1593
1447static coro_cctx * 1594static coro_cctx *
1448cctx_new (void) 1595cctx_new (void)
1463static coro_cctx * 1610static coro_cctx *
1464cctx_new_empty (void) 1611cctx_new_empty (void)
1465{ 1612{
1466 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1467 1614
1468 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1469 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1470 1617
1471 return cctx; 1618 return cctx;
1472} 1619}
1473 1620
1474/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1475static coro_cctx * 1622static coro_cctx *
1476cctx_new_run (void) 1623cctx_new_run (void)
1477{ 1624{
1478 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1479 void *stack_start;
1480 size_t stack_size;
1481 1626
1482#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1483 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1484 /* mmap supposedly does allocate-on-write for us */
1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1486
1487 if (cctx->sptr != (void *)-1)
1488 {
1489 #if CORO_STACKGUARD
1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1491 #endif
1492 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1493 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1494 cctx->flags |= CC_MAPPED;
1495 } 1628 {
1496 else
1497#endif
1498 {
1499 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1500 New (0, cctx->sptr, cctx_stacksize, long);
1501
1502 if (!cctx->sptr)
1503 {
1504 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1505 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1506 }
1507
1508 stack_start = cctx->sptr;
1509 stack_size = cctx->ssize;
1510 } 1631 }
1511 1632
1512 #if CORO_USE_VALGRIND
1513 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1514 #endif
1515
1516 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1633 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1517 1634
1518 return cctx; 1635 return cctx;
1519} 1636}
1520 1637
1521static void 1638static void
1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1528 1645
1529 --cctx_count; 1646 --cctx_count;
1530 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1531 1648
1532 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1533 if (cctx->sptr)
1534 {
1535 #if CORO_USE_VALGRIND
1536 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1537 #endif
1538
1539#if HAVE_MMAP
1540 if (cctx->flags & CC_MAPPED)
1541 munmap (cctx->sptr, cctx->ssize);
1542 else
1543#endif
1544 Safefree (cctx->sptr);
1545 }
1546 1650
1547 Safefree (cctx); 1651 Safefree (cctx);
1548} 1652}
1549 1653
1550/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1569} 1673}
1570 1674
1571static void 1675static void
1572cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1573{ 1677{
1574 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1678 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1575 1679
1576 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1578 { 1682 {
1579 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1705 return; 1809 return;
1706 1810
1707 slf_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1708 1812
1709 coro->flags |= CF_ZOMBIE; 1813 coro->flags |= CF_ZOMBIE;
1710 1814
1711 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1712 { 1816 {
1713 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1714 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1715 --coro_nready; 1819 --coro_nready;
1792 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1793} 1897}
1794 1898
1795/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1796 1900
1797ECB_INLINE void 1901ecb_inline void
1798coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1799{ 1903{
1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1801 1905
1802 SvREFCNT_inc_NN (coro->hv); 1906 SvREFCNT_inc_NN (coro->hv);
1804 coro->next_ready = 0; 1908 coro->next_ready = 0;
1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1806 ready [1] = coro; 1910 ready [1] = coro;
1807} 1911}
1808 1912
1809ECB_INLINE struct coro * 1913ecb_inline struct coro *
1810coro_deq (pTHX) 1914coro_deq (pTHX)
1811{ 1915{
1812 int prio; 1916 int prio;
1813 1917
1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1867{ 1971{
1868 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1869} 1973}
1870 1974
1871/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1872ECB_INLINE void 1976ecb_inline void
1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1874{ 1978{
1875 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1876 1980
1877 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
1911 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1912 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1913 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1914 { 2018 {
1915 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1916 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1917 2038
1918 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1919 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1920 --coro_nready; 2041 --coro_nready;
1921 } 2042 }
1936 } 2057 }
1937 } 2058 }
1938 } 2059 }
1939} 2060}
1940 2061
1941ECB_INLINE void 2062ecb_inline void
1942prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1943{ 2064{
1944 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1945 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1946} 2067}
1947 2068
1948ECB_INLINE void 2069ecb_inline void
1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1950{ 2071{
1951 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1952 2073
1953 if (coro_nready) 2074 if (coro_nready)
2118{ 2239{
2119 AV *od = coro->on_destroy; 2240 AV *od = coro->on_destroy;
2120 2241
2121 if (!od) 2242 if (!od)
2122 return; 2243 return;
2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2123 2247
2124 while (AvFILLp (od) >= 0) 2248 while (AvFILLp (od) >= 0)
2125 { 2249 {
2126 SV *cb = sv_2mortal (av_pop (od)); 2250 SV *cb = sv_2mortal (av_pop (od));
2127 2251
2148 2272
2149static void 2273static void
2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2151{ 2275{
2152 AV *av; 2276 AV *av;
2153 2277
2154 if (coro->status) 2278 if (coro->status)
2155 { 2279 {
2156 av = coro->status; 2280 av = coro->status;
2157 av_clear (av); 2281 av_clear (av);
2158 } 2282 }
2205 2329
2206 coro = SvSTATE (arg [0]); 2330 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv; 2331 coro_hv = coro->hv;
2208 2332
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210 2334
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 { 2336 {
2213 /* coro currently busy cancelling something, so just notify it */ 2337 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro; 2338 coro->slf_frame.data = (void *)coro;
2215 2339
2222 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2223 } 2347 }
2224 else 2348 else
2225 { 2349 {
2226 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2227 2354
2228 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2229 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2230 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2231 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2264safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2265{ 2392{
2266 if (coro->cctx) 2393 if (coro->cctx)
2267 croak ("coro inside C callback, unable to cancel at this time, caught"); 2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2268 2395
2269 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2270 { 2397 {
2271 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2272 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2273 } 2400 }
2274 else 2401 else
2341 else 2468 else
2342 { 2469 {
2343 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2344 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2345 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2346 coro->prio = 0; 2480 coro->prio = 0;
2347 2481
2348 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2349 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2350 2484
2351 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2352 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc (hv));
2353 } 2487 }
2394 2528
2395static int 2529static int
2396slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2530slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2397{ 2531{
2398 SV *data = (SV *)frame->data; 2532 SV *data = (SV *)frame->data;
2399 2533
2400 if (CORO_THROW) 2534 if (CORO_THROW)
2401 return 0; 2535 return 0;
2402 2536
2403 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2537 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2404 return 1; 2538 return 1;
2440 cb = sv_2mortal (coro->rouse_cb); 2574 cb = sv_2mortal (coro->rouse_cb);
2441 coro->rouse_cb = 0; 2575 coro->rouse_cb = 0;
2442 } 2576 }
2443 2577
2444 if (!SvROK (cb) 2578 if (!SvROK (cb)
2445 || SvTYPE (SvRV (cb)) != SVt_PVCV 2579 || SvTYPE (SvRV (cb)) != SVt_PVCV
2446 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2580 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2447 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2448 2582
2449 { 2583 {
2450 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2573 2707
2574/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2708/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2575static void 2709static void
2576slf_destroy (pTHX_ struct coro *coro) 2710slf_destroy (pTHX_ struct coro *coro)
2577{ 2711{
2578 /* this callback is reserved for slf functions needing to do cleanup */ 2712 struct CoroSLF frame = coro->slf_frame;
2579 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2580 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2581 2713
2582 /* 2714 /*
2583 * The on_destroy above most likely is from an SLF call. 2715 * The on_destroy below most likely is from an SLF call.
2584 * Since by definition the SLF call will not finish when we destroy 2716 * Since by definition the SLF call will not finish when we destroy
2585 * the coro, we will have to force-finish it here, otherwise 2717 * the coro, we will have to force-finish it here, otherwise
2586 * cleanup functions cannot call SLF functions. 2718 * cleanup functions cannot call SLF functions.
2587 */ 2719 */
2588 coro->slf_frame.prepare = 0; 2720 coro->slf_frame.prepare = 0;
2721
2722 /* this callback is reserved for slf functions needing to do cleanup */
2723 if (frame.destroy && frame.prepare && !PL_dirty)
2724 frame.destroy (aTHX_ &frame);
2589} 2725}
2590 2726
2591/* 2727/*
2592 * these not obviously related functions are all rolled into one 2728 * these not obviously related functions are all rolled into one
2593 * function to increase chances that they all will call transfer with the same 2729 * function to increase chances that they all will call transfer with the same
2776static void 2912static void
2777coro_pop_on_leave (pTHX_ void *coro) 2913coro_pop_on_leave (pTHX_ void *coro)
2778{ 2914{
2779 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2915 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2780 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2916 on_enterleave_call (aTHX_ sv_2mortal (cb));
2917}
2918
2919static void
2920enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2921{
2922 if (!hook)
2923 return;
2924
2925 if (!*avp)
2926 {
2927 *avp = newAV ();
2928 AvREAL_off (*avp);
2929 }
2930
2931 av_push (*avp, (SV *)hook);
2932 av_push (*avp, (SV *)arg);
2933}
2934
2935static void
2936enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2937{
2938 AV *av = *avp;
2939 int i;
2940
2941 if (!av)
2942 return;
2943
2944 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2945 if (AvARRAY (av)[i] == (SV *)hook)
2946 {
2947 if (execute)
2948 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2949
2950 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2951 av_pop (av);
2952 av_pop (av);
2953 break;
2954 }
2955
2956 if (AvFILLp (av) >= 0)
2957 {
2958 *avp = 0;
2959 SvREFCNT_dec_NN (av);
2960 }
2961}
2962
2963static void
2964api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2965{
2966 struct coro *coro = SvSTATE (coro_sv);
2967
2968 if (SvSTATE_current == coro)
2969 if (enter)
2970 enter (aTHX_ enter_arg);
2971
2972 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2974}
2975
2976static void
2977api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2978{
2979 struct coro *coro = SvSTATE (coro_sv);
2980
2981 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2983}
2984
2985static void
2986savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2987{
2988 struct coro *coro = SvSTATE_current;
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991}
2992
2993static void
2994savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2999}
3000
3001static void
3002api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3003{
3004 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3005
3006 /* this ought to be much cheaper than malloc + a single destructor call */
3007 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3008 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2781} 3009}
2782 3010
2783/*****************************************************************************/ 3011/*****************************************************************************/
2784/* PerlIO::cede */ 3012/* PerlIO::cede */
2785 3013
2915 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3143 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2916 PUTBACK; 3144 PUTBACK;
2917 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3145 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2918 } 3146 }
2919 3147
2920 SvREFCNT_dec (cb); 3148 SvREFCNT_dec_NN (cb);
2921 } 3149 }
2922} 3150}
2923 3151
2924static void 3152static void
2925coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3153coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2933{ 3161{
2934 AV *av = (AV *)frame->data; 3162 AV *av = (AV *)frame->data;
2935 SV *count_sv = AvARRAY (av)[0]; 3163 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current); 3164 SV *coro_hv = SvRV (coro_current);
2937 3165
3166 frame->destroy = 0;
3167
2938 /* if we are about to throw, don't actually acquire the lock, just throw */ 3168 /* if we are about to throw, don't actually acquire the lock, just throw */
2939 if (CORO_THROW) 3169 if (ecb_expect_false (CORO_THROW))
3170 {
3171 /* we still might be responsible for the semaphore, so wake up others */
3172 coro_semaphore_adjust (aTHX_ av, 0);
3173
2940 return 0; 3174 return 0;
3175 }
2941 else if (SvIVX (count_sv) > 0) 3176 else if (SvIVX (count_sv) > 0)
2942 { 3177 {
2943 frame->destroy = 0;
2944
2945 if (acquire) 3178 if (acquire)
2946 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3179 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2947 else 3180 else
2948 coro_semaphore_adjust (aTHX_ av, 0); 3181 coro_semaphore_adjust (aTHX_ av, 0);
2949 3182
3060 { 3293 {
3061 api_ready (aTHX_ cb); 3294 api_ready (aTHX_ cb);
3062 sv_setiv (cb, 0); /* signal waiter */ 3295 sv_setiv (cb, 0); /* signal waiter */
3063 } 3296 }
3064 3297
3065 SvREFCNT_dec (cb); 3298 SvREFCNT_dec_NN (cb);
3066 3299
3067 --count; 3300 --count;
3068 } 3301 }
3069} 3302}
3070 3303
3155 } 3388 }
3156 3389
3157 av_push (state, data_sv); 3390 av_push (state, data_sv);
3158 3391
3159 api_ready (aTHX_ coro); 3392 api_ready (aTHX_ coro);
3160 SvREFCNT_dec (coro); 3393 SvREFCNT_dec_NN (coro);
3161 SvREFCNT_dec ((AV *)state); 3394 SvREFCNT_dec_NN ((AV *)state);
3162} 3395}
3163 3396
3164static int 3397static int
3165slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3398slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3166{ 3399{
3171 /* it quickly returns */ 3404 /* it quickly returns */
3172 if (CORO_THROW) 3405 if (CORO_THROW)
3173 return 0; 3406 return 0;
3174 3407
3175 /* one element that is an RV? repeat! */ 3408 /* one element that is an RV? repeat! */
3176 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3409 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3177 return 1; 3410 return 1;
3178 3411
3179 /* restore status */ 3412 /* restore status */
3180 { 3413 {
3181 SV *data_sv = av_pop (state); 3414 SV *data_sv = av_pop (state);
3184 errno = data->errorno; 3417 errno = data->errorno;
3185 PL_laststype = data->laststype; 3418 PL_laststype = data->laststype;
3186 PL_laststatval = data->laststatval; 3419 PL_laststatval = data->laststatval;
3187 PL_statcache = data->statcache; 3420 PL_statcache = data->statcache;
3188 3421
3189 SvREFCNT_dec (data_sv); 3422 SvREFCNT_dec_NN (data_sv);
3190 } 3423 }
3191 3424
3192 /* push result values */ 3425 /* push result values */
3193 { 3426 {
3194 dSP; 3427 dSP;
3343#endif 3576#endif
3344 3577
3345#if CORO_JIT 3578#if CORO_JIT
3346 3579
3347static void ecb_noinline ecb_cold 3580static void ecb_noinline ecb_cold
3348pushav_3uv (pTHX_ UV a, UV b, UV c) 3581pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3349{ 3582{
3350 dSP; 3583 dSP;
3351 AV *av = newAV (); 3584 AV *av = newAV ();
3352 3585
3586 av_store (av, 3, newSVuv (d));
3353 av_store (av, 2, newSVuv (c)); 3587 av_store (av, 2, newSVuv (c));
3354 av_store (av, 1, newSVuv (b)); 3588 av_store (av, 1, newSVuv (b));
3355 av_store (av, 0, newSVuv (a)); 3589 av_store (av, 0, newSVuv (a));
3356 3590
3357 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3591 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3370 int count; 3604 int count;
3371 3605
3372 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3606 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3373 3607
3374 PUSHMARK (SP); 3608 PUSHMARK (SP);
3375#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3609 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3376# include "state.h" 3610 #include "state.h"
3377#undef VARx
3378 count = call_pv ("Coro::State::_jit", G_ARRAY); 3611 count = call_pv ("Coro::State::_jit", G_ARRAY);
3379 SPAGAIN; 3612 SPAGAIN;
3380 3613
3381 save = POPs; save_ptr = SvPVbyte (save, save_len); 3614 save = POPs; save_ptr = SvPVbyte (save, save_len);
3382 load = POPs; load_ptr = SvPVbyte (load, load_len); 3615 load = POPs; load_ptr = SvPVbyte (load, load_len);
3383 3616
3384 map_len = load_len + save_len + 16; 3617 map_len = load_len + save_len + 16;
3385 3618
3386 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3619 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3620
3621 if (map_base == (char *)MAP_FAILED)
3622 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3387 3623
3388 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3624 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3389 3625
3390 load_perl_slots = (load_save_perl_slots_type)map_base; 3626 load_perl_slots = (load_save_perl_slots_type)map_base;
3391 memcpy (map_base, load_ptr, load_len); 3627 memcpy (map_base, load_ptr, load_len);
3409 3645
3410PROTOTYPES: DISABLE 3646PROTOTYPES: DISABLE
3411 3647
3412BOOT: 3648BOOT:
3413{ 3649{
3650#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3651#include "state.h"
3414#ifdef USE_ITHREADS 3652#ifdef USE_ITHREADS
3415# if CORO_PTHREAD 3653# if CORO_PTHREAD
3416 coro_thx = PERL_GET_CONTEXT; 3654 coro_thx = PERL_GET_CONTEXT;
3417# endif 3655# endif
3418#endif 3656#endif
3419 BOOT_PAGESIZE;
3420
3421 /* perl defines these to check for existance first, but why it doesn't */ 3657 /* perl defines these to check for existance first, but why it doesn't */
3422 /* just create them one at init time is not clear to me, except for */ 3658 /* just create them one at init time is not clear to me, except for */
3423 /* programs trying to delete them, but... */ 3659 /* programs trying to delete them, but... */
3424 /* anyway, we declare this as invalid and make sure they are initialised here */ 3660 /* anyway, we declare this as invalid and make sure they are initialised here */
3425 DEFSV; 3661 DEFSV;
3428 cctx_current = cctx_new_empty (); 3664 cctx_current = cctx_new_empty ();
3429 3665
3430 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3666 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3431 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3667 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3432 3668
3433 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3669 {
3434 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3670 /*
3435 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3671 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3672 * by coro_sig_vtbl in hash values.
3673 */
3674 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3675
3676 /* this only works if perl doesn't have a vtbl for %SIG */
3677 assert (!mg->mg_virtual);
3678
3679 /*
3680 * The irony is that the perl API itself asserts that mg_virtual
3681 * must be non-const, yet perl5porters insisted on marking their
3682 * vtbls as read-only, just to thwart perl modules from patching
3683 * them.
3684 */
3685 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3686 mg->mg_flags |= MGf_COPY;
3687
3688 coro_sigelem_vtbl = PL_vtbl_sigelem;
3689 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3690 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3691 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3692 }
3436 3693
3437 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3438 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3694 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3439 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3695 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3440 3696
3441 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3697 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3698
3699 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3442 3700
3443 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3701 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3444 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3445 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3446 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3495void 3753void
3496transfer (...) 3754transfer (...)
3497 PROTOTYPE: $$ 3755 PROTOTYPE: $$
3498 CODE: 3756 CODE:
3499 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3757 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3500
3501void
3502_exit (int code)
3503 PROTOTYPE: $
3504 CODE:
3505 _exit (code);
3506 3758
3507SV * 3759SV *
3508clone (Coro::State coro) 3760clone (Coro::State coro)
3509 CODE: 3761 CODE:
3510{ 3762{
3565void 3817void
3566list () 3818list ()
3567 PROTOTYPE: 3819 PROTOTYPE:
3568 PPCODE: 3820 PPCODE:
3569{ 3821{
3570 struct coro *coro; 3822 struct coro *coro;
3571 for (coro = coro_first; coro; coro = coro->next) 3823 for (coro = coro_first; coro; coro = coro->next)
3572 if (coro->hv) 3824 if (coro->hv)
3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3825 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3574} 3826}
3575 3827
3577call (Coro::State coro, SV *coderef) 3829call (Coro::State coro, SV *coderef)
3578 ALIAS: 3830 ALIAS:
3579 eval = 1 3831 eval = 1
3580 CODE: 3832 CODE:
3581{ 3833{
3834 struct coro *current = SvSTATE_current;
3835
3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3836 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3583 { 3837 {
3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save; 3838 struct CoroSLF slf_save;
3586 3839
3587 if (current != coro) 3840 if (current != coro)
3588 { 3841 {
3589 PUTBACK; 3842 PUTBACK;
3639 RETVAL = boolSV (coro->flags & ix); 3892 RETVAL = boolSV (coro->flags & ix);
3640 OUTPUT: 3893 OUTPUT:
3641 RETVAL 3894 RETVAL
3642 3895
3643void 3896void
3644throw (Coro::State self, SV *exception = &PL_sv_undef) 3897throw (SV *self, SV *exception = &PL_sv_undef)
3645 PROTOTYPE: $;$ 3898 PROTOTYPE: $;$
3646 CODE: 3899 CODE:
3647{ 3900{
3901 struct coro *coro = SvSTATE (self);
3648 struct coro *current = SvSTATE_current; 3902 struct coro *current = SvSTATE_current;
3649 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3903 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3650 SvREFCNT_dec (*exceptionp); 3904 SvREFCNT_dec (*exceptionp);
3651 SvGETMAGIC (exception); 3905 SvGETMAGIC (exception);
3652 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3906 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3907
3908 api_ready (aTHX_ self);
3653} 3909}
3654 3910
3655void 3911void
3656api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3912api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3657 PROTOTYPE: $;$ 3913 PROTOTYPE: $;$
3734 3990
3735void 3991void
3736times (Coro::State self) 3992times (Coro::State self)
3737 PPCODE: 3993 PPCODE:
3738{ 3994{
3739 struct coro *current = SvSTATE (coro_current); 3995 struct coro *current = SvSTATE (coro_current);
3740 3996
3741 if (ecb_expect_false (current == self)) 3997 if (ecb_expect_false (current == self))
3742 { 3998 {
3743 coro_times_update (); 3999 coro_times_update ();
3744 coro_times_add (SvSTATE (coro_current)); 4000 coro_times_add (SvSTATE (coro_current));
3751 if (ecb_expect_false (current == self)) 4007 if (ecb_expect_false (current == self))
3752 coro_times_sub (SvSTATE (coro_current)); 4008 coro_times_sub (SvSTATE (coro_current));
3753} 4009}
3754 4010
3755void 4011void
3756swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4012swap_sv (Coro::State coro, SV *sva, SV *svb)
3757 CODE: 4013 CODE:
3758{ 4014{
3759 struct coro *current = SvSTATE_current; 4015 struct coro *current = SvSTATE_current;
4016 AV *swap_sv;
4017 int i;
4018
4019 sva = SvRV (sva);
4020 svb = SvRV (svb);
3760 4021
3761 if (current == coro) 4022 if (current == coro)
3762 SWAP_SVS (current); 4023 SWAP_SVS_LEAVE (current);
3763 4024
3764 if (!coro->swap_sv) 4025 if (!coro->swap_sv)
3765 coro->swap_sv = newAV (); 4026 coro->swap_sv = newAV ();
3766 4027
4028 swap_sv = coro->swap_sv;
4029
4030 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4031 {
4032 SV *a = AvARRAY (swap_sv)[i ];
4033 SV *b = AvARRAY (swap_sv)[i + 1];
4034
4035 if (a == sva && b == svb)
4036 {
4037 SvREFCNT_dec_NN (a);
4038 SvREFCNT_dec_NN (b);
4039
4040 for (; i <= AvFILLp (swap_sv) - 2; i++)
4041 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4042
4043 AvFILLp (swap_sv) -= 2;
4044
4045 goto removed;
4046 }
4047 }
4048
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4049 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3768 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4050 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4051
4052 removed:
3769 4053
3770 if (current == coro) 4054 if (current == coro)
3771 SWAP_SVS (current); 4055 SWAP_SVS_ENTER (current);
3772} 4056}
3773 4057
3774 4058
3775MODULE = Coro::State PACKAGE = Coro 4059MODULE = Coro::State PACKAGE = Coro
3776 4060
3777BOOT: 4061BOOT:
3778{ 4062{
4063 if (SVt_LAST > 32)
4064 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4065
3779 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4066 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3780 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4067 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3781 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4068 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3782 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4069 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3783 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4070 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3787 4074
3788 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4075 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3789 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4076 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3790 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4077 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3791 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4078 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3792 4079
3793 coro_stash = gv_stashpv ("Coro", TRUE); 4080 coro_stash = gv_stashpv ("Coro", TRUE);
3794 4081
3795 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4082 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3796 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4083 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3797 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4084 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3809 coroapi.ready = api_ready; 4096 coroapi.ready = api_ready;
3810 coroapi.is_ready = api_is_ready; 4097 coroapi.is_ready = api_is_ready;
3811 coroapi.nready = coro_nready; 4098 coroapi.nready = coro_nready;
3812 coroapi.current = coro_current; 4099 coroapi.current = coro_current;
3813 4100
4101 coroapi.enterleave_hook = api_enterleave_hook;
4102 coroapi.enterleave_unhook = api_enterleave_unhook;
4103 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4104
3814 /*GCoroAPI = &coroapi;*/ 4105 /*GCoroAPI = &coroapi;*/
3815 sv_setiv (sv, (IV)&coroapi); 4106 sv_setiv (sv, PTR2IV (&coroapi));
3816 SvREADONLY_on (sv); 4107 SvREADONLY_on (sv);
3817 } 4108 }
3818} 4109}
3819 4110
3820SV * 4111SV *
3883 4174
3884void 4175void
3885_set_current (SV *current) 4176_set_current (SV *current)
3886 PROTOTYPE: $ 4177 PROTOTYPE: $
3887 CODE: 4178 CODE:
3888 SvREFCNT_dec (SvRV (coro_current)); 4179 SvREFCNT_dec_NN (SvRV (coro_current));
3889 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4180 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3890 4181
3891void 4182void
3892_set_readyhook (SV *hook) 4183_set_readyhook (SV *hook)
3893 PROTOTYPE: $ 4184 PROTOTYPE: $
3977 4268
3978 if ((SV *)hv == &PL_sv_undef) 4269 if ((SV *)hv == &PL_sv_undef)
3979 { 4270 {
3980 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4271 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3981 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4272 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3982 SvREFCNT_dec (sv); 4273 SvREFCNT_dec_NN (sv);
3983 } 4274 }
3984 4275
3985 { 4276 {
3986 struct coro *coro = SvSTATE_hv (hv); 4277 struct coro *coro = SvSTATE_hv (hv);
3987 4278
3994 api_ready (aTHX_ (SV *)hv); 4285 api_ready (aTHX_ (SV *)hv);
3995 4286
3996 if (GIMME_V != G_VOID) 4287 if (GIMME_V != G_VOID)
3997 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4288 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3998 else 4289 else
3999 SvREFCNT_dec (hv); 4290 SvREFCNT_dec_NN (hv);
4000} 4291}
4001 4292
4002SV * 4293SV *
4003rouse_cb () 4294rouse_cb ()
4004 PROTOTYPE: 4295 PROTOTYPE:
4019 on_leave = 1 4310 on_leave = 1
4020 PROTOTYPE: & 4311 PROTOTYPE: &
4021 CODE: 4312 CODE:
4022{ 4313{
4023 struct coro *coro = SvSTATE_current; 4314 struct coro *coro = SvSTATE_current;
4024 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4315 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4025 4316
4026 block = s_get_cv_croak (block); 4317 block = s_get_cv_croak (block);
4027 4318
4028 if (!*avp) 4319 if (!*avp)
4029 *avp = newAV (); 4320 *avp = newAV ();
4049 4340
4050SV * 4341SV *
4051new (SV *klass, SV *count = 0) 4342new (SV *klass, SV *count = 0)
4052 CODE: 4343 CODE:
4053{ 4344{
4054 int semcnt = 1; 4345 int semcnt = 1;
4055 4346
4056 if (count) 4347 if (count)
4057 { 4348 {
4058 SvGETMAGIC (count); 4349 SvGETMAGIC (count);
4059 4350
4083 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4374 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4084 OUTPUT: 4375 OUTPUT:
4085 RETVAL 4376 RETVAL
4086 4377
4087void 4378void
4088up (SV *self, int adjust = 1) 4379up (SV *self)
4089 ALIAS:
4090 adjust = 1
4091 CODE: 4380 CODE:
4381 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4382
4383void
4384adjust (SV *self, int adjust)
4385 CODE:
4092 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4386 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4093 4387
4094void 4388void
4095down (...) 4389down (...)
4096 CODE: 4390 CODE:
4097 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4391 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4119 XSRETURN_NO; 4413 XSRETURN_NO;
4120} 4414}
4121 4415
4122void 4416void
4123waiters (SV *self) 4417waiters (SV *self)
4124 PPCODE: 4418 PPCODE:
4125{ 4419{
4126 AV *av = (AV *)SvRV (self); 4420 AV *av = (AV *)SvRV (self);
4127 int wcount = AvFILLp (av) + 1 - 1; 4421 int wcount = AvFILLp (av) + 1 - 1;
4128 4422
4129 if (GIMME_V == G_SCALAR) 4423 if (GIMME_V == G_SCALAR)
4138} 4432}
4139 4433
4140MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4434MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4141 4435
4142void 4436void
4143_may_delete (SV *sem, int count, int extra_refs) 4437_may_delete (SV *sem, int count, unsigned int extra_refs)
4144 PPCODE: 4438 PPCODE:
4145{ 4439{
4146 AV *av = (AV *)SvRV (sem); 4440 AV *av = (AV *)SvRV (sem);
4147 4441
4148 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4442 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4149 && AvFILLp (av) == 0 /* no waiters, just count */ 4443 && AvFILLp (av) == 0 /* no waiters, just count */
4150 && SvIV (AvARRAY (av)[0]) == count) 4444 && SvIV (AvARRAY (av)[0]) == count)
4151 XSRETURN_YES; 4445 XSRETURN_YES;
4172 4466
4173void 4467void
4174broadcast (SV *self) 4468broadcast (SV *self)
4175 CODE: 4469 CODE:
4176{ 4470{
4177 AV *av = (AV *)SvRV (self); 4471 AV *av = (AV *)SvRV (self);
4178 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4472 coro_signal_wake (aTHX_ av, AvFILLp (av));
4179} 4473}
4180 4474
4181void 4475void
4182send (SV *self) 4476send (SV *self)
4190 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4484 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4191} 4485}
4192 4486
4193IV 4487IV
4194awaited (SV *self) 4488awaited (SV *self)
4195 CODE: 4489 CODE:
4196 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4490 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4197 OUTPUT: 4491 OUTPUT:
4198 RETVAL 4492 RETVAL
4199 4493
4200 4494
4205 4499
4206void 4500void
4207_schedule (...) 4501_schedule (...)
4208 CODE: 4502 CODE:
4209{ 4503{
4210 static int incede; 4504 static int incede;
4211 4505
4212 api_cede_notself (aTHX); 4506 api_cede_notself (aTHX);
4213 4507
4214 ++incede; 4508 ++incede;
4215 while (coro_nready >= incede && api_cede (aTHX)) 4509 while (coro_nready >= incede && api_cede (aTHX))
4259 { 4553 {
4260 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4554 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4261 coro_old_pp_sselect = 0; 4555 coro_old_pp_sselect = 0;
4262 } 4556 }
4263 4557
4558MODULE = Coro::State PACKAGE = Coro::Util
4559
4560void
4561_exit (int code)
4562 CODE:
4563 _exit (code);
4564
4565NV
4566time ()
4567 CODE:
4568 RETVAL = nvtime (aTHX);
4569 OUTPUT:
4570 RETVAL
4571
4572NV
4573gettimeofday ()
4574 PPCODE:
4575{
4576 UV tv [2];
4577 u2time (aTHX_ tv);
4578 EXTEND (SP, 2);
4579 PUSHs (sv_2mortal (newSVuv (tv [0])));
4580 PUSHs (sv_2mortal (newSVuv (tv [1])));
4581}
4582

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines