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.418 by root, Mon Feb 20 00:03:07 2012 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 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
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 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
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# 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
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 82# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 83#endif
79 84
80/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 106# if CORO_PTHREAD
102static void *coro_thx; 107static void *coro_thx;
103# endif 108# endif
104#endif 109#endif
105 110
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 111#ifdef __linux
110# include <time.h> /* for timespec */ 112# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 113# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 114# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
138 140
139static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
140static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
141static SV *rv_diehook; 143static SV *rv_diehook;
142static SV *rv_warnhook; 144static SV *rv_warnhook;
143static HV *hv_sig; /* %SIG */
144 145
145/* async_pool helper stuff */ 146/* async_pool helper stuff */
146static SV *sv_pool_rss; 147static SV *sv_pool_rss;
147static SV *sv_pool_size; 148static SV *sv_pool_size;
148static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
176typedef struct coro_cctx 177typedef struct coro_cctx
177{ 178{
178 struct coro_cctx *next; 179 struct coro_cctx *next;
179 180
180 /* the stack */ 181 /* the stack */
181 void *sptr; 182 struct coro_stack stack;
182 size_t ssize;
183 183
184 /* cpu state */ 184 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG 186#ifndef NDEBUG
187 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
213}; 213};
214 214
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 216typedef struct
217{ 217{
218#define VARx(name,expr,type) type name; 218 #define VARx(name,expr,type) type name;
219# include "state.h" 219 #include "state.h"
220#undef VARx
221} perl_slots; 220} perl_slots;
222 221
223/* how many context stack entries do we need for perl_slots */ 222/* how many context stack entries do we need for perl_slots */
224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
225 224
… …
256 SV *saved_deffh; 255 SV *saved_deffh;
257 SV *invoke_cb; 256 SV *invoke_cb;
258 AV *invoke_av; 257 AV *invoke_av;
259 258
260 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
261 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
263 262
264 /* swap_sv */ 263 /* swap_sv */
265 AV *swap_sv; 264 AV *swap_sv;
266 265
267 /* times */ 266 /* times */
… …
297#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
298 297
299/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
300 299
301#if CORO_JIT 300#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */ 301 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY 304 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY 306 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix" 307 #define CORO_JIT_TYPE "x86-unix"
309 #endif 308 #endif
310 #endif 309 #endif
311#endif 310#endif
312 311
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT 313 #undef CORO_JIT
315#endif 314#endif
316 315
317#if CORO_JIT 316#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *); 317 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
375time_init (pTHX) 374time_init (pTHX)
376{ 375{
377 SV **svp; 376 SV **svp;
378 377
379 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
380 379
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382 381
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385 384
… …
503 502
504 return 0; 503 return 0;
505} 504}
506 505
507ecb_inline struct coro * 506ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
509{ 508{
510 MAGIC *mg; 509 MAGIC *mg;
511 510
512 if (SvROK (coro)) 511 if (SvROK (coro_sv))
513 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
514 513
515 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg) 515 if (!mg)
517 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
518 517
519 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
520} 519}
… …
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527 526
528/*****************************************************************************/ 527/*****************************************************************************/
529/* padlist management and caching */ 528/* padlist management and caching */
530 529
531ecb_inline AV * 530ecb_inline PADLIST *
532coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
533{ 532{
534 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
535 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
536 538
537 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
538 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
541#else
542 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
543#endif 568#endif
544 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
545 --AvFILLp (padlist);
546 569
547 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
548 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
549 578
550 return newpadlist; 579 return newpadlist;
551} 580}
552 581
553ecb_inline void 582ecb_inline void
554free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
555{ 584{
556 /* may be during global destruction */ 585 /* may be during global destruction */
557 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
558 { 587 {
559 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
560 589
561 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
562 { 591 {
563 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
564 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
565 I32 j = AvFILLp (av);
566 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
567 while (j >= 0) 599 while (j >= 0)
568 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
569 601
570 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
571 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
572 } 605 }
573 606
574 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
575 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
576 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
577 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
578 } 617 }
579} 618}
580 619
581static int 620static int
582coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
583{ 622{
584 AV *padlist; 623 PADLIST *padlist;
585 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
586 626
587 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
589 return 0; 629 return 0;
590 630
591 /* casting is fun. */ 631 while (len--)
592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
593 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
594
595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
596 633
597 return 0; 634 return 0;
598} 635}
599 636
600static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
… …
605/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
606ecb_inline void 643ecb_inline void
607get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
608{ 645{
609 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
610 AV *av; 647 size_t *lenp;
611 648
612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
614 else 651 else
615 { 652 {
616#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
617 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
618 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
628 665
629ecb_inline void 666ecb_inline void
630put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
631{ 668{
632 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
633 AV *av;
634 670
635 if (ecb_expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
637 681
638 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
639
640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
641 av_extend (av, AvFILLp (av) + 1);
642
643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
644} 683}
645 684
646/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
647 686
648ecb_inline void 687ecb_inline void
… …
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670 709
671 /* if SvANY points to the head, we need to adjust the pointers, 710 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa. 711 * as the pointer for a still points to b, and maybe vice versa.
673 */ 712 */
674 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
676 719
677 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679 722
680 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
710 753
711#if CORO_JIT 754#if CORO_JIT
712 load_perl_slots (slot); 755 load_perl_slots (slot);
713#else 756#else
714 #define VARx(name,expr,type) expr = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
715 # include "state.h" 758 #include "state.h"
716 #undef VARx
717#endif 759#endif
718 760
719 { 761 {
720 dSP; 762 dSP;
721 763
… …
724 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
725 while (ecb_expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
726 { 768 {
727 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
728 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
729 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
730 } 772 }
731 773
732 PUTBACK; 774 PUTBACK;
733 } 775 }
734 776
… …
749 791
750 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
752 } 794 }
753 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
754 SWAP_SVS (c); 804 SWAP_SVS (c);
755} 805}
756 806
757static void 807static void
758save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
759{ 809{
760 SWAP_SVS (c); 810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
761 819
762 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
763 { 821 {
764 int i; 822 int i;
765 823
… …
843 901
844#if CORO_JIT 902#if CORO_JIT
845 save_perl_slots (slot); 903 save_perl_slots (slot);
846#else 904#else
847 #define VARx(name,expr,type) slot->name = expr; 905 #define VARx(name,expr,type) slot->name = expr;
848 # include "state.h" 906 #include "state.h"
849 #undef VARx
850#endif 907#endif
851 } 908 }
852} 909}
853 910
854/* 911/*
… …
998 { 1055 {
999 SV **svp = 0; 1056 SV **svp = 0;
1000 1057
1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1003 1060
1004 if (svp) 1061 if (svp)
1005 { 1062 {
1006 SV *ssv; 1063 SV *ssv;
1007 1064
1008 if (!*svp) 1065 if (!*svp)
… …
1114 PL_hints = 0; 1171 PL_hints = 0;
1115 1172
1116 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1117 PL_diehook = SvREFCNT_inc (rv_diehook); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1118 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1119 1176
1120 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1121 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1122 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1124 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1125 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1126 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1127 1187
1128 { 1188 {
1129 dSP; 1189 dSP;
… …
1239 1299
1240 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1241 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1242 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1243 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1244 } 1306 }
1245} 1307}
1246 1308
1247ecb_inline void 1309ecb_inline void
1248free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
… …
1311 1373
1312 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1313 { 1375 {
1314 SV **cb; 1376 SV **cb;
1315 1377
1316 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1317 { 1379 {
1318 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1319 1381
1320 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1321 { 1383 {
… …
1422/* try to exit the same way perl's main function would do */ 1484/* try to exit the same way perl's main function would do */
1423/* we do not bother resetting the environment or other things *7 1485/* we do not bother resetting the environment or other things *7
1424/* that are not, uhm, essential */ 1486/* that are not, uhm, essential */
1425/* this obviously also doesn't work when perl is embedded */ 1487/* this obviously also doesn't work when perl is embedded */
1426static void ecb_noinline ecb_cold 1488static void ecb_noinline ecb_cold
1427perlish_exit (void) 1489perlish_exit (pTHX)
1428{ 1490{
1429 int exitstatus = perl_destruct (PL_curinterp); 1491 int exitstatus = perl_destruct (PL_curinterp);
1430 perl_free (PL_curinterp); 1492 perl_free (PL_curinterp);
1431 exit (exitstatus); 1493 exit (exitstatus);
1432} 1494}
… …
1468 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1469 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1470 * reason for perl_run to return. We try to mimic whatever perl is normally 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1471 * doing in that case. YMMV. 1533 * doing in that case. YMMV.
1472 */ 1534 */
1473 perlish_exit (); 1535 perlish_exit (aTHX);
1474 } 1536 }
1475} 1537}
1476 1538
1477static coro_cctx * 1539static coro_cctx *
1478cctx_new (void) 1540cctx_new (void)
… …
1493static coro_cctx * 1555static coro_cctx *
1494cctx_new_empty (void) 1556cctx_new_empty (void)
1495{ 1557{
1496 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1497 1559
1498 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1499 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1500 1562
1501 return cctx; 1563 return cctx;
1502} 1564}
1503 1565
1504/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1505static coro_cctx * 1567static coro_cctx *
1506cctx_new_run (void) 1568cctx_new_run (void)
1507{ 1569{
1508 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1509 void *stack_start;
1510 size_t stack_size;
1511 1571
1512#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1513 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1514 /* mmap supposedly does allocate-on-write for us */
1515 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1516
1517 if (cctx->sptr != (void *)-1)
1518 {
1519 #if CORO_STACKGUARD
1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1521 #endif
1522 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1523 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1524 cctx->flags |= CC_MAPPED;
1525 } 1573 {
1526 else
1527#endif
1528 {
1529 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1530 New (0, cctx->sptr, cctx_stacksize, long);
1531
1532 if (!cctx->sptr)
1533 {
1534 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1535 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1536 }
1537
1538 stack_start = cctx->sptr;
1539 stack_size = cctx->ssize;
1540 } 1576 }
1541 1577
1542 #if CORO_USE_VALGRIND
1543 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1544 #endif
1545
1546 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1547 1579
1548 return cctx; 1580 return cctx;
1549} 1581}
1550 1582
1551static void 1583static void
… …
1557 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1558 1590
1559 --cctx_count; 1591 --cctx_count;
1560 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1561 1593
1562 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1563 if (cctx->sptr)
1564 {
1565 #if CORO_USE_VALGRIND
1566 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1567 #endif
1568
1569#if HAVE_MMAP
1570 if (cctx->flags & CC_MAPPED)
1571 munmap (cctx->sptr, cctx->ssize);
1572 else
1573#endif
1574 Safefree (cctx->sptr);
1575 }
1576 1595
1577 Safefree (cctx); 1596 Safefree (cctx);
1578} 1597}
1579 1598
1580/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
… …
1599} 1618}
1600 1619
1601static void 1620static void
1602cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1603{ 1622{
1604 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1605 1624
1606 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1608 { 1627 {
1609 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
… …
1735 return; 1754 return;
1736 1755
1737 slf_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1738 1757
1739 coro->flags |= CF_ZOMBIE; 1758 coro->flags |= CF_ZOMBIE;
1740 1759
1741 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1742 { 1761 {
1743 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1744 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1745 --coro_nready; 1764 --coro_nready;
… …
1941 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1942 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1943 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1944 { 1963 {
1945 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1946 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1947 1983
1948 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1949 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1950 --coro_nready; 1986 --coro_nready;
1951 } 1987 }
… …
2149 AV *od = coro->on_destroy; 2185 AV *od = coro->on_destroy;
2150 2186
2151 if (!od) 2187 if (!od)
2152 return; 2188 return;
2153 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2154 while (AvFILLp (od) >= 0) 2193 while (AvFILLp (od) >= 0)
2155 { 2194 {
2156 SV *cb = sv_2mortal (av_pop (od)); 2195 SV *cb = sv_2mortal (av_pop (od));
2157 2196
2158 /* coro hv's (and only hv's at the moment) are supported as well */ 2197 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2178 2217
2179static void 2218static void
2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2181{ 2220{
2182 AV *av; 2221 AV *av;
2183 2222
2184 if (coro->status) 2223 if (coro->status)
2185 { 2224 {
2186 av = coro->status; 2225 av = coro->status;
2187 av_clear (av); 2226 av_clear (av);
2188 } 2227 }
… …
2235 2274
2236 coro = SvSTATE (arg [0]); 2275 coro = SvSTATE (arg [0]);
2237 coro_hv = coro->hv; 2276 coro_hv = coro->hv;
2238 2277
2239 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2240 2279
2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2242 { 2281 {
2243 /* coro currently busy cancelling something, so just notify it */ 2282 /* coro currently busy cancelling something, so just notify it */
2244 coro->slf_frame.data = (void *)coro; 2283 coro->slf_frame.data = (void *)coro;
2245 2284
… …
2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2253 } 2292 }
2254 else 2293 else
2255 { 2294 {
2256 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2257 2299
2258 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2259 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2260 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2261 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
… …
2424 2466
2425static int 2467static int
2426slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2427{ 2469{
2428 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2429 2471
2430 if (CORO_THROW) 2472 if (CORO_THROW)
2431 return 0; 2473 return 0;
2432 2474
2433 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2434 return 1; 2476 return 1;
… …
2470 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2471 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2472 } 2514 }
2473 2515
2474 if (!SvROK (cb) 2516 if (!SvROK (cb)
2475 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2476 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2477 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2478 2520
2479 { 2521 {
2480 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2603 2645
2604/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2605static void 2647static void
2606slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2607{ 2649{
2608 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2609 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2610 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2611 2651
2612 /* 2652 /*
2613 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy 2654 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2617 */ 2657 */
2618 coro->slf_frame.prepare = 0; 2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2619} 2663}
2620 2664
2621/* 2665/*
2622 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2623 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2806static void 2850static void
2807coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2808{ 2852{
2809 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2810 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2811} 2947}
2812 2948
2813/*****************************************************************************/ 2949/*****************************************************************************/
2814/* PerlIO::cede */ 2950/* PerlIO::cede */
2815 2951
… …
2945 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2946 PUTBACK; 3082 PUTBACK;
2947 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2948 } 3084 }
2949 3085
2950 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2951 } 3087 }
2952} 3088}
2953 3089
2954static void 3090static void
2955coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2963{ 3099{
2964 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2965 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
2966 SV *coro_hv = SvRV (coro_current); 3102 SV *coro_hv = SvRV (coro_current);
2967 3103
3104 frame->destroy = 0;
3105
2968 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2969 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2970 return 0; 3112 return 0;
3113 }
2971 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2972 { 3115 {
2973 frame->destroy = 0;
2974
2975 if (acquire) 3116 if (acquire)
2976 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2977 else 3118 else
2978 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2979 3120
… …
3090 { 3231 {
3091 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3092 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3093 } 3234 }
3094 3235
3095 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3096 3237
3097 --count; 3238 --count;
3098 } 3239 }
3099} 3240}
3100 3241
… …
3185 } 3326 }
3186 3327
3187 av_push (state, data_sv); 3328 av_push (state, data_sv);
3188 3329
3189 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3190 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3191 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3192} 3333}
3193 3334
3194static int 3335static int
3195slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3196{ 3337{
… …
3201 /* it quickly returns */ 3342 /* it quickly returns */
3202 if (CORO_THROW) 3343 if (CORO_THROW)
3203 return 0; 3344 return 0;
3204 3345
3205 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
3206 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3207 return 1; 3348 return 1;
3208 3349
3209 /* restore status */ 3350 /* restore status */
3210 { 3351 {
3211 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
3214 errno = data->errorno; 3355 errno = data->errorno;
3215 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3216 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3217 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3218 3359
3219 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3220 } 3361 }
3221 3362
3222 /* push result values */ 3363 /* push result values */
3223 { 3364 {
3224 dSP; 3365 dSP;
… …
3401 int count; 3542 int count;
3402 3543
3403 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3404 3545
3405 PUSHMARK (SP); 3546 PUSHMARK (SP);
3406#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3407# include "state.h" 3548 #include "state.h"
3408#undef VARx
3409 count = call_pv ("Coro::State::_jit", G_ARRAY); 3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3410 SPAGAIN; 3550 SPAGAIN;
3411 3551
3412 save = POPs; save_ptr = SvPVbyte (save, save_len); 3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3413 load = POPs; load_ptr = SvPVbyte (load, load_len); 3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3440 3580
3441PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3442 3582
3443BOOT: 3583BOOT:
3444{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3445#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3446# if CORO_PTHREAD 3588# if CORO_PTHREAD
3447 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3448# endif 3590# endif
3449#endif 3591#endif
3450 BOOT_PAGESIZE;
3451
3452 /* perl defines these to check for existance first, but why it doesn't */ 3592 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */ 3593 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */ 3594 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */ 3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV; 3596 DEFSV;
… …
3463 3603
3464 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3465 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3466 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3467 3607
3468 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3469 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3470 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3471 3610
3472 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3473 3612
… …
3526void 3665void
3527transfer (...) 3666transfer (...)
3528 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3529 CODE: 3668 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3531
3532void
3533_exit (int code)
3534 PROTOTYPE: $
3535 CODE:
3536 _exit (code);
3537 3670
3538SV * 3671SV *
3539clone (Coro::State coro) 3672clone (Coro::State coro)
3540 CODE: 3673 CODE:
3541{ 3674{
… …
3596void 3729void
3597list () 3730list ()
3598 PROTOTYPE: 3731 PROTOTYPE:
3599 PPCODE: 3732 PPCODE:
3600{ 3733{
3601 struct coro *coro; 3734 struct coro *coro;
3602 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3603 if (coro->hv) 3736 if (coro->hv)
3604 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3605} 3738}
3606 3739
… …
3670 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3671 OUTPUT: 3804 OUTPUT:
3672 RETVAL 3805 RETVAL
3673 3806
3674void 3807void
3675throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3676 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3677 CODE: 3810 CODE:
3678{ 3811{
3812 struct coro *coro = SvSTATE (self);
3679 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3680 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3681 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3682 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3684} 3820}
3685 3821
3686void 3822void
3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3688 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3765 3901
3766void 3902void
3767times (Coro::State self) 3903times (Coro::State self)
3768 PPCODE: 3904 PPCODE:
3769{ 3905{
3770 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3771 3907
3772 if (ecb_expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3773 { 3909 {
3774 coro_times_update (); 3910 coro_times_update ();
3775 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
… …
3805 3941
3806MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3807 3943
3808BOOT: 3944BOOT:
3809{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3812 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3813 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3818 3957
3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3823 3962
3824 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3825 3964
3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3840 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3841 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3842 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3843 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3844 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3845 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3846 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3847 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3848 } 3991 }
3849} 3992}
… …
3914 4057
3915void 4058void
3916_set_current (SV *current) 4059_set_current (SV *current)
3917 PROTOTYPE: $ 4060 PROTOTYPE: $
3918 CODE: 4061 CODE:
3919 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3920 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3921 4064
3922void 4065void
3923_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3924 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
4008 4151
4009 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
4010 { 4153 {
4011 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4012 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4013 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
4014 } 4157 }
4015 4158
4016 { 4159 {
4017 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
4018 4161
… …
4025 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
4026 4169
4027 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
4028 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4029 else 4172 else
4030 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
4031} 4174}
4032 4175
4033SV * 4176SV *
4034rouse_cb () 4177rouse_cb ()
4035 PROTOTYPE: 4178 PROTOTYPE:
… …
4050 on_leave = 1 4193 on_leave = 1
4051 PROTOTYPE: & 4194 PROTOTYPE: &
4052 CODE: 4195 CODE:
4053{ 4196{
4054 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4056 4199
4057 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
4058 4201
4059 if (!*avp) 4202 if (!*avp)
4060 *avp = newAV (); 4203 *avp = newAV ();
… …
4080 4223
4081SV * 4224SV *
4082new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
4083 CODE: 4226 CODE:
4084{ 4227{
4085 int semcnt = 1; 4228 int semcnt = 1;
4086 4229
4087 if (count) 4230 if (count)
4088 { 4231 {
4089 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
4090 4233
… …
4150 XSRETURN_NO; 4293 XSRETURN_NO;
4151} 4294}
4152 4295
4153void 4296void
4154waiters (SV *self) 4297waiters (SV *self)
4155 PPCODE: 4298 PPCODE:
4156{ 4299{
4157 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
4158 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
4159 4302
4160 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
4172 4315
4173void 4316void
4174_may_delete (SV *sem, int count, unsigned int extra_refs) 4317_may_delete (SV *sem, int count, unsigned int extra_refs)
4175 PPCODE: 4318 PPCODE:
4176{ 4319{
4177 AV *av = (AV *)SvRV (sem); 4320 AV *av = (AV *)SvRV (sem);
4178 4321
4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4180 && AvFILLp (av) == 0 /* no waiters, just count */ 4323 && AvFILLp (av) == 0 /* no waiters, just count */
4181 && SvIV (AvARRAY (av)[0]) == count) 4324 && SvIV (AvARRAY (av)[0]) == count)
4182 XSRETURN_YES; 4325 XSRETURN_YES;
… …
4203 4346
4204void 4347void
4205broadcast (SV *self) 4348broadcast (SV *self)
4206 CODE: 4349 CODE:
4207{ 4350{
4208 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
4209 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
4210} 4353}
4211 4354
4212void 4355void
4213send (SV *self) 4356send (SV *self)
… …
4221 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4222} 4365}
4223 4366
4224IV 4367IV
4225awaited (SV *self) 4368awaited (SV *self)
4226 CODE: 4369 CODE:
4227 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4228 OUTPUT: 4371 OUTPUT:
4229 RETVAL 4372 RETVAL
4230 4373
4231 4374
… …
4236 4379
4237void 4380void
4238_schedule (...) 4381_schedule (...)
4239 CODE: 4382 CODE:
4240{ 4383{
4241 static int incede; 4384 static int incede;
4242 4385
4243 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
4244 4387
4245 ++incede; 4388 ++incede;
4246 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
4290 { 4433 {
4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4292 coro_old_pp_sselect = 0; 4435 coro_old_pp_sselect = 0;
4293 } 4436 }
4294 4437
4438MODULE = Coro::State PACKAGE = Coro::Util
4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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