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.233 by root, Fri May 9 22:04:37 2008 UTC vs.
Revision 1.272 by root, Fri Nov 14 20:35:49 2008 UTC

4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
45# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
46#endif 47#endif
47 48
48#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
49# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
50# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
51#else
52# define REGISTER_STACK(cctx,start,end)
53#endif 51#endif
54 52
55/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
56#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
57 55
58#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
80# ifndef IS_PADCONST 78# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
82# endif 80# endif
83#endif 81#endif
84 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
85/* 5.8.8 */ 93/* 5.8.8 */
86#ifndef GV_NOTQUAL 94#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
88#endif 96#endif
89#ifndef newSV 97#ifndef newSV
90# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
91#endif 99#endif
92 100
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
98/* 5.8.7 */ 101/* 5.8.7 */
99#ifndef SvRV_set 102#ifndef SvRV_set
100# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
101#endif 104#endif
102 105
113# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
114#endif 117#endif
115 118
116/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
117 * portable way as possible. */ 120 * portable way as possible. */
118#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
119#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
120 126
121#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
122 128
123#if __GNUC__ >= 3 129#if __GNUC__ >= 3
124# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
125# define BARRIER __asm__ __volatile__ ("" : : : "memory")
126# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
127#else 133#else
128# define attribute(x) 134# define attribute(x)
129# define BARRIER
130# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
131#endif 137#endif
132 138
133#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
134#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
135 141
136#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
137 143
138#include "CoroAPI.h" 144#include "CoroAPI.h"
139 145
140#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
141static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
142# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
143# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
144#else 155#else
156
145# define LOCK (void)0 157# define LOCK (void)0
146# define UNLOCK (void)0 158# define UNLOCK (void)0
159
147#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
148 166
149/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
150struct io_state 168struct io_state
151{ 169{
170 AV *res;
152 int errorno; 171 int errorno;
153 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
154 int laststatval; 173 int laststatval;
155 Stat_t statcache; 174 Stat_t statcache;
156}; 175};
157 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
158static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 183static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
164 187
165static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 190static SV *rv_diehook;
168static SV *rv_warnhook; 191static SV *rv_warnhook;
187 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
188 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
189}; 212};
190 213
191/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
192typedef struct coro_cctx { 215typedef struct coro_cctx
216{
193 struct coro_cctx *next; 217 struct coro_cctx *next;
194 218
195 /* the stack */ 219 /* the stack */
196 void *sptr; 220 void *sptr;
197 size_t ssize; 221 size_t ssize;
200 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
201 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
202 JMPENV *top_env; 226 JMPENV *top_env;
203 coro_context cctx; 227 coro_context cctx;
204 228
229 U32 gen;
205#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
206 int valgrind_id; 231 int valgrind_id;
207#endif 232#endif
208 unsigned char flags; 233 unsigned char flags;
209} coro_cctx; 234} coro_cctx;
214 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
216}; 241};
217 242
218/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
219typedef struct { 244typedef struct
245{
220 SV *defsv; 246 SV *defsv;
221 AV *defav; 247 AV *defav;
222 SV *errsv; 248 SV *errsv;
223 SV *irsgv; 249 SV *irsgv;
224#define VAR(name,type) type name; 250#define VAR(name,type) type name;
226#undef VAR 252#undef VAR
227} perl_slots; 253} perl_slots;
228 254
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 256
257/* this is the per-perl-coro slf frame info */
258/* it is treated like other "global" interpreter data */
259/* and unfortunately is copied around, so kepe it small */
260struct slf_frame
261{
262 void (*prepare) (struct coro_transfer_args *ta); /* 0 means not yet initialised */
263 int (*check) (pTHX);
264};
265
231/* this is a structure representing a perl-level coroutine */ 266/* this is a structure representing a perl-level coroutine */
232struct coro { 267struct coro {
233 /* the c coroutine allocated to this perl coroutine, if any */ 268 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 269 coro_cctx *cctx;
235 270
236 /* process data */ 271 /* process data */
272 struct slf_frame slf_frame; /* saved slf frame */
273 void *slf_data;
237 AV *mainstack; 274 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
239 276
240 AV *args; /* data associated with this coroutine (initial args) */ 277 AV *args; /* data associated with this coroutine (initial args) */
241 int refcnt; /* coroutines are refcounted, yes */ 278 int refcnt; /* coroutines are refcounted, yes */
256 struct coro *next, *prev; 293 struct coro *next, *prev;
257}; 294};
258 295
259typedef struct coro *Coro__State; 296typedef struct coro *Coro__State;
260typedef struct coro *Coro__State_or_hashref; 297typedef struct coro *Coro__State_or_hashref;
298
299static struct slf_frame slf_frame; /* the current slf frame */
261 300
262/** Coro ********************************************************************/ 301/** Coro ********************************************************************/
263 302
264#define PRIO_MAX 3 303#define PRIO_MAX 3
265#define PRIO_HIGH 1 304#define PRIO_HIGH 1
269#define PRIO_MIN -4 308#define PRIO_MIN -4
270 309
271/* for Coro.pm */ 310/* for Coro.pm */
272static SV *coro_current; 311static SV *coro_current;
273static SV *coro_readyhook; 312static SV *coro_readyhook;
274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 313static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
275static int coro_nready;
276static struct coro *coro_first; 314static struct coro *coro_first;
315#define coro_nready coroapi.nready
277 316
278/** lowlevel stuff **********************************************************/ 317/** lowlevel stuff **********************************************************/
279 318
280static SV * 319static SV *
281coro_get_sv (pTHX_ const char *name, int create) 320coro_get_sv (pTHX_ const char *name, int create)
321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 360 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
322#endif 361#endif
323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 362 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
324 --AvFILLp (padlist); 363 --AvFILLp (padlist);
325 364
326 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 365 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
327 av_store (newpadlist, 1, (SV *)newpad); 366 av_store (newpadlist, 1, (SV *)newpad);
328 367
329 return newpadlist; 368 return newpadlist;
330} 369}
331 370
361 400
362 /* casting is fun. */ 401 /* casting is fun. */
363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 402 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
364 free_padlist (aTHX_ padlist); 403 free_padlist (aTHX_ padlist);
365 404
405 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
406
366 return 0; 407 return 0;
367} 408}
368 409
369#define CORO_MAGIC_type_cv PERL_MAGIC_ext 410#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext 411#define CORO_MAGIC_type_state PERL_MAGIC_ext
372static MGVTBL coro_cv_vtbl = { 413static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0, 414 0, 0, 0, 0,
374 coro_cv_free 415 coro_cv_free
375}; 416};
376 417
377#define CORO_MAGIC(sv,type) \ 418#define CORO_MAGIC(sv, type) \
378 SvMAGIC (sv) \ 419 SvMAGIC (sv) \
379 ? SvMAGIC (sv)->mg_type == type \ 420 ? SvMAGIC (sv)->mg_type == type \
380 ? SvMAGIC (sv) \ 421 ? SvMAGIC (sv) \
381 : mg_find (sv, type) \ 422 : mg_find (sv, type) \
382 : 0 423 : 0
383 424
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 425#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 426#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
386 427
387static struct coro * 428INLINE struct coro *
388SvSTATE_ (pTHX_ SV *coro) 429SvSTATE_ (pTHX_ SV *coro)
389{ 430{
390 HV *stash; 431 HV *stash;
391 MAGIC *mg; 432 MAGIC *mg;
392 433
420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 461 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 462 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
422 else 463 else
423 { 464 {
424#if CORO_PREFER_PERL_FUNCTIONS 465#if CORO_PREFER_PERL_FUNCTIONS
425 /* this is probably cleaner, but also slower? */ 466 /* this is probably cleaner? but also slower! */
467 /* in practise, it seems to be less stable */
426 CV *cp = Perl_cv_clone (cv); 468 CV *cp = Perl_cv_clone (cv);
427 CvPADLIST (cv) = CvPADLIST (cp); 469 CvPADLIST (cv) = CvPADLIST (cp);
428 CvPADLIST (cp) = 0; 470 CvPADLIST (cp) = 0;
429 SvREFCNT_dec (cp); 471 SvREFCNT_dec (cp);
430#else 472#else
482 CvPADLIST (cv) = (AV *)POPs; 524 CvPADLIST (cv) = (AV *)POPs;
483 } 525 }
484 526
485 PUTBACK; 527 PUTBACK;
486 } 528 }
529
530 slf_frame = c->slf_frame;
531 coroapi.slf_data = c->slf_data;
487} 532}
488 533
489static void 534static void
490save_perl (pTHX_ Coro__State c) 535save_perl (pTHX_ Coro__State c)
491{ 536{
537 c->slf_data = coroapi.slf_data;
538 c->slf_frame = slf_frame;
539
492 { 540 {
493 dSP; 541 dSP;
494 I32 cxix = cxstack_ix; 542 I32 cxix = cxstack_ix;
495 PERL_CONTEXT *ccstk = cxstack; 543 PERL_CONTEXT *ccstk = cxstack;
496 PERL_SI *top_si = PL_curstackinfo; 544 PERL_SI *top_si = PL_curstackinfo;
563 #undef VAR 611 #undef VAR
564 } 612 }
565} 613}
566 614
567/* 615/*
568 * allocate various perl stacks. This is an exact copy 616 * allocate various perl stacks. This is almost an exact copy
569 * of perl.c:init_stacks, except that it uses less memory 617 * of perl.c:init_stacks, except that it uses less memory
570 * on the (sometimes correct) assumption that coroutines do 618 * on the (sometimes correct) assumption that coroutines do
571 * not usually need a lot of stackspace. 619 * not usually need a lot of stackspace.
572 */ 620 */
573#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
616 664
617/* 665/*
618 * destroy the stacks, the callchain etc... 666 * destroy the stacks, the callchain etc...
619 */ 667 */
620static void 668static void
621coro_destroy_stacks (pTHX) 669coro_destruct_stacks (pTHX)
622{ 670{
623 while (PL_curstackinfo->si_next) 671 while (PL_curstackinfo->si_next)
624 PL_curstackinfo = PL_curstackinfo->si_next; 672 PL_curstackinfo = PL_curstackinfo->si_next;
625 673
626 while (PL_curstackinfo) 674 while (PL_curstackinfo)
663 #undef VAR 711 #undef VAR
664 } 712 }
665 else 713 else
666 slot = coro->slot; 714 slot = coro->slot;
667 715
716 if (slot)
717 {
668 rss += sizeof (slot->curstackinfo); 718 rss += sizeof (slot->curstackinfo);
669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 719 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 720 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
671 rss += slot->tmps_max * sizeof (SV *); 721 rss += slot->tmps_max * sizeof (SV *);
672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 722 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
673 rss += slot->scopestack_max * sizeof (I32); 723 rss += slot->scopestack_max * sizeof (I32);
674 rss += slot->savestack_max * sizeof (ANY); 724 rss += slot->savestack_max * sizeof (ANY);
675 725
676#if !PERL_VERSION_ATLEAST (5,10,0) 726#if !PERL_VERSION_ATLEAST (5,10,0)
677 rss += slot->retstack_max * sizeof (OP *); 727 rss += slot->retstack_max * sizeof (OP *);
678#endif 728#endif
729 }
679 } 730 }
680 731
681 return rss; 732 return rss;
682} 733}
683 734
684/** coroutine stack handling ************************************************/ 735/** coroutine stack handling ************************************************/
685 736
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 737static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 738static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
739static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
740
741/* apparently < 5.8.8 */
742#ifndef MgPV_nolen_const
743#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
744 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
745 (const char*)(mg)->mg_ptr)
746#endif
688 747
689/* 748/*
690 * This overrides the default magic get method of %SIG elements. 749 * This overrides the default magic get method of %SIG elements.
691 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 750 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
692 * and instead of tryign to save and restore the hash elements, we just provide 751 * and instead of tryign to save and restore the hash elements, we just provide
700{ 759{
701 const char *s = MgPV_nolen_const (mg); 760 const char *s = MgPV_nolen_const (mg);
702 761
703 if (*s == '_') 762 if (*s == '_')
704 { 763 {
705 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 764 SV **svp = 0;
706 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 765
766 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
767 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
768
769 if (svp)
770 {
771 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
772 return 0;
773 }
707 } 774 }
708 775
709 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 776 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
777}
778
779static int
780coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
781{
782 const char *s = MgPV_nolen_const (mg);
783
784 if (*s == '_')
785 {
786 SV **svp = 0;
787
788 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
789 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
790
791 if (svp)
792 {
793 SV *old = *svp;
794 *svp = 0;
795 SvREFCNT_dec (old);
796 return 0;
797 }
798 }
799
800 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
710} 801}
711 802
712static int 803static int
713coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 804coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
714{ 805{
729 return 0; 820 return 0;
730 } 821 }
731 } 822 }
732 823
733 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 824 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
825}
826
827static void
828prepare_nop (aTHX_ struct coro_transfer_args *ta)
829{
830 /* kind of mega-hacky, but works */
831 ta->next = ta->prev = (struct coro *)ta;
832}
833
834static int
835slf_check_nop (aTHX)
836{
837 return 0;
734} 838}
735 839
736static void 840static void
737coro_setup (pTHX_ struct coro *coro) 841coro_setup (pTHX_ struct coro *coro)
738{ 842{
761 GvSV (PL_defgv) = newSV (0); 865 GvSV (PL_defgv) = newSV (0);
762 GvAV (PL_defgv) = coro->args; coro->args = 0; 866 GvAV (PL_defgv) = coro->args; coro->args = 0;
763 GvSV (PL_errgv) = newSV (0); 867 GvSV (PL_errgv) = newSV (0);
764 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 868 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
765 PL_rs = newSVsv (GvSV (irsgv)); 869 PL_rs = newSVsv (GvSV (irsgv));
766 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 870 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
767 871
768 { 872 {
769 dSP; 873 dSP;
770 LOGOP myop; 874 UNOP myop;
771 875
772 Zero (&myop, 1, LOGOP); 876 Zero (&myop, 1, UNOP);
773 myop.op_next = Nullop; 877 myop.op_next = Nullop;
774 myop.op_flags = OPf_WANT_VOID; 878 myop.op_flags = OPf_WANT_VOID;
775 879
776 PUSHMARK (SP); 880 PUSHMARK (SP);
777 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 881 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
780 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 884 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
781 SPAGAIN; 885 SPAGAIN;
782 } 886 }
783 887
784 /* this newly created coroutine might be run on an existing cctx which most 888 /* this newly created coroutine might be run on an existing cctx which most
785 * likely was suspended in set_stacklevel, called from entersub. 889 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
786 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
787 * so we ENTER here for symmetry
788 */ 890 */
789 ENTER; 891 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
892 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
790} 893}
791 894
792static void 895static void
793coro_destroy (pTHX_ struct coro *coro) 896coro_destruct (pTHX_ struct coro *coro)
794{ 897{
795 if (!IN_DESTRUCT) 898 if (!IN_DESTRUCT)
796 { 899 {
797 /* restore all saved variables and stuff */ 900 /* restore all saved variables and stuff */
798 LEAVE_SCOPE (0); 901 LEAVE_SCOPE (0);
820 SvREFCNT_dec (PL_warnhook); 923 SvREFCNT_dec (PL_warnhook);
821 924
822 SvREFCNT_dec (coro->saved_deffh); 925 SvREFCNT_dec (coro->saved_deffh);
823 SvREFCNT_dec (coro->throw); 926 SvREFCNT_dec (coro->throw);
824 927
825 coro_destroy_stacks (aTHX); 928 coro_destruct_stacks (aTHX);
826} 929}
827 930
828static void 931INLINE void
829free_coro_mortal (pTHX) 932free_coro_mortal (pTHX)
830{ 933{
831 if (expect_true (coro_mortal)) 934 if (expect_true (coro_mortal))
832 { 935 {
833 SvREFCNT_dec (coro_mortal); 936 SvREFCNT_dec (coro_mortal);
867 : cx->blk_gimme == G_SCALAR ? bot + 1 970 : cx->blk_gimme == G_SCALAR ? bot + 1
868 : bot; 971 : bot;
869 972
870 av_extend (av, top - bot); 973 av_extend (av, top - bot);
871 while (bot < top) 974 while (bot < top)
872 av_push (av, SvREFCNT_inc (*bot++)); 975 av_push (av, SvREFCNT_inc_NN (*bot++));
873 976
874 PL_runops = RUNOPS_DEFAULT; 977 PL_runops = RUNOPS_DEFAULT;
875 ENTER; 978 ENTER;
876 SAVETMPS; 979 SAVETMPS;
877 EXTEND (SP, 3); 980 EXTEND (SP, 3);
957 1060
958 TAINT_NOT; 1061 TAINT_NOT;
959 return 0; 1062 return 0;
960} 1063}
961 1064
1065static void
1066prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1067{
1068 ta->prev = (struct coro *)cctx;
1069 ta->next = 0;
1070}
1071
962/* inject a fake call to Coro::State::_cctx_init into the execution */ 1072/* inject a fake call to Coro::State::_cctx_init into the execution */
963/* _cctx_init should be careful, as it could be called at almost any time */ 1073/* _cctx_init should be careful, as it could be called at almost any time */
964/* during execution of a perl program */ 1074/* during execution of a perl program */
1075/* also initialises PL_top_env */
965static void NOINLINE 1076static void NOINLINE
966cctx_prepare (pTHX_ coro_cctx *cctx) 1077cctx_prepare (pTHX_ coro_cctx *cctx)
967{ 1078{
968 dSP; 1079 dSP;
969 LOGOP myop; 1080 UNOP myop;
970 1081
971 PL_top_env = &PL_start_env; 1082 PL_top_env = &PL_start_env;
972 1083
973 if (cctx->flags & CC_TRACE) 1084 if (cctx->flags & CC_TRACE)
974 PL_runops = runops_trace; 1085 PL_runops = runops_trace;
975 1086
976 Zero (&myop, 1, LOGOP); 1087 Zero (&myop, 1, UNOP);
977 myop.op_next = PL_op; 1088 myop.op_next = PL_op;
978 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1089 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
979 1090
980 PUSHMARK (SP); 1091 PUSHMARK (SP);
981 EXTEND (SP, 2); 1092 EXTEND (SP, 2);
982 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1093 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
983 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1094 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
984 PUTBACK; 1095 PUTBACK;
985 PL_op = (OP *)&myop; 1096 PL_op = (OP *)&myop;
986 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1097 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
987 SPAGAIN; 1098 SPAGAIN;
988} 1099}
989 1100
1101/* the tail of transfer: execute stuff we can only do after a transfer */
1102INLINE void
1103transfer_tail (pTHX)
1104{
1105 struct coro *next = (struct coro *)transfer_next;
1106 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1107 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1108
1109 free_coro_mortal (aTHX);
1110 UNLOCK;
1111
1112 if (expect_false (next->throw))
1113 {
1114 SV *exception = sv_2mortal (next->throw);
1115
1116 next->throw = 0;
1117 sv_setsv (ERRSV, exception);
1118 croak (0);
1119 }
1120}
1121
990/* 1122/*
991 * this is a _very_ stripped down perl interpreter ;) 1123 * this is a _very_ stripped down perl interpreter ;)
992 */ 1124 */
993static void 1125static void
994cctx_run (void *arg) 1126cctx_run (void *arg)
995{ 1127{
1128#ifdef USE_ITHREADS
1129# if CORO_PTHREAD
1130 PERL_SET_CONTEXT (coro_thx);
1131# endif
1132#endif
1133 {
996 dTHX; 1134 dTHX;
997 1135
998 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1136 /* normally we would need to skip the entersub here */
999 UNLOCK; 1137 /* not doing so will re-execute it, which is exactly what we want */
1000
1001 /* we now skip the entersub that lead to transfer() */
1002 PL_op = PL_op->op_next; 1138 /* PL_nop = PL_nop->op_next */
1003 1139
1004 /* inject a fake subroutine call to cctx_init */ 1140 /* inject a fake subroutine call to cctx_init */
1005 cctx_prepare (aTHX_ (coro_cctx *)arg); 1141 cctx_prepare (aTHX_ (coro_cctx *)arg);
1006 1142
1143 /* cctx_run is the alternative tail of transfer() */
1144 /* TODO: throwing an exception here might be deadly, VERIFY */
1145 transfer_tail (aTHX);
1146
1007 /* somebody or something will hit me for both perl_run and PL_restartop */ 1147 /* somebody or something will hit me for both perl_run and PL_restartop */
1008 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1009 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1010 1150
1011 /* 1151 /*
1012 * If perl-run returns we assume exit() was being called or the coro 1152 * If perl-run returns we assume exit() was being called or the coro
1013 * fell off the end, which seems to be the only valid (non-bug) 1153 * fell off the end, which seems to be the only valid (non-bug)
1014 * reason for perl_run to return. We try to exit by jumping to the 1154 * reason for perl_run to return. We try to exit by jumping to the
1015 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1016 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1017 */ 1157 */
1018 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1019 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1159 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1160 }
1020} 1161}
1021 1162
1022static coro_cctx * 1163static coro_cctx *
1023cctx_new () 1164cctx_new ()
1024{ 1165{
1025 coro_cctx *cctx; 1166 coro_cctx *cctx;
1167
1168 ++cctx_count;
1169 New (0, cctx, 1, coro_cctx);
1170
1171 cctx->gen = cctx_gen;
1172 cctx->flags = 0;
1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx only suitable as source */
1179static coro_cctx *
1180cctx_new_empty ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1183
1184 cctx->sptr = 0;
1185 coro_create (&cctx->cctx, 0, 0, 0, 0);
1186
1187 return cctx;
1188}
1189
1190/* create a new cctx suitable as destination/running a perl interpreter */
1191static coro_cctx *
1192cctx_new_run ()
1193{
1194 coro_cctx *cctx = cctx_new ();
1026 void *stack_start; 1195 void *stack_start;
1027 size_t stack_size; 1196 size_t stack_size;
1028 1197
1029 ++cctx_count;
1030
1031 Newz (0, cctx, 1, coro_cctx);
1032
1033#if HAVE_MMAP 1198#if HAVE_MMAP
1034 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1199 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1035 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1036 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1037 1202
1038 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1039 { 1204 {
1040# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1041 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1042# endif 1207 #endif
1043 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1044 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1045 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1046 } 1211 }
1047 else 1212 else
1048#endif 1213#endif
1049 { 1214 {
1050 cctx->ssize = coro_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1051 New (0, cctx->sptr, coro_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1052 1217
1053 if (!cctx->sptr) 1218 if (!cctx->sptr)
1054 { 1219 {
1055 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1056 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1057 } 1222 }
1058 1223
1059 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1060 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1061 } 1226 }
1062 1227
1063 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1228 #if CORO_USE_VALGRIND
1229 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1230 #endif
1231
1064 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1232 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1065 1233
1066 return cctx; 1234 return cctx;
1067} 1235}
1068 1236
1071{ 1239{
1072 if (!cctx) 1240 if (!cctx)
1073 return; 1241 return;
1074 1242
1075 --cctx_count; 1243 --cctx_count;
1244 coro_destroy (&cctx->cctx);
1076 1245
1246 /* coro_transfer creates new, empty cctx's */
1247 if (cctx->sptr)
1248 {
1077#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1078 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1079#endif 1251 #endif
1080 1252
1081#if HAVE_MMAP 1253#if HAVE_MMAP
1082 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1083 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1084 else 1256 else
1085#endif 1257#endif
1086 Safefree (cctx->sptr); 1258 Safefree (cctx->sptr);
1259 }
1087 1260
1088 Safefree (cctx); 1261 Safefree (cctx);
1089} 1262}
1090 1263
1091/* wether this cctx should be destructed */ 1264/* wether this cctx should be destructed */
1092#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1265#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1093 1266
1094static coro_cctx * 1267static coro_cctx *
1095cctx_get (pTHX) 1268cctx_get (pTHX)
1096{ 1269{
1097 while (expect_true (cctx_first)) 1270 while (expect_true (cctx_first))
1104 return cctx; 1277 return cctx;
1105 1278
1106 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1107 } 1280 }
1108 1281
1109 return cctx_new (); 1282 return cctx_new_run ();
1110} 1283}
1111 1284
1112static void 1285static void
1113cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1114{ 1287{
1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1289
1115 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1116 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1117 { 1292 {
1118 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1119 cctx_first = first->next; 1294 cctx_first = first->next;
1120 --cctx_idle; 1295 --cctx_idle;
1121 1296
1153/* always use the TRANSFER macro */ 1328/* always use the TRANSFER macro */
1154static void NOINLINE 1329static void NOINLINE
1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1330transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1156{ 1331{
1157 dSTACKLEVEL; 1332 dSTACKLEVEL;
1158 static volatile int has_throw;
1159 1333
1160 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1161 if (expect_false (!next)) 1335 if (expect_false (!next))
1162 { 1336 {
1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1164 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1165 } 1339 }
1166 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1167 { 1341 {
1168 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1169 1343
1170 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1171 { 1345 {
1172 /* create a new empty context */ 1346 /* create a new empty/source context */
1173 Newz (0, prev->cctx, 1, coro_cctx); 1347 prev->cctx = cctx_new_empty ();
1174 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1175 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1176 } 1350 }
1177 1351
1178 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
1193 else 1367 else
1194 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1195 1369
1196 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1197 1371
1198 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1199 if (expect_true ( 1373 if (expect_true (
1200 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1201 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1202 && !force_cctx 1376 && !force_cctx
1203 )) 1377 ))
1204 { 1378 {
1205 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1379 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1206 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1380 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1207 1381
1208 prev->cctx = 0; 1382 prev->cctx = 0;
1209 1383
1210 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1384 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1211 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1385 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1219 ++next->usecount; 1393 ++next->usecount;
1220 1394
1221 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1222 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1223 1397
1224 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1225 1400
1226 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1227 { 1402 {
1228 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1229 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1230 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1231 } 1406 }
1232 1407
1233 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1234 UNLOCK;
1235
1236 if (expect_false (has_throw))
1237 {
1238 struct coro *coro = SvSTATE (coro_current);
1239
1240 if (coro->throw)
1241 {
1242 SV *exception = coro->throw;
1243 coro->throw = 0;
1244 sv_setsv (ERRSV, exception);
1245 croak (0);
1246 }
1247 }
1248 } 1409 }
1249} 1410}
1250
1251struct transfer_args
1252{
1253 struct coro *prev, *next;
1254};
1255 1411
1256#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1412#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1258 1414
1259/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
1285 croak ("FATAL: tried to destroy currently running coroutine"); 1441 croak ("FATAL: tried to destroy currently running coroutine");
1286 1442
1287 save_perl (aTHX_ &temp); 1443 save_perl (aTHX_ &temp);
1288 load_perl (aTHX_ coro); 1444 load_perl (aTHX_ coro);
1289 1445
1290 coro_destroy (aTHX_ coro); 1446 coro_destruct (aTHX_ coro);
1291 1447
1292 load_perl (aTHX_ &temp); 1448 load_perl (aTHX_ &temp);
1293 1449
1294 coro->slot = 0; 1450 coro->slot = 0;
1295 } 1451 }
1341# define MGf_DUP 0 1497# define MGf_DUP 0
1342#endif 1498#endif
1343}; 1499};
1344 1500
1345static void 1501static void
1346prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1502prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1347{ 1503{
1348 ta->prev = SvSTATE (prev_sv); 1504 ta->prev = SvSTATE (prev_sv);
1349 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1350 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1351} 1507}
1352 1508
1353static void 1509static void
1354api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1355{ 1511{
1356 dTHX;
1357 struct transfer_args ta; 1512 struct coro_transfer_args ta;
1358 1513
1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1360 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1361} 1516}
1362 1517
1379 1534
1380 return 0; 1535 return 0;
1381} 1536}
1382 1537
1383static int 1538static int
1384api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1385{ 1540{
1386 dTHX;
1387 struct coro *coro; 1541 struct coro *coro;
1388 SV *hook; 1542 SV *sv_hook;
1543 void (*xs_hook)(void);
1389 1544
1390 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
1391 coro_sv = SvRV (coro_sv); 1546 coro_sv = SvRV (coro_sv);
1392 1547
1393 coro = SvSTATE (coro_sv); 1548 coro = SvSTATE (coro_sv);
1397 1552
1398 coro->flags |= CF_READY; 1553 coro->flags |= CF_READY;
1399 1554
1400 LOCK; 1555 LOCK;
1401 1556
1402 hook = coro_nready ? 0 : coro_readyhook; 1557 sv_hook = coro_nready ? 0 : coro_readyhook;
1558 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1403 1559
1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1560 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1405 ++coro_nready; 1561 ++coro_nready;
1406 1562
1407 UNLOCK; 1563 UNLOCK;
1408 1564
1409 if (hook) 1565 if (sv_hook)
1410 { 1566 {
1411 dSP; 1567 dSP;
1412 1568
1413 ENTER; 1569 ENTER;
1414 SAVETMPS; 1570 SAVETMPS;
1415 1571
1416 PUSHMARK (SP); 1572 PUSHMARK (SP);
1417 PUTBACK; 1573 PUTBACK;
1418 call_sv (hook, G_DISCARD); 1574 call_sv (sv_hook, G_DISCARD);
1419 SPAGAIN; 1575 SPAGAIN;
1420 1576
1421 FREETMPS; 1577 FREETMPS;
1422 LEAVE; 1578 LEAVE;
1423 } 1579 }
1424 1580
1581 if (xs_hook)
1582 xs_hook ();
1583
1425 return 1; 1584 return 1;
1426} 1585}
1427 1586
1428static int 1587static int
1429api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1430{ 1589{
1431 dTHX;
1432 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1433} 1591}
1434 1592
1435static void 1593INLINE void
1436prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1437{ 1595{
1438 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1439 1597
1440 for (;;) 1598 for (;;)
1441 { 1599 {
1466 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1467 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1468 { 1626 {
1469 UNLOCK; 1627 UNLOCK;
1470 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1471 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1472 continue; 1630 continue;
1473 } 1631 }
1474 1632
1475 --coro_nready; 1633 --coro_nready;
1476 UNLOCK; 1634 UNLOCK;
1479 1637
1480 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1481 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1482 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1483 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1484 assert (ta->next->flags & CF_READY); 1642 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1485 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1486 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1487 1645
1488 LOCK; 1646 LOCK;
1489 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1490 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1491 UNLOCK; 1649 UNLOCK;
1492} 1650}
1493 1651
1652INLINE void
1653prepare_cede (pTHX_ struct coro_transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1659INLINE void
1660prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1661{
1662 SV *prev = SvRV (coro_current);
1663
1664 if (coro_nready)
1665 {
1666 prepare_schedule (aTHX_ ta);
1667 api_ready (aTHX_ prev);
1668 }
1669 else
1670 prepare_nop (aTHX_ ta);
1671}
1672
1494static void 1673static void
1495prepare_cede (pTHX_ struct transfer_args *ta) 1674api_schedule (pTHX)
1496{ 1675{
1497 api_ready (coro_current); 1676 struct coro_transfer_args ta;
1677
1498 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1499} 1680}
1500 1681
1501static int 1682static int
1502prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1503{ 1684{
1504 if (coro_nready) 1685 struct coro_transfer_args ta;
1505 { 1686
1506 SV *prev = SvRV (coro_current);
1507 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1508 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1509 return 1; 1692 return 1;
1510 } 1693 }
1511 else 1694 else
1512 return 0; 1695 return 0;
1513} 1696}
1514 1697
1515static void
1516api_schedule (void)
1517{
1518 dTHX;
1519 struct transfer_args ta;
1520
1521 prepare_schedule (aTHX_ &ta);
1522 TRANSFER (ta, 1);
1523}
1524
1525static int 1698static int
1526api_cede (void) 1699api_cede_notself (pTHX)
1527{ 1700{
1528 dTHX; 1701 if (coro_nready)
1702 {
1529 struct transfer_args ta; 1703 struct coro_transfer_args ta;
1530 1704
1531 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1532
1533 if (expect_true (ta.prev != ta.next))
1534 {
1535 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1536 return 1; 1707 return 1;
1537 } 1708 }
1538 else 1709 else
1539 return 0; 1710 return 0;
1540} 1711}
1541 1712
1542static int
1543api_cede_notself (void)
1544{
1545 dTHX;
1546 struct transfer_args ta;
1547
1548 if (prepare_cede_notself (aTHX_ &ta))
1549 {
1550 TRANSFER (ta, 1);
1551 return 1;
1552 }
1553 else
1554 return 0;
1555}
1556
1557static void 1713static void
1558api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1559{ 1715{
1560 dTHX;
1561 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1562 1717
1563 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1564 { 1719 {
1565 if (!coro->cctx) 1720 if (!coro->cctx)
1566 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1567 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1568 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1569 1724
1570 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1571 } 1726 }
1578 else 1733 else
1579 coro->slot->runops = RUNOPS_DEFAULT; 1734 coro->slot->runops = RUNOPS_DEFAULT;
1580 } 1735 }
1581} 1736}
1582 1737
1738#if 0
1739static int
1740coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1741{
1742 AV *padlist;
1743 AV *av = (AV *)mg->mg_obj;
1744
1745 abort ();
1746
1747 return 0;
1748}
1749
1750static MGVTBL coro_gensub_vtbl = {
1751 0, 0, 0, 0,
1752 coro_gensub_free
1753};
1754#endif
1755
1756/*****************************************************************************/
1757/* PerlIO::cede */
1758
1759typedef struct
1760{
1761 PerlIOBuf base;
1762 NV next, every;
1763} PerlIOCede;
1764
1765static IV
1766PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1767{
1768 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1769
1770 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1771 self->next = nvtime () + self->every;
1772
1773 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1774}
1775
1776static SV *
1777PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1778{
1779 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1780
1781 return newSVnv (self->every);
1782}
1783
1784static IV
1785PerlIOCede_flush (pTHX_ PerlIO *f)
1786{
1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1788 double now = nvtime ();
1789
1790 if (now >= self->next)
1791 {
1792 api_cede (aTHX);
1793 self->next = now + self->every;
1794 }
1795
1796 return PerlIOBuf_flush (aTHX_ f);
1797}
1798
1799static PerlIO_funcs PerlIO_cede =
1800{
1801 sizeof(PerlIO_funcs),
1802 "cede",
1803 sizeof(PerlIOCede),
1804 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1805 PerlIOCede_pushed,
1806 PerlIOBuf_popped,
1807 PerlIOBuf_open,
1808 PerlIOBase_binmode,
1809 PerlIOCede_getarg,
1810 PerlIOBase_fileno,
1811 PerlIOBuf_dup,
1812 PerlIOBuf_read,
1813 PerlIOBuf_unread,
1814 PerlIOBuf_write,
1815 PerlIOBuf_seek,
1816 PerlIOBuf_tell,
1817 PerlIOBuf_close,
1818 PerlIOCede_flush,
1819 PerlIOBuf_fill,
1820 PerlIOBase_eof,
1821 PerlIOBase_error,
1822 PerlIOBase_clearerr,
1823 PerlIOBase_setlinebuf,
1824 PerlIOBuf_get_base,
1825 PerlIOBuf_bufsiz,
1826 PerlIOBuf_get_ptr,
1827 PerlIOBuf_get_cnt,
1828 PerlIOBuf_set_ptrcnt,
1829};
1830
1831/*****************************************************************************/
1832
1833static const CV *slf_cv; /* for quick consistency check */
1834
1835static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1836static SV *slf_arg0;
1837static SV *slf_arg1;
1838
1839/* this restores the stack in the case we patched the entersub, to */
1840/* recreate the stack frame as perl will on following calls */
1841/* since entersub cleared the stack */
1842static OP *
1843pp_restore (pTHX)
1844{
1845 dSP;
1846
1847 PUSHMARK (SP);
1848
1849 EXTEND (SP, 3);
1850 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1851 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1852 PUSHs ((SV *)CvGV (slf_cv));
1853
1854 RETURNOP (slf_restore.op_first);
1855}
1856
1857static void
1858slf_init_set_stacklevel (pTHX_ SV **arg, int items)
1859{
1860 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1861 CORO_SLF_DATA = (void *)SvIV (arg [0]);
1862}
1863
1864static void
1865slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1866{
1867 prepare_set_stacklevel (ta, (struct coro_cctx *)CORO_SLF_DATA);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1875
1876 CORO_SLF_DATA = (void *)arg; /* let's hope it will stay valid */
1877}
1878
1879static void
1880slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1881{
1882 SV **arg = (SV **)CORO_SLF_DATA;
1883
1884 prepare_transfer (ta, arg [0], arg [1]);
1885}
1886
1887static void
1888slf_init_nop (pTHX_ SV **arg, int items)
1889{
1890}
1891
1892/* slf_prepare_schedule == prepare_schedule */
1893/* slf_prepare_cede == prepare_cede */
1894/* slf_prepare_notself == prepare_notself */
1895
1896/* we hijack an hopefully unused CV flag for our purposes */
1897#define CVf_SLF 0x4000
1898
1899/*
1900 * these not obviously related functions are all rolled into one
1901 * function to increase chances that they all will call transfer with the same
1902 * stack offset
1903 * SLF stands for "schedule-like-function".
1904 */
1905static OP *
1906pp_slf (pTHX)
1907{
1908 I32 checkmark; /* mark SP to see how many elements check has pushed */
1909
1910 if (expect_true (!slf_frame.prepare))
1911 {
1912 /* first iteration */
1913 dSP;
1914 SV **arg = PL_stack_base + TOPMARK + 1;
1915 int items = SP - arg; /* args without function object */
1916 SV *gv = *sp;
1917 struct CoroSLF *slf;
1918
1919 /* do a quick consistency check on the "function" object, and if it isn't */
1920 /* for us, divert to the real entersub */
1921 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1922 return PL_ppaddr[OP_ENTERSUB](aTHX);
1923
1924 /* pop args */
1925 SP = PL_stack_base + POPMARK;
1926
1927 if (!(PL_op->op_flags & OPf_STACKED))
1928 {
1929 /* ampersand-form of call, use @_ instead of stack */
1930 AV *av = GvAV (PL_defgv);
1931 arg = AvARRAY (av);
1932 items = AvFILLp (av) + 1;
1933 }
1934
1935 PUTBACK;
1936
1937 slf = (struct CoroSLF *)CvXSUBANY (GvCV (gv)).any_ptr;
1938 slf_frame.prepare = slf->prepare;
1939 slf_frame.check = slf->check;
1940 slf->init (aTHX_ arg, items);
1941 }
1942
1943 /* now interpret the slf_frame */
1944 /* we use a callback system not to make the code needlessly */
1945 /* complicated, but so we can run multiple perl coros from one cctx */
1946
1947 do
1948 {
1949 struct coro_transfer_args ta;
1950
1951 slf_frame.prepare (aTHX_ &ta);
1952 TRANSFER (ta, 0);
1953
1954 checkmark = PL_stack_sp - PL_stack_base;
1955 }
1956 while (slf_frame.check (aTHX));
1957
1958 {
1959 dSP;
1960 SV **bot = PL_stack_base + checkmark;
1961 int gimme = GIMME_V;
1962
1963 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1964
1965 /* make sure we put something on the stack in scalar context */
1966 if (gimme == G_SCALAR)
1967 {
1968 if (sp == bot)
1969 XPUSHs (&PL_sv_undef);
1970
1971 SP = bot + 1;
1972 }
1973
1974 PUTBACK;
1975 }
1976
1977 return NORMAL;
1978}
1979
1980static void
1981api_execute_slf (pTHX_ CV *cv, const struct CoroSLF *slf, SV **arg, int items)
1982{
1983 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1984 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1985
1986 if (items > 2)
1987 croak ("Coro only supports a max of two arguments to SLF functions.");
1988
1989 CvFLAGS (cv) |= CVf_SLF;
1990 CvXSUBANY (cv).any_ptr = (void *)slf;
1991 slf_cv = cv;
1992
1993 /* we patch the op, and then re-run the whole call */
1994 /* we have to put the same argument on the stack for this to work */
1995 /* and this will be done by pp_restore */
1996 slf_restore.op_next = (OP *)&slf_restore;
1997 slf_restore.op_type = OP_NULL;
1998 slf_restore.op_ppaddr = pp_restore;
1999 slf_restore.op_first = PL_op;
2000
2001 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2002 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2003
2004 PL_op->op_ppaddr = pp_slf;
2005
2006 PL_op = (OP *)&slf_restore;
2007}
2008
1583MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2009MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1584 2010
1585PROTOTYPES: DISABLE 2011PROTOTYPES: DISABLE
1586 2012
1587BOOT: 2013BOOT:
1588{ 2014{
1589#ifdef USE_ITHREADS 2015#ifdef USE_ITHREADS
1590 MUTEX_INIT (&coro_mutex); 2016 MUTEX_INIT (&coro_lock);
2017# if CORO_PTHREAD
2018 coro_thx = PERL_GET_CONTEXT;
2019# endif
1591#endif 2020#endif
1592 BOOT_PAGESIZE; 2021 BOOT_PAGESIZE;
1593 2022
1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2023 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1595 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2024 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1596 2025
1597 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 2026 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1598 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2027 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1599 orig_sigelem_set = PL_vtbl_sigelem.svt_set; 2028 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1600 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1601 2029
1602 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 2030 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1603 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 2031 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1604 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 2032 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1605 2033
1614 main_top_env = PL_top_env; 2042 main_top_env = PL_top_env;
1615 2043
1616 while (main_top_env->je_prev) 2044 while (main_top_env->je_prev)
1617 main_top_env = main_top_env->je_prev; 2045 main_top_env = main_top_env->je_prev;
1618 2046
1619 coroapi.ver = CORO_API_VERSION; 2047 coroapi.ver = CORO_API_VERSION;
1620 coroapi.rev = CORO_API_REVISION; 2048 coroapi.rev = CORO_API_REVISION;
1621 coroapi.transfer = api_transfer; 2049 coroapi.transfer = api_transfer;
2050 coroapi.execute_slf = api_execute_slf;
2051 coroapi.sv_state = SvSTATE_;
2052
2053 {
2054 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2055
2056 if (!svp) croak ("Time::HiRes is required");
2057 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2058
2059 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2060 }
1622 2061
1623 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2062 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1624} 2063}
1625 2064
1626SV * 2065SV *
1650 av_push (coro->args, newSVsv (ST (i))); 2089 av_push (coro->args, newSVsv (ST (i)));
1651} 2090}
1652 OUTPUT: 2091 OUTPUT:
1653 RETVAL 2092 RETVAL
1654 2093
1655# these not obviously related functions are all rolled into the same xs
1656# function to increase chances that they all will call transfer with the same
1657# stack offset
1658void 2094void
1659_set_stacklevel (...) 2095_set_stacklevel (...)
1660 ALIAS: 2096 CODE:
1661 Coro::State::transfer = 1
1662 Coro::schedule = 2
1663 Coro::cede = 3
1664 Coro::cede_notself = 4
1665 CODE:
1666{ 2097{
1667 struct transfer_args ta; 2098 static struct CoroSLF slf = { slf_init_set_stacklevel, slf_prepare_set_stacklevel, slf_check_nop };
2099 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2100}
1668 2101
1669 PUTBACK; 2102void
1670 switch (ix) 2103transfer (...)
1671 { 2104 CODE:
1672 case 0: 2105{
1673 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2106 static struct CoroSLF slf = { slf_init_transfer, slf_prepare_transfer, slf_check_nop };
1674 ta.next = 0; 2107 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
1675 break;
1676
1677 case 1:
1678 if (items != 2)
1679 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1680
1681 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1682 break;
1683
1684 case 2:
1685 prepare_schedule (aTHX_ &ta);
1686 break;
1687
1688 case 3:
1689 prepare_cede (aTHX_ &ta);
1690 break;
1691
1692 case 4:
1693 if (!prepare_cede_notself (aTHX_ &ta))
1694 XSRETURN_EMPTY;
1695
1696 break;
1697 }
1698 SPAGAIN;
1699
1700 BARRIER;
1701 PUTBACK;
1702 TRANSFER (ta, 0);
1703 SPAGAIN; /* might be the sp of a different coroutine now */
1704 /* be extra careful not to ever do anything after TRANSFER */
1705} 2108}
1706 2109
1707bool 2110bool
1708_destroy (SV *coro_sv) 2111_destroy (SV *coro_sv)
1709 CODE: 2112 CODE:
1718 _exit (code); 2121 _exit (code);
1719 2122
1720int 2123int
1721cctx_stacksize (int new_stacksize = 0) 2124cctx_stacksize (int new_stacksize = 0)
1722 CODE: 2125 CODE:
1723 RETVAL = coro_stacksize; 2126 RETVAL = cctx_stacksize;
1724 if (new_stacksize) 2127 if (new_stacksize)
2128 {
1725 coro_stacksize = new_stacksize; 2129 cctx_stacksize = new_stacksize;
2130 ++cctx_gen;
2131 }
2132 OUTPUT:
2133 RETVAL
2134
2135int
2136cctx_max_idle (int max_idle = 0)
2137 CODE:
2138 RETVAL = cctx_max_idle;
2139 if (max_idle > 1)
2140 cctx_max_idle = max_idle;
1726 OUTPUT: 2141 OUTPUT:
1727 RETVAL 2142 RETVAL
1728 2143
1729int 2144int
1730cctx_count () 2145cctx_count ()
1754call (Coro::State coro, SV *coderef) 2169call (Coro::State coro, SV *coderef)
1755 ALIAS: 2170 ALIAS:
1756 eval = 1 2171 eval = 1
1757 CODE: 2172 CODE:
1758{ 2173{
1759 if (coro->mainstack) 2174 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1760 { 2175 {
1761 struct coro temp; 2176 struct coro temp;
1762 2177
1763 if (!(coro->flags & CF_RUNNING)) 2178 if (!(coro->flags & CF_RUNNING))
1764 { 2179 {
1808 RETVAL = boolSV (coro->flags & ix); 2223 RETVAL = boolSV (coro->flags & ix);
1809 OUTPUT: 2224 OUTPUT:
1810 RETVAL 2225 RETVAL
1811 2226
1812void 2227void
2228throw (Coro::State self, SV *throw = &PL_sv_undef)
2229 PROTOTYPE: $;$
2230 CODE:
2231 SvREFCNT_dec (self->throw);
2232 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2233
2234void
1813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2235api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2236 C_ARGS: aTHX_ coro, flags
1814 2237
1815SV * 2238SV *
1816has_stack (Coro::State coro) 2239has_cctx (Coro::State coro)
1817 PROTOTYPE: $ 2240 PROTOTYPE: $
1818 CODE: 2241 CODE:
1819 RETVAL = boolSV (!!coro->cctx); 2242 RETVAL = boolSV (!!coro->cctx);
1820 OUTPUT: 2243 OUTPUT:
1821 RETVAL 2244 RETVAL
1826 CODE: 2249 CODE:
1827 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2250 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1828 OUTPUT: 2251 OUTPUT:
1829 RETVAL 2252 RETVAL
1830 2253
1831IV 2254UV
1832rss (Coro::State coro) 2255rss (Coro::State coro)
1833 PROTOTYPE: $ 2256 PROTOTYPE: $
1834 ALIAS: 2257 ALIAS:
1835 usecount = 1 2258 usecount = 1
1836 CODE: 2259 CODE:
1846force_cctx () 2269force_cctx ()
1847 CODE: 2270 CODE:
1848 struct coro *coro = SvSTATE (coro_current); 2271 struct coro *coro = SvSTATE (coro_current);
1849 coro->cctx->idle_sp = 0; 2272 coro->cctx->idle_sp = 0;
1850 2273
1851MODULE = Coro::State PACKAGE = Coro
1852
1853BOOT:
1854{
1855 int i;
1856
1857 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1858 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1859 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1860
1861 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1862 SvREADONLY_on (coro_current);
1863
1864 coro_stash = gv_stashpv ("Coro", TRUE);
1865
1866 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1867 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1868 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1869 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1870 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1871 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1872
1873 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1874 coro_ready[i] = newAV ();
1875
1876 {
1877 SV *sv = perl_get_sv ("Coro::API", TRUE);
1878 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1879
1880 coroapi.schedule = api_schedule;
1881 coroapi.cede = api_cede;
1882 coroapi.cede_notself = api_cede_notself;
1883 coroapi.ready = api_ready;
1884 coroapi.is_ready = api_is_ready;
1885 coroapi.nready = &coro_nready;
1886 coroapi.current = coro_current;
1887
1888 GCoroAPI = &coroapi;
1889 sv_setiv (sv, (IV)&coroapi);
1890 SvREADONLY_on (sv);
1891 }
1892}
1893
1894void
1895_set_current (SV *current)
1896 PROTOTYPE: $
1897 CODE:
1898 SvREFCNT_dec (SvRV (coro_current));
1899 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1900
1901void
1902_set_readyhook (SV *hook)
1903 PROTOTYPE: $
1904 CODE:
1905 LOCK;
1906 if (coro_readyhook)
1907 SvREFCNT_dec (coro_readyhook);
1908 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1909 UNLOCK;
1910
1911int
1912prio (Coro::State coro, int newprio = 0)
1913 ALIAS:
1914 nice = 1
1915 CODE:
1916{
1917 RETVAL = coro->prio;
1918
1919 if (items > 1)
1920 {
1921 if (ix)
1922 newprio = coro->prio - newprio;
1923
1924 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1925 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1926
1927 coro->prio = newprio;
1928 }
1929}
1930 OUTPUT:
1931 RETVAL
1932
1933SV *
1934ready (SV *self)
1935 PROTOTYPE: $
1936 CODE:
1937 RETVAL = boolSV (api_ready (self));
1938 OUTPUT:
1939 RETVAL
1940
1941int
1942nready (...)
1943 PROTOTYPE:
1944 CODE:
1945 RETVAL = coro_nready;
1946 OUTPUT:
1947 RETVAL
1948
1949void
1950throw (Coro::State self, SV *throw = &PL_sv_undef)
1951 PROTOTYPE: $;$
1952 CODE:
1953 SvREFCNT_dec (self->throw);
1954 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1955
1956void 2274void
1957swap_defsv (Coro::State self) 2275swap_defsv (Coro::State self)
1958 PROTOTYPE: $ 2276 PROTOTYPE: $
1959 ALIAS: 2277 ALIAS:
1960 swap_defav = 1 2278 swap_defav = 1
1967 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2285 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1968 2286
1969 SV *tmp = *src; *src = *dst; *dst = tmp; 2287 SV *tmp = *src; *src = *dst; *dst = tmp;
1970 } 2288 }
1971 2289
2290MODULE = Coro::State PACKAGE = Coro
2291
2292BOOT:
2293{
2294 int i;
2295
2296 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2297 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2298 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2299
2300 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
2301 SvREADONLY_on (coro_current);
2302
2303 coro_stash = gv_stashpv ("Coro", TRUE);
2304
2305 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2306 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2307 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2308 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2309 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2310 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2311
2312 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2313 coro_ready[i] = newAV ();
2314
2315 {
2316 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2317
2318 coroapi.schedule = api_schedule;
2319 coroapi.cede = api_cede;
2320 coroapi.cede_notself = api_cede_notself;
2321 coroapi.ready = api_ready;
2322 coroapi.is_ready = api_is_ready;
2323 coroapi.nready = coro_nready;
2324 coroapi.current = coro_current;
2325
2326 GCoroAPI = &coroapi;
2327 sv_setiv (sv, (IV)&coroapi);
2328 SvREADONLY_on (sv);
2329 }
2330}
2331
2332void
2333schedule (...)
2334 CODE:
2335{
2336 static struct CoroSLF slf = { slf_init_nop, prepare_schedule, slf_check_nop };
2337 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2338}
2339
2340void
2341cede (...)
2342 CODE:
2343{
2344 static struct CoroSLF slf = { slf_init_nop, prepare_cede, slf_check_nop };
2345 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2346}
2347
2348void
2349cede_notself (...)
2350 CODE:
2351{
2352 static struct CoroSLF slf = { slf_init_nop, prepare_cede_notself, slf_check_nop };
2353 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2354}
2355
2356void
2357_set_current (SV *current)
2358 PROTOTYPE: $
2359 CODE:
2360 SvREFCNT_dec (SvRV (coro_current));
2361 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2362
2363void
2364_set_readyhook (SV *hook)
2365 PROTOTYPE: $
2366 CODE:
2367 LOCK;
2368 SvREFCNT_dec (coro_readyhook);
2369 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2370 UNLOCK;
2371
2372int
2373prio (Coro::State coro, int newprio = 0)
2374 ALIAS:
2375 nice = 1
2376 CODE:
2377{
2378 RETVAL = coro->prio;
2379
2380 if (items > 1)
2381 {
2382 if (ix)
2383 newprio = coro->prio - newprio;
2384
2385 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
2386 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
2387
2388 coro->prio = newprio;
2389 }
2390}
2391 OUTPUT:
2392 RETVAL
2393
2394SV *
2395ready (SV *self)
2396 PROTOTYPE: $
2397 CODE:
2398 RETVAL = boolSV (api_ready (aTHX_ self));
2399 OUTPUT:
2400 RETVAL
2401
2402int
2403nready (...)
2404 PROTOTYPE:
2405 CODE:
2406 RETVAL = coro_nready;
2407 OUTPUT:
2408 RETVAL
2409
1972# for async_pool speedup 2410# for async_pool speedup
1973void 2411void
1974_pool_1 (SV *cb) 2412_pool_1 (SV *cb)
1975 CODE: 2413 CODE:
1976{ 2414{
1981 AV *invoke_av; 2419 AV *invoke_av;
1982 int i, len; 2420 int i, len;
1983 2421
1984 if (!invoke) 2422 if (!invoke)
1985 { 2423 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2424 SV *old = PL_diehook;
2425 PL_diehook = 0;
2426 SvREFCNT_dec (old);
1987 croak ("\3async_pool terminate\2\n"); 2427 croak ("\3async_pool terminate\2\n");
1988 } 2428 }
1989 2429
1990 SvREFCNT_dec (coro->saved_deffh); 2430 SvREFCNT_dec (coro->saved_deffh);
1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2431 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1992 2432
1993 hv_store (hv, "desc", sizeof ("desc") - 1, 2433 hv_store (hv, "desc", sizeof ("desc") - 1,
1994 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2434 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1995 2435
1996 invoke_av = (AV *)SvRV (invoke); 2436 invoke_av = (AV *)SvRV (invoke);
2000 2440
2001 if (len > 0) 2441 if (len > 0)
2002 { 2442 {
2003 av_fill (defav, len - 1); 2443 av_fill (defav, len - 1);
2004 for (i = 0; i < len; ++i) 2444 for (i = 0; i < len; ++i)
2005 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2445 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2006 } 2446 }
2007 2447
2008 SvREFCNT_dec (invoke); 2448 SvREFCNT_dec (invoke);
2009} 2449}
2010 2450
2017 sv_setsv (cb, &PL_sv_undef); 2457 sv_setsv (cb, &PL_sv_undef);
2018 2458
2019 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2020 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
2021 2461
2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2023 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2024 { 2464 {
2025 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2465 SV *old = PL_diehook;
2466 PL_diehook = 0;
2467 SvREFCNT_dec (old);
2026 croak ("\3async_pool terminate\2\n"); 2468 croak ("\3async_pool terminate\2\n");
2027 } 2469 }
2028 2470
2029 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2472 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
2031 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2032 2474
2033 coro->prio = 0; 2475 coro->prio = 0;
2034 2476
2035 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2036 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2037 2479
2038 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2039} 2481}
2040 2482
2483#if 0
2484
2485void
2486_generator_call (...)
2487 PROTOTYPE: @
2488 PPCODE:
2489 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2490 xxxx
2491 abort ();
2492
2493SV *
2494gensub (SV *sub, ...)
2495 PROTOTYPE: &;@
2496 CODE:
2497{
2498 struct coro *coro;
2499 MAGIC *mg;
2500 CV *xcv;
2501 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2502 int i;
2503
2504 CvGV (ncv) = CvGV (cv);
2505 CvFILE (ncv) = CvFILE (cv);
2506
2507 Newz (0, coro, 1, struct coro);
2508 coro->args = newAV ();
2509 coro->flags = CF_NEW;
2510
2511 av_extend (coro->args, items - 1);
2512 for (i = 1; i < items; i++)
2513 av_push (coro->args, newSVsv (ST (i)));
2514
2515 CvISXSUB_on (ncv);
2516 CvXSUBANY (ncv).any_ptr = (void *)coro;
2517
2518 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2519
2520 CvXSUB (ncv) = CvXSUB (xcv);
2521 CvANON_on (ncv);
2522
2523 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2524 RETVAL = newRV_noinc ((SV *)ncv);
2525}
2526 OUTPUT:
2527 RETVAL
2528
2529#endif
2530
2041 2531
2042MODULE = Coro::State PACKAGE = Coro::AIO 2532MODULE = Coro::State PACKAGE = Coro::AIO
2043 2533
2044SV * 2534void
2045_get_state () 2535_get_state (SV *self)
2046 CODE: 2536 PPCODE:
2047{ 2537{
2048 struct io_state *data; 2538 AV *defav = GvAV (PL_defgv);
2049 2539 AV *av = newAV ();
2540 int i;
2050 RETVAL = newSV (sizeof (struct io_state)); 2541 SV *data_sv = newSV (sizeof (struct io_state));
2051 data = (struct io_state *)SvPVX (RETVAL); 2542 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2052 SvCUR_set (RETVAL, sizeof (struct io_state)); 2543 SvCUR_set (data_sv, sizeof (struct io_state));
2053 SvPOK_only (RETVAL); 2544 SvPOK_only (data_sv);
2054 2545
2055 data->errorno = errno; 2546 data->errorno = errno;
2056 data->laststype = PL_laststype; 2547 data->laststype = PL_laststype;
2057 data->laststatval = PL_laststatval; 2548 data->laststatval = PL_laststatval;
2058 data->statcache = PL_statcache; 2549 data->statcache = PL_statcache;
2550
2551 av_extend (av, AvFILLp (defav) + 1 + 1);
2552
2553 for (i = 0; i <= AvFILLp (defav); ++i)
2554 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2555
2556 av_push (av, data_sv);
2557
2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2559
2560 api_ready (aTHX_ self);
2059} 2561}
2060 OUTPUT:
2061 RETVAL
2062 2562
2063void 2563void
2064_set_state (char *data_) 2564_set_state (SV *state)
2065 PROTOTYPE: $ 2565 PROTOTYPE: $
2066 CODE: 2566 PPCODE:
2067{ 2567{
2068 struct io_state *data = (void *)data_; 2568 AV *av = (AV *)SvRV (state);
2569 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2570 int i;
2069 2571
2070 errno = data->errorno; 2572 errno = data->errorno;
2071 PL_laststype = data->laststype; 2573 PL_laststype = data->laststype;
2072 PL_laststatval = data->laststatval; 2574 PL_laststatval = data->laststatval;
2073 PL_statcache = data->statcache; 2575 PL_statcache = data->statcache;
2576
2577 EXTEND (SP, AvFILLp (av));
2578 for (i = 0; i < AvFILLp (av); ++i)
2579 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2074} 2580}
2075 2581
2076 2582
2077MODULE = Coro::State PACKAGE = Coro::AnyEvent 2583MODULE = Coro::State PACKAGE = Coro::AnyEvent
2078 2584
2079BOOT: 2585BOOT:
2080 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE); 2586 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2081 2587
2082SV * 2588SV *
2083_schedule () 2589_schedule (...)
2084 PROTOTYPE: @ 2590 PROTOTYPE: @
2085 CODE: 2591 CODE:
2086{ 2592{
2087 static int incede; 2593 static int incede;
2088 fprintf (stderr, "_schedule\n");//D
2089 2594
2090 api_cede_notself (); 2595 api_cede_notself (aTHX);
2091 2596
2092 ++incede; 2597 ++incede;
2093 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2094 ; 2599 ;
2095 2600
2096 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2097 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2098 { 2603 {
2099 PUSHMARK (SP); 2604 PUSHMARK (SP);
2100 PUTBACK; 2605 PUTBACK;
2101 fprintf (stderr, "call act %d >= %d\n", coro_nready, incede);//D
2102 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 2606 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2103 SPAGAIN; 2607 SPAGAIN;
2104 } 2608 }
2105 2609
2106 --incede; 2610 --incede;
2107} 2611}
2108 2612
2613
2614MODULE = Coro::State PACKAGE = PerlIO::cede
2615
2616BOOT:
2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines