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.427 by root, Wed Dec 5 14:35:34 2012 UTC vs.
Revision 1.472 by root, Thu Aug 31 16:24:19 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
25 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
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
28#endif 37#endif
29 38
30#ifdef PadARRAY 39#ifdef PadARRAY
31# define NEWPADAPI 40# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 42#else
34typedef AV PADNAMELIST; 43typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 44# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 45typedef AV PADLIST;
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 52# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 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
66#endif
46 67
47#if defined(_WIN32) 68#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
49# undef setjmp 70# undef setjmp
50# undef longjmp 71# undef longjmp
52# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
53#else 74#else
54# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
55#endif 76#endif
56 77
57#if HAVE_MMAP
58# include <unistd.h>
59# include <sys/mman.h>
60# ifndef MAP_ANONYMOUS
61# ifdef MAP_ANON
62# define MAP_ANONYMOUS MAP_ANON
63# else
64# undef HAVE_MMAP
65# endif
66# endif
67# include <limits.h>
68# ifndef PAGESIZE
69# define PAGESIZE pagesize
70# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
71static long pagesize;
72# else
73# define BOOT_PAGESIZE (void)0
74# endif
75#else
76# define PAGESIZE 0
77# define BOOT_PAGESIZE (void)0
78#endif
79
80#if CORO_USE_VALGRIND
81# include <valgrind/valgrind.h>
82#endif
83
84/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
85static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
86 80
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1 82# define HAS_SCOPESTACK_NAME 1
89#endif
90
91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
92# undef CORO_STACKGUARD
93#endif
94
95#ifndef CORO_STACKGUARD
96# define CORO_STACKGUARD 0
97#endif 83#endif
98 84
99/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
100#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
101# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
130# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
131# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
132# endif 118# endif
133#endif 119#endif
134 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
135static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
136static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
137 141
138/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
139#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
154 158
155static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
156static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
157static SV *rv_diehook; 161static SV *rv_diehook;
158static SV *rv_warnhook; 162static SV *rv_warnhook;
159static HV *hv_sig; /* %SIG */
160 163
161/* async_pool helper stuff */ 164/* async_pool helper stuff */
162static SV *sv_pool_rss; 165static SV *sv_pool_rss;
163static SV *sv_pool_size; 166static SV *sv_pool_size;
164static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
192typedef struct coro_cctx 195typedef struct coro_cctx
193{ 196{
194 struct coro_cctx *next; 197 struct coro_cctx *next;
195 198
196 /* the stack */ 199 /* the stack */
197 void *sptr; 200 struct coro_stack stack;
198 size_t ssize;
199 201
200 /* cpu state */ 202 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 204#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
271 SV *saved_deffh; 273 SV *saved_deffh;
272 SV *invoke_cb; 274 SV *invoke_cb;
273 AV *invoke_av; 275 AV *invoke_av;
274 276
275 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
276 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
277 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
278 280
279 /* swap_sv */ 281 /* swap_sv */
280 AV *swap_sv; 282 AV *swap_sv;
281 283
282 /* times */ 284 /* times */
312#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
313 315
314/** JIT *********************************************************************/ 316/** JIT *********************************************************************/
315 317
316#if CORO_JIT 318#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 319 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 321 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 322 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 323 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 324 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 325 #define CORO_JIT_TYPE "x86-unix"
324 #endif 326 #endif
325 #endif 327 #endif
326#endif 328#endif
327 329
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 331 #undef CORO_JIT
330#endif 332#endif
331 333
332#if CORO_JIT 334#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 335 typedef void (*load_save_perl_slots_type)(perl_slots *);
518 520
519 return 0; 521 return 0;
520} 522}
521 523
522ecb_inline struct coro * 524ecb_inline struct coro *
523SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
524{ 526{
525 MAGIC *mg; 527 MAGIC *mg;
526 528
527 if (SvROK (coro)) 529 if (SvROK (coro_sv))
528 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
529 531
530 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
531 if (!mg) 533 if (!mg)
532 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
533 535
534 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
535} 537}
546ecb_inline PADLIST * 548ecb_inline PADLIST *
547coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
548{ 550{
549 PADLIST *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
551 PAD *newpad; 554 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 555 PADOFFSET off = PadlistMAX (padlist) + 1;
553 556
554 newPADLIST(newpadlist); 557#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 558
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
557 AvREAL_off (newpadlist); 560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
558#endif 561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
559#if PERL_VERSION_ATLEAST (5,10,0) 571#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 572 Perl_pad_push (aTHX_ padlist, off);
561#else 573#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 574 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 575#endif
576
564 newpad = PadlistARRAY (padlist)[off]; 577 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 578 PadlistMAX (padlist) = off - 1;
566 579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
585 AvREAL_off (newpadlist);
586#endif
587
567 /* Already extended to 2 elements by newPADLIST. */ 588 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 589 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
570 PadlistARRAY (newpadlist)[1] = newpad; 595 PadlistARRAY (newpadlist)[1] = newpad;
571 596
572 return newpadlist; 597 return newpadlist;
573} 598}
574 599
582 607
583 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
584 { 609 {
585 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
612
613 if (pad)
614 {
587 I32 j = PadMAX (pad); 615 I32 j = PadMAX (pad);
588 616
589 while (j >= 0) 617 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
591 619
592 PadMAX (pad) = -1; 620 PadMAX (pad) = -1;
593 SvREFCNT_dec (pad); 621 SvREFCNT_dec (pad);
622 }
594 } 623 }
595 624
596 SvREFCNT_dec (PadlistNAMES (padlist)); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
597 626
598#ifdef NEWPADAPI 627#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 628 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 629 Safefree (padlist);
601#else 630#else
602 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 632 AvREAL_off (padlist);
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698 727
699 /* if SvANY points to the head, we need to adjust the pointers, 728 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa. 729 * as the pointer for a still points to b, and maybe vice versa.
701 */ 730 */
702 #define svany_in_head(type) \ 731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
704 737
705 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707 740
708 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
711#endif 744#endif
712} 745}
713 746
714/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
715static void 748static void
716swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
717{ 750{
718 int i; 751 int i;
719 752
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
722} 755}
723 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
724#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
726 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
727 773
728static void 774static void
729on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
730 776
731static void 777static void
776 822
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 } 825 }
780 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
781 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
782} 836}
783 837
784static void 838static void
785save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
786{ 840{
787 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
788 850
789 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
790 { 852 {
791 int i; 853 int i;
792 854
919#endif 981#endif
920 982
921 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
922 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
923 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
924 991
925#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
926 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
927 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
928 PL_retstack_max = 4; 995 PL_retstack_max = 4;
994 } 1061 }
995 1062
996 return rss; 1063 return rss;
997} 1064}
998 1065
999/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
1000
1001static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1002static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1003static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1004 1067
1005/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
1006#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
1007#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1008 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1009 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1010#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1011 1102
1012/* 1103/*
1013 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
1014 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
1015 * and instead of trying to save and restore the hash elements (extremely slow), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
1017 */ 1108 */
1018static int ecb_cold 1109static int ecb_cold
1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1020{ 1111{
1021 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1022 1115
1023 if (*s == '_') 1116 SV *ssv;
1024 {
1025 SV **svp = 0;
1026 1117
1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1029
1030 if (svp) 1118 if (!*svp)
1031 {
1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1038 else 1122 else
1039 ssv = *svp; 1123 ssv = *svp;
1040 1124
1041 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1042 return 0; 1126 return 0;
1043 }
1044 }
1045
1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1047} 1127}
1048 1128
1049static int ecb_cold 1129static int ecb_cold
1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1051{ 1131{
1052 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;
1053 1135
1054 if (*s == '_')
1055 {
1056 SV **svp = 0;
1057
1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1060
1061 if (svp)
1062 {
1063 SV *old = *svp; 1136 SV *old = *svp;
1064 *svp = 0; 1137 *svp = 0;
1065 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1066 return 0; 1139 return 0;
1067 }
1068 }
1069
1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1071} 1140}
1072 1141
1073static int ecb_cold 1142static int ecb_cold
1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1075{ 1144{
1076 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1077 1148
1078 if (*s == '_')
1079 {
1080 SV **svp = 0;
1081
1082 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1083 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1084
1085 if (svp)
1086 {
1087 SV *old = *svp; 1149 SV *old = *svp;
1088 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1089 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1090 return 0; 1152 return 0;
1091 }
1092 }
1093
1094 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1095} 1153}
1096 1154
1097static void 1155static void
1098prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1099{ 1157{
1110static int 1168static int
1111slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1112{ 1170{
1113 return 1; 1171 return 1;
1114} 1172}
1173
1174/** coroutine stack handling ************************************************/
1115 1175
1116static UNOP init_perl_op; 1176static UNOP init_perl_op;
1117 1177
1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1119init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1145 1205
1146 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1147 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1148 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1150 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1151 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1153 1216
1154 { 1217 {
1155 dSP; 1218 dSP;
1183 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1184 1247
1185 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1186 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1187 1250
1188 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1189 1252
1190 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1191 { 1254 {
1192 coro_times_update (); 1255 coro_times_update ();
1193 coro_times_sub (coro); 1256 coro_times_sub (coro);
1231 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1233 1296
1234 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1235 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1236 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240 1303
1241 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1242 1305
1243 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1244 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1265 1328
1266 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1267 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1268 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1269 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1270 } 1335 }
1271} 1336}
1272 1337
1273ecb_inline void 1338ecb_inline void
1274free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1337 1402
1338 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1339 { 1404 {
1340 SV **cb; 1405 SV **cb;
1341 1406
1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1343 { 1408 {
1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1345 1410
1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1347 { 1412 {
1357 SAVETMPS; 1422 SAVETMPS;
1358 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1359 PUSHMARK (SP); 1424 PUSHMARK (SP);
1360 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1361 PUSHs (fullname); 1426 PUSHs (fullname);
1362 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1363 PUTBACK; 1428 PUTBACK;
1364 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1365 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1366 SPAGAIN; 1431 SPAGAIN;
1367 FREETMPS; 1432 FREETMPS;
1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1491 */ 1556 */
1492 1557
1493 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1494 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1495 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1496 * reason for perl_run to return. We try to mimic whatever perl is normally 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1497 * doing in that case. YMMV. 1569 * doing in that case. YMMV.
1498 */ 1570 */
1519static coro_cctx * 1591static coro_cctx *
1520cctx_new_empty (void) 1592cctx_new_empty (void)
1521{ 1593{
1522 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1523 1595
1524 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1598
1527 return cctx; 1599 return cctx;
1528} 1600}
1529 1601
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1603static coro_cctx *
1532cctx_new_run (void) 1604cctx_new_run (void)
1533{ 1605{
1534 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1607
1538#if CORO_FIBER 1608 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1545 #if HAVE_MMAP
1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1547 /* mmap supposedly does allocate-on-write for us */
1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1549
1550 if (cctx->sptr != (void *)-1)
1551 { 1609 {
1552 #if CORO_STACKGUARD
1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1554 #endif
1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1557 cctx->flags |= CC_MAPPED;
1558 }
1559 else
1560 #endif
1561 {
1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1563 New (0, cctx->sptr, cctx_stacksize, long);
1564
1565 if (!cctx->sptr)
1566 {
1567 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1568 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1569 }
1570
1571 stack_start = cctx->sptr;
1572 stack_size = cctx->ssize;
1573 } 1612 }
1574 #endif
1575 1613
1576 #if CORO_USE_VALGRIND
1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1578 #endif
1579
1580 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1614 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1581 1615
1582 return cctx; 1616 return cctx;
1583} 1617}
1584 1618
1585static void 1619static void
1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1592 1626
1593 --cctx_count; 1627 --cctx_count;
1594 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1595 1629
1596 /* coro_transfer creates new, empty cctx's */ 1630 coro_stack_free (&cctx->stack);
1597 if (cctx->sptr)
1598 {
1599 #if CORO_USE_VALGRIND
1600 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1601 #endif
1602
1603#if HAVE_MMAP
1604 if (cctx->flags & CC_MAPPED)
1605 munmap (cctx->sptr, cctx->ssize);
1606 else
1607#endif
1608 Safefree (cctx->sptr);
1609 }
1610 1631
1611 Safefree (cctx); 1632 Safefree (cctx);
1612} 1633}
1613 1634
1614/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
1633} 1654}
1634 1655
1635static void 1656static void
1636cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1637{ 1658{
1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1659 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1639 1660
1640 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1642 { 1663 {
1643 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
1975 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1976 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1977 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1978 { 1999 {
1979 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1980 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1981 2019
1982 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1983 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1984 --coro_nready; 2022 --coro_nready;
1985 } 2023 }
2183 AV *od = coro->on_destroy; 2221 AV *od = coro->on_destroy;
2184 2222
2185 if (!od) 2223 if (!od)
2186 return; 2224 return;
2187 2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2228
2188 while (AvFILLp (od) >= 0) 2229 while (AvFILLp (od) >= 0)
2189 { 2230 {
2190 SV *cb = sv_2mortal (av_pop (od)); 2231 SV *cb = sv_2mortal (av_pop (od));
2191 2232
2192 /* coro hv's (and only hv's at the moment) are supported as well */ 2233 /* coro hv's (and only hv's at the moment) are supported as well */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 } 2328 }
2288 else 2329 else
2289 { 2330 {
2290 struct coro *self = SvSTATE_current; 2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2291 2335
2292 /* otherwise we cancel directly, purely for speed reasons 2336 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as 2337 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation. 2338 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed. 2339 * this is ugly, and hopefully fully worth the extra speed.
2328safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2372safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2329{ 2373{
2330 if (coro->cctx) 2374 if (coro->cctx)
2331 croak ("coro inside C callback, unable to cancel at this time, caught"); 2375 croak ("coro inside C callback, unable to cancel at this time, caught");
2332 2376
2333 if (coro->flags & CF_NEW) 2377 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2334 { 2378 {
2335 coro_set_status (aTHX_ coro, arg, items); 2379 coro_set_status (aTHX_ coro, arg, items);
2336 coro_state_destroy (aTHX_ coro); 2380 coro_state_destroy (aTHX_ coro);
2337 } 2381 }
2338 else 2382 else
2405 else 2449 else
2406 { 2450 {
2407 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2409 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2410 coro->prio = 0; 2461 coro->prio = 0;
2411 2462
2412 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2413 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2414 2465
2415 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2416 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2417 } 2468 }
2637 2688
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void 2690static void
2640slf_destroy (pTHX_ struct coro *coro) 2691slf_destroy (pTHX_ struct coro *coro)
2641{ 2692{
2642 /* this callback is reserved for slf functions needing to do cleanup */ 2693 struct CoroSLF frame = coro->slf_frame;
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645 2694
2646 /* 2695 /*
2647 * The on_destroy above most likely is from an SLF call. 2696 * The on_destroy below most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy 2697 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise 2698 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions. 2699 * cleanup functions cannot call SLF functions.
2651 */ 2700 */
2652 coro->slf_frame.prepare = 0; 2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2653} 2706}
2654 2707
2655/* 2708/*
2656 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2657 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
2840static void 2893static void
2841coro_pop_on_leave (pTHX_ void *coro) 2894coro_pop_on_leave (pTHX_ void *coro)
2842{ 2895{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2844 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2898}
2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2845} 2990}
2846 2991
2847/*****************************************************************************/ 2992/*****************************************************************************/
2848/* PerlIO::cede */ 2993/* PerlIO::cede */
2849 2994
2979 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2980 PUTBACK; 3125 PUTBACK;
2981 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2982 } 3127 }
2983 3128
2984 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2985 } 3130 }
2986} 3131}
2987 3132
2988static void 3133static void
2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2997{ 3142{
2998 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2999 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current); 3145 SV *coro_hv = SvRV (coro_current);
3001 3146
3147 frame->destroy = 0;
3148
3002 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
3003 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
3004 return 0; 3155 return 0;
3156 }
3005 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
3006 { 3158 {
3007 frame->destroy = 0;
3008
3009 if (acquire) 3159 if (acquire)
3010 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
3011 else 3161 else
3012 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
3013 3163
3124 { 3274 {
3125 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
3126 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
3127 } 3277 }
3128 3278
3129 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
3130 3280
3131 --count; 3281 --count;
3132 } 3282 }
3133} 3283}
3134 3284
3219 } 3369 }
3220 3370
3221 av_push (state, data_sv); 3371 av_push (state, data_sv);
3222 3372
3223 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
3224 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
3225 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
3226} 3376}
3227 3377
3228static int 3378static int
3229slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3230{ 3380{
3235 /* it quickly returns */ 3385 /* it quickly returns */
3236 if (CORO_THROW) 3386 if (CORO_THROW)
3237 return 0; 3387 return 0;
3238 3388
3239 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
3240 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3241 return 1; 3391 return 1;
3242 3392
3243 /* restore status */ 3393 /* restore status */
3244 { 3394 {
3245 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
3248 errno = data->errorno; 3398 errno = data->errorno;
3249 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
3250 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
3251 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
3252 3402
3253 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
3254 } 3404 }
3255 3405
3256 /* push result values */ 3406 /* push result values */
3257 { 3407 {
3258 dSP; 3408 dSP;
3447 3597
3448 map_len = load_len + save_len + 16; 3598 map_len = load_len + save_len + 16;
3449 3599
3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3451 3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3453 3606
3454 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3455 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3456 3609
3473 3626
3474PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3475 3628
3476BOOT: 3629BOOT:
3477{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3478#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3479# if CORO_PTHREAD 3634# if CORO_PTHREAD
3480 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3481# endif 3636# endif
3482#endif 3637#endif
3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */ 3638 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */ 3639 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */ 3640 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */ 3641 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV; 3642 DEFSV;
3492 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3493 3646
3494 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3495 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3496 3649
3497 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3498 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3499 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3500 3674
3501 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3502 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3503 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3504 3677
3505 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3506 3679
3559void 3732void
3560transfer (...) 3733transfer (...)
3561 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3562 CODE: 3735 CODE:
3563 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3564
3565void
3566_exit (int code)
3567 PROTOTYPE: $
3568 CODE:
3569 _exit (code);
3570 3737
3571SV * 3738SV *
3572clone (Coro::State coro) 3739clone (Coro::State coro)
3573 CODE: 3740 CODE:
3574{ 3741{
3818 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3819 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3820} 3987}
3821 3988
3822void 3989void
3823swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3824 CODE: 3991 CODE:
3825{ 3992{
3826 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3827 3999
3828 if (current == coro) 4000 if (current == coro)
3829 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3830 4002
3831 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3832 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3833 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3834 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3835 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3836 4031
3837 if (current == coro) 4032 if (current == coro)
3838 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3839} 4034}
3840 4035
3841 4036
3842MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3843 4038
3844BOOT: 4039BOOT:
3845{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3848 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3849 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3876 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3877 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3878 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3879 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3880 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3881 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3882 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3883 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3884 } 4086 }
3885} 4087}
3886 4088
3887SV * 4089SV *
3950 4152
3951void 4153void
3952_set_current (SV *current) 4154_set_current (SV *current)
3953 PROTOTYPE: $ 4155 PROTOTYPE: $
3954 CODE: 4156 CODE:
3955 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3956 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3957 4159
3958void 4160void
3959_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3960 PROTOTYPE: $ 4162 PROTOTYPE: $
4044 4246
4045 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
4046 { 4248 {
4047 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4048 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4049 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
4050 } 4252 }
4051 4253
4052 { 4254 {
4053 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
4054 4256
4061 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
4062 4264
4063 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
4064 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4065 else 4267 else
4066 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
4067} 4269}
4068 4270
4069SV * 4271SV *
4070rouse_cb () 4272rouse_cb ()
4071 PROTOTYPE: 4273 PROTOTYPE:
4150 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4151 OUTPUT: 4353 OUTPUT:
4152 RETVAL 4354 RETVAL
4153 4355
4154void 4356void
4155up (SV *self, int adjust = 1) 4357up (SV *self)
4156 ALIAS:
4157 adjust = 1
4158 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4159 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4160 4365
4161void 4366void
4162down (...) 4367down (...)
4163 CODE: 4368 CODE:
4164 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4326 { 4531 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4532 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0; 4533 coro_old_pp_sselect = 0;
4329 } 4534 }
4330 4535
4536MODULE = Coro::State PACKAGE = Coro::Util
4537
4538void
4539_exit (int code)
4540 CODE:
4541 _exit (code);
4542
4543NV
4544time ()
4545 CODE:
4546 RETVAL = nvtime (aTHX);
4547 OUTPUT:
4548 RETVAL
4549
4550NV
4551gettimeofday ()
4552 PPCODE:
4553{
4554 UV tv [2];
4555 u2time (aTHX_ tv);
4556 EXTEND (SP, 2);
4557 PUSHs (sv_2mortal (newSVuv (tv [0])));
4558 PUSHs (sv_2mortal (newSVuv (tv [1])));
4559}
4560

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines