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.227 by root, Sat Apr 5 22:29:54 2008 UTC vs.
Revision 1.271 by root, Fri Nov 14 07:35:32 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>
14#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
15#include <inttypes.h> /* portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif
16 25
17#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
18# include <unistd.h> 27# include <unistd.h>
19# include <sys/mman.h> 28# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
37# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
38#endif 47#endif
39 48
40#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif 51#endif
46 52
47/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
49 55
50#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
72# ifndef IS_PADCONST 78# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
74# endif 80# endif
75#endif 81#endif
76 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
77/* 5.8.8 */ 93/* 5.8.8 */
78#ifndef GV_NOTQUAL 94#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
80#endif 96#endif
81#ifndef newSV 97#ifndef newSV
82# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
83#endif 99#endif
84 100
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.8.7 */ 101/* 5.8.7 */
91#ifndef SvRV_set 102#ifndef SvRV_set
92# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
93#endif 104#endif
94 105
… …
105# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
106#endif 117#endif
107 118
108/* 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
109 * portable way as possible. */ 120 * portable way as possible. */
110#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
111#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
112 126
113#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
114 128
115#if __GNUC__ >= 3 129#if __GNUC__ >= 3
116# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
117# define BARRIER __asm__ __volatile__ ("" : : : "memory")
118# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
119#else 133#else
120# define attribute(x) 134# define attribute(x)
121# define BARRIER
122# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
123#endif 137#endif
124 138
125#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
126#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
127 141
128#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
129 143
130#include "CoroAPI.h" 144#include "CoroAPI.h"
131 145
132#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
133static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
134# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
135# 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
136#else 155#else
156
137# define LOCK (void)0 157# define LOCK (void)0
138# define UNLOCK (void)0 158# define UNLOCK (void)0
159
139#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
140 166
141/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
142struct io_state 168struct io_state
143{ 169{
170 AV *res;
144 int errorno; 171 int errorno;
145 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
146 int laststatval; 173 int laststatval;
147 Stat_t statcache; 174 Stat_t statcache;
148}; 175};
149 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
150static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
151static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
152static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
153static JMPENV *main_top_env; 183static JMPENV *main_top_env;
154static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
155static 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;
187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
156 192
157static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
158static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook; 195static SV *rv_diehook;
160static SV *rv_warnhook; 196static SV *rv_warnhook;
… …
162 198
163/* async_pool helper stuff */ 199/* async_pool helper stuff */
164static SV *sv_pool_rss; 200static SV *sv_pool_rss;
165static SV *sv_pool_size; 201static SV *sv_pool_size;
166static AV *av_async_pool; 202static AV *av_async_pool;
203
204/* Coro::AnyEvent */
205static SV *sv_activity;
167 206
168static struct coro_cctx *cctx_first; 207static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 208static int cctx_count, cctx_idle;
170 209
171enum { 210enum {
… …
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 228 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 229 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
191 JMPENV *top_env; 230 JMPENV *top_env;
192 coro_context cctx; 231 coro_context cctx;
193 232
233 U32 gen;
194#if CORO_USE_VALGRIND 234#if CORO_USE_VALGRIND
195 int valgrind_id; 235 int valgrind_id;
196#endif 236#endif
197 unsigned char flags; 237 unsigned char flags;
198} coro_cctx; 238} coro_cctx;
… …
257#define PRIO_IDLE -3 297#define PRIO_IDLE -3
258#define PRIO_MIN -4 298#define PRIO_MIN -4
259 299
260/* for Coro.pm */ 300/* for Coro.pm */
261static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
262static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
263static int coro_nready;
264static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
265 306
266/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
267 308
268static SV * 309static SV *
269coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
270{ 311{
271#if PERL_VERSION_ATLEAST (5,9,0) 312#if PERL_VERSION_ATLEAST (5,10,0)
272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
273 get_sv (name, create); 314 get_sv (name, create);
274#endif 315#endif
275 return get_sv (name, create); 316 return get_sv (name, create);
276} 317}
277 318
278static AV * 319static AV *
279coro_get_av (pTHX_ const char *name, int create) 320coro_get_av (pTHX_ const char *name, int create)
280{ 321{
281#if PERL_VERSION_ATLEAST (5,9,0) 322#if PERL_VERSION_ATLEAST (5,10,0)
282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
283 get_av (name, create); 324 get_av (name, create);
284#endif 325#endif
285 return get_av (name, create); 326 return get_av (name, create);
286} 327}
287 328
288static HV * 329static HV *
289coro_get_hv (pTHX_ const char *name, int create) 330coro_get_hv (pTHX_ const char *name, int create)
290{ 331{
291#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
293 get_hv (name, create); 334 get_hv (name, create);
294#endif 335#endif
295 return get_hv (name, create); 336 return get_hv (name, create);
296} 337}
… …
301 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
302 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
303 344
304 newpadlist = newAV (); 345 newpadlist = newAV ();
305 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
306#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
308#else 349#else
309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
310#endif 351#endif
311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
312 --AvFILLp (padlist); 353 --AvFILLp (padlist);
313 354
314 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
315 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
316 357
317 return newpadlist; 358 return newpadlist;
318} 359}
319 360
… …
349 390
350 /* casting is fun. */ 391 /* casting is fun. */
351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
352 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
353 394
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396
354 return 0; 397 return 0;
355} 398}
356 399
357#define CORO_MAGIC_type_cv PERL_MAGIC_ext 400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext 401#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
360static MGVTBL coro_cv_vtbl = { 403static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0, 404 0, 0, 0, 0,
362 coro_cv_free 405 coro_cv_free
363}; 406};
364 407
365#define CORO_MAGIC(sv,type) \ 408#define CORO_MAGIC(sv, type) \
366 SvMAGIC (sv) \ 409 SvMAGIC (sv) \
367 ? SvMAGIC (sv)->mg_type == type \ 410 ? SvMAGIC (sv)->mg_type == type \
368 ? SvMAGIC (sv) \ 411 ? SvMAGIC (sv) \
369 : mg_find (sv, type) \ 412 : mg_find (sv, type) \
370 : 0 413 : 0
371 414
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
374 417
375static struct coro * 418INLINE struct coro *
376SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
377{ 420{
378 HV *stash; 421 HV *stash;
379 MAGIC *mg; 422 MAGIC *mg;
380 423
… …
408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
410 else 453 else
411 { 454 {
412#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
413 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
414 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
415 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
416 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
417 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
418#else 462#else
… …
502 546
503 if (expect_true (CvDEPTH (cv))) 547 if (expect_true (CvDEPTH (cv)))
504 { 548 {
505 EXTEND (SP, 3); 549 EXTEND (SP, 3);
506 PUSHs ((SV *)CvPADLIST (cv)); 550 PUSHs ((SV *)CvPADLIST (cv));
507 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 551 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
508 PUSHs ((SV *)cv); 552 PUSHs ((SV *)cv);
509 553
510 CvDEPTH (cv) = 0; 554 CvDEPTH (cv) = 0;
511 get_padlist (aTHX_ cv); 555 get_padlist (aTHX_ cv);
512 } 556 }
… …
592 636
593 New(54,PL_savestack,24,ANY); 637 New(54,PL_savestack,24,ANY);
594 PL_savestack_ix = 0; 638 PL_savestack_ix = 0;
595 PL_savestack_max = 24; 639 PL_savestack_max = 24;
596 640
597#if !PERL_VERSION_ATLEAST (5,9,0) 641#if !PERL_VERSION_ATLEAST (5,10,0)
598 New(54,PL_retstack,4,OP*); 642 New(54,PL_retstack,4,OP*);
599 PL_retstack_ix = 0; 643 PL_retstack_ix = 0;
600 PL_retstack_max = 4; 644 PL_retstack_max = 4;
601#endif 645#endif
602} 646}
… …
604 648
605/* 649/*
606 * destroy the stacks, the callchain etc... 650 * destroy the stacks, the callchain etc...
607 */ 651 */
608static void 652static void
609coro_destroy_stacks (pTHX) 653coro_destruct_stacks (pTHX)
610{ 654{
611 while (PL_curstackinfo->si_next) 655 while (PL_curstackinfo->si_next)
612 PL_curstackinfo = PL_curstackinfo->si_next; 656 PL_curstackinfo = PL_curstackinfo->si_next;
613 657
614 while (PL_curstackinfo) 658 while (PL_curstackinfo)
… …
625 669
626 Safefree (PL_tmps_stack); 670 Safefree (PL_tmps_stack);
627 Safefree (PL_markstack); 671 Safefree (PL_markstack);
628 Safefree (PL_scopestack); 672 Safefree (PL_scopestack);
629 Safefree (PL_savestack); 673 Safefree (PL_savestack);
630#if !PERL_VERSION_ATLEAST (5,9,0) 674#if !PERL_VERSION_ATLEAST (5,10,0)
631 Safefree (PL_retstack); 675 Safefree (PL_retstack);
632#endif 676#endif
633} 677}
634 678
635static size_t 679static size_t
… …
651 #undef VAR 695 #undef VAR
652 } 696 }
653 else 697 else
654 slot = coro->slot; 698 slot = coro->slot;
655 699
700 if (slot)
701 {
656 rss += sizeof (slot->curstackinfo); 702 rss += sizeof (slot->curstackinfo);
657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 703 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 704 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
659 rss += slot->tmps_max * sizeof (SV *); 705 rss += slot->tmps_max * sizeof (SV *);
660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 706 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
661 rss += slot->scopestack_max * sizeof (I32); 707 rss += slot->scopestack_max * sizeof (I32);
662 rss += slot->savestack_max * sizeof (ANY); 708 rss += slot->savestack_max * sizeof (ANY);
663 709
664#if !PERL_VERSION_ATLEAST (5,9,0) 710#if !PERL_VERSION_ATLEAST (5,10,0)
665 rss += slot->retstack_max * sizeof (OP *); 711 rss += slot->retstack_max * sizeof (OP *);
666#endif 712#endif
713 }
667 } 714 }
668 715
669 return rss; 716 return rss;
717}
718
719/** set stacklevel support **************************************************/
720
721/* we sometimes need to create the effect of pp_slf calling us */
722#define SLF_HEAD (void)0
723/* we sometimes need to create the effect of leaving via pp_slf */
724#define SLF_TAIL slf_tail (aTHX)
725
726INLINE void
727slf_tail (pTHX)
728{
729 dSP;
730 SV **bot = SP;
731
732 int gimme = GIMME_V;
733
734 /* make sure we put something on the stack in scalar context */
735 if (gimme == G_SCALAR)
736 {
737 if (sp == bot)
738 XPUSHs (&PL_sv_undef);
739
740 SP = bot + 1;
741 }
742
743 PUTBACK;
670} 744}
671 745
672/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
673 747
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 749static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
750static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
751
752/* apparently < 5.8.8 */
753#ifndef MgPV_nolen_const
754#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
755 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
756 (const char*)(mg)->mg_ptr)
757#endif
676 758
677/* 759/*
678 * This overrides the default magic get method of %SIG elements. 760 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 761 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide 762 * and instead of tryign to save and restore the hash elements, we just provide
… …
688{ 770{
689 const char *s = MgPV_nolen_const (mg); 771 const char *s = MgPV_nolen_const (mg);
690 772
691 if (*s == '_') 773 if (*s == '_')
692 { 774 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 775 SV **svp = 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 776
777 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
778 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
779
780 if (svp)
781 {
782 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
783 return 0;
784 }
695 } 785 }
696 786
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 787 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
788}
789
790static int
791coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
792{
793 const char *s = MgPV_nolen_const (mg);
794
795 if (*s == '_')
796 {
797 SV **svp = 0;
798
799 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
800 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
801
802 if (svp)
803 {
804 SV *old = *svp;
805 *svp = 0;
806 SvREFCNT_dec (old);
807 return 0;
808 }
809 }
810
811 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
698} 812}
699 813
700static int 814static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 815coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{ 816{
… …
712 if (svp) 826 if (svp)
713 { 827 {
714 SV *old = *svp; 828 SV *old = *svp;
715 *svp = newSVsv (sv); 829 *svp = newSVsv (sv);
716 SvREFCNT_dec (old); 830 SvREFCNT_dec (old);
717 return; 831 return 0;
718 } 832 }
719 } 833 }
720 834
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 835 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722} 836}
… …
736 PL_curpm = 0; 850 PL_curpm = 0;
737 PL_curpad = 0; 851 PL_curpad = 0;
738 PL_localizing = 0; 852 PL_localizing = 0;
739 PL_dirty = 0; 853 PL_dirty = 0;
740 PL_restartop = 0; 854 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0;
857#endif
741 858
742 /* recreate the die/warn hooks */ 859 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
745 862
746 GvSV (PL_defgv) = newSV (0); 863 GvSV (PL_defgv) = newSV (0);
747 GvAV (PL_defgv) = coro->args; coro->args = 0; 864 GvAV (PL_defgv) = coro->args; coro->args = 0;
748 GvSV (PL_errgv) = newSV (0); 865 GvSV (PL_errgv) = newSV (0);
749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
750 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
751 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
752 869
753 { 870 {
754 dSP; 871 dSP;
755 LOGOP myop; 872 UNOP myop;
756 873
757 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
758 myop.op_next = Nullop; 875 myop.op_next = Nullop;
759 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
760 877
761 PUSHMARK (SP); 878 PUSHMARK (SP);
762 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
766 SPAGAIN; 883 SPAGAIN;
767 } 884 }
768 885
769 /* this newly created coroutine might be run on an existing cctx which most 886 /* this newly created coroutine might be run on an existing cctx which most
770 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
772 * so we ENTER here for symmetry
773 */ 889 */
774 ENTER; 890 SLF_HEAD;
775} 891}
776 892
777static void 893static void
778coro_destroy (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
779{ 895{
780 if (!IN_DESTRUCT) 896 if (!IN_DESTRUCT)
781 { 897 {
782 /* restore all saved variables and stuff */ 898 /* restore all saved variables and stuff */
783 LEAVE_SCOPE (0); 899 LEAVE_SCOPE (0);
… …
805 SvREFCNT_dec (PL_warnhook); 921 SvREFCNT_dec (PL_warnhook);
806 922
807 SvREFCNT_dec (coro->saved_deffh); 923 SvREFCNT_dec (coro->saved_deffh);
808 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
809 925
810 coro_destroy_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
811} 927}
812 928
813static void 929INLINE void
814free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
815{ 931{
816 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
817 { 933 {
818 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
… …
852 : cx->blk_gimme == G_SCALAR ? bot + 1 968 : cx->blk_gimme == G_SCALAR ? bot + 1
853 : bot; 969 : bot;
854 970
855 av_extend (av, top - bot); 971 av_extend (av, top - bot);
856 while (bot < top) 972 while (bot < top)
857 av_push (av, SvREFCNT_inc (*bot++)); 973 av_push (av, SvREFCNT_inc_NN (*bot++));
858 974
859 PL_runops = RUNOPS_DEFAULT; 975 PL_runops = RUNOPS_DEFAULT;
860 ENTER; 976 ENTER;
861 SAVETMPS; 977 SAVETMPS;
862 EXTEND (SP, 3); 978 EXTEND (SP, 3);
… …
942 1058
943 TAINT_NOT; 1059 TAINT_NOT;
944 return 0; 1060 return 0;
945} 1061}
946 1062
1063static void
1064prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1065{
1066 ta->prev = (struct coro *)cctx;
1067 ta->next = 0;
1068}
1069
947/* inject a fake call to Coro::State::_cctx_init into the execution */ 1070/* inject a fake call to Coro::State::_cctx_init into the execution */
948/* _cctx_init should be careful, as it could be called at almost any time */ 1071/* _cctx_init should be careful, as it could be called at almost any time */
949/* during execution of a perl program */ 1072/* during execution of a perl program */
1073/* also initialises PL_top_env */
950static void NOINLINE 1074static void NOINLINE
951cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
952{ 1076{
953 dSP; 1077 dSP;
954 LOGOP myop; 1078 UNOP myop;
955 1079
956 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
957 1081
958 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
959 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
960 1084
961 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
962 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
963 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
964 1088
965 PUSHMARK (SP); 1089 PUSHMARK (SP);
966 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
967 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
968 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
969 PUTBACK; 1093 PUTBACK;
970 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
971 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
972 SPAGAIN; 1096 SPAGAIN;
973} 1097}
974 1098
1099/* the tail of transfer: execute stuff we can only do after a transfer */
1100INLINE void
1101transfer_tail (pTHX)
1102{
1103 struct coro *next = (struct coro *)transfer_next;
1104 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1105 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1106
1107 free_coro_mortal (aTHX);
1108 UNLOCK;
1109
1110 if (expect_false (next->throw))
1111 {
1112 SV *exception = sv_2mortal (next->throw);
1113
1114 next->throw = 0;
1115 sv_setsv (ERRSV, exception);
1116 croak (0);
1117 }
1118}
1119
975/* 1120/*
976 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
977 */ 1122 */
978static void 1123static void
979cctx_run (void *arg) 1124cctx_run (void *arg)
980{ 1125{
1126#ifdef USE_ITHREADS
1127# if CORO_PTHREAD
1128 PERL_SET_CONTEXT (coro_thx);
1129# endif
1130#endif
1131 {
981 dTHX; 1132 dTHX;
982 1133
983 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1134 /* we are the alternative tail to pp_set_stacklevel */
984 UNLOCK; 1135 /* so do the same things here */
1136 SLF_TAIL;
985 1137
986 /* we now skip the entersub that lead to transfer() */ 1138 /* we now skip the op that did lead to transfer() */
987 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
988 1140
989 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
990 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
991 1143
1144 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX);
1146
992 /* 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 */
993 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
994 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
995 1150
996 /* 1151 /*
997 * 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
998 * 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)
999 * 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
1000 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1001 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1002 */ 1157 */
1003 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1004 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 }
1005} 1161}
1006 1162
1007static coro_cctx * 1163static coro_cctx *
1008cctx_new () 1164cctx_new ()
1009{ 1165{
1010 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 ();
1011 void *stack_start; 1195 void *stack_start;
1012 size_t stack_size; 1196 size_t stack_size;
1013 1197
1014 ++cctx_count;
1015
1016 Newz (0, cctx, 1, coro_cctx);
1017
1018#if HAVE_MMAP 1198#if HAVE_MMAP
1019 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;
1020 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1021 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);
1022 1202
1023 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1024 { 1204 {
1025# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1026 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1027# endif 1207 #endif
1028 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1029 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1030 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1031 } 1211 }
1032 else 1212 else
1033#endif 1213#endif
1034 { 1214 {
1035 cctx->ssize = coro_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1036 New (0, cctx->sptr, coro_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1037 1217
1038 if (!cctx->sptr) 1218 if (!cctx->sptr)
1039 { 1219 {
1040 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1041 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1042 } 1222 }
1043 1223
1044 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1045 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1046 } 1226 }
1047 1227
1048 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
1049 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);
1050 1233
1051 return cctx; 1234 return cctx;
1052} 1235}
1053 1236
… …
1056{ 1239{
1057 if (!cctx) 1240 if (!cctx)
1058 return; 1241 return;
1059 1242
1060 --cctx_count; 1243 --cctx_count;
1244 coro_destroy (&cctx->cctx);
1061 1245
1246 /* coro_transfer creates new, empty cctx's */
1247 if (cctx->sptr)
1248 {
1062#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1063 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1064#endif 1251 #endif
1065 1252
1066#if HAVE_MMAP 1253#if HAVE_MMAP
1067 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1068 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1069 else 1256 else
1070#endif 1257#endif
1071 Safefree (cctx->sptr); 1258 Safefree (cctx->sptr);
1259 }
1072 1260
1073 Safefree (cctx); 1261 Safefree (cctx);
1074} 1262}
1075 1263
1076/* wether this cctx should be destructed */ 1264/* wether this cctx should be destructed */
1077#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))
1078 1266
1079static coro_cctx * 1267static coro_cctx *
1080cctx_get (pTHX) 1268cctx_get (pTHX)
1081{ 1269{
1082 while (expect_true (cctx_first)) 1270 while (expect_true (cctx_first))
… …
1089 return cctx; 1277 return cctx;
1090 1278
1091 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1092 } 1280 }
1093 1281
1094 return cctx_new (); 1282 return cctx_new_run ();
1095} 1283}
1096 1284
1097static void 1285static void
1098cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1099{ 1287{
1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1289
1100 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1101 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1102 { 1292 {
1103 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1104 cctx_first = first->next; 1294 cctx_first = first->next;
1105 --cctx_idle; 1295 --cctx_idle;
1106 1296
… …
1126 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1316 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1127 1317
1128 if (expect_false (next->flags & CF_DESTROYED)) 1318 if (expect_false (next->flags & CF_DESTROYED))
1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1319 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1130 1320
1131 if (
1132#if PERL_VERSION_ATLEAST (5,9,0) 1321#if !PERL_VERSION_ATLEAST (5,10,0)
1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1134#else
1135 expect_false (PL_lex_state != LEX_NOTPARSING) 1322 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1136#endif
1137 )
1138 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1323 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1324#endif
1139 } 1325 }
1140} 1326}
1141 1327
1142/* always use the TRANSFER macro */ 1328/* always use the TRANSFER macro */
1143static void NOINLINE 1329static void NOINLINE
1144transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1330transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1145{ 1331{
1146 dSTACKLEVEL; 1332 dSTACKLEVEL;
1147 static volatile int has_throw;
1148 1333
1149 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1150 if (expect_false (!next)) 1335 if (expect_false (!next))
1151 { 1336 {
1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1153 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 */
1154 } 1339 }
1155 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1156 { 1341 {
1157 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1158 1343
1159 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1160 { 1345 {
1161 /* create a new empty context */ 1346 /* create a new empty/source context */
1162 Newz (0, prev->cctx, 1, coro_cctx); 1347 prev->cctx = cctx_new_empty ();
1163 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1164 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1165 } 1350 }
1166 1351
1167 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
… …
1182 else 1367 else
1183 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1184 1369
1185 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1186 1371
1187 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1188 if (expect_true ( 1373 if (expect_true (
1189 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1190 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1191 && !force_cctx 1376 && !force_cctx
1192 )) 1377 ))
1193 { 1378 {
1194 /* 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 */
1195 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));
1196 1381
1197 prev->cctx = 0; 1382 prev->cctx = 0;
1198 1383
1199 /* 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 */
1200 /* 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 */
… …
1208 ++next->usecount; 1393 ++next->usecount;
1209 1394
1210 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1211 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1212 1397
1213 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1214 1400
1215 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1216 { 1402 {
1217 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1218 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1219 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1220 } 1406 }
1221 1407
1222 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1223 UNLOCK;
1224
1225 if (expect_false (has_throw))
1226 {
1227 struct coro *coro = SvSTATE (coro_current);
1228
1229 if (coro->throw)
1230 {
1231 SV *exception = coro->throw;
1232 coro->throw = 0;
1233 sv_setsv (ERRSV, exception);
1234 croak (0);
1235 }
1236 }
1237 } 1409 }
1238} 1410}
1239
1240struct transfer_args
1241{
1242 struct coro *prev, *next;
1243};
1244 1411
1245#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))
1246#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1247 1414
1248/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1274 croak ("FATAL: tried to destroy currently running coroutine"); 1441 croak ("FATAL: tried to destroy currently running coroutine");
1275 1442
1276 save_perl (aTHX_ &temp); 1443 save_perl (aTHX_ &temp);
1277 load_perl (aTHX_ coro); 1444 load_perl (aTHX_ coro);
1278 1445
1279 coro_destroy (aTHX_ coro); 1446 coro_destruct (aTHX_ coro);
1280 1447
1281 load_perl (aTHX_ &temp); 1448 load_perl (aTHX_ &temp);
1282 1449
1283 coro->slot = 0; 1450 coro->slot = 0;
1284 } 1451 }
… …
1338 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1339 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1340} 1507}
1341 1508
1342static void 1509static void
1343api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1344{ 1511{
1345 dTHX;
1346 struct transfer_args ta; 1512 struct transfer_args ta;
1347 1513
1348 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1349 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1350} 1516}
… …
1368 1534
1369 return 0; 1535 return 0;
1370} 1536}
1371 1537
1372static int 1538static int
1373api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1374{ 1540{
1375 dTHX;
1376 struct coro *coro; 1541 struct coro *coro;
1542 SV *sv_hook;
1543 void (*xs_hook)(void);
1377 1544
1378 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
1379 coro_sv = SvRV (coro_sv); 1546 coro_sv = SvRV (coro_sv);
1380 1547
1381 coro = SvSTATE (coro_sv); 1548 coro = SvSTATE (coro_sv);
… …
1384 return 0; 1551 return 0;
1385 1552
1386 coro->flags |= CF_READY; 1553 coro->flags |= CF_READY;
1387 1554
1388 LOCK; 1555 LOCK;
1556
1557 sv_hook = coro_nready ? 0 : coro_readyhook;
1558 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1559
1389 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1560 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1390 ++coro_nready; 1561 ++coro_nready;
1562
1391 UNLOCK; 1563 UNLOCK;
1564
1565 if (sv_hook)
1566 {
1567 dSP;
1568
1569 ENTER;
1570 SAVETMPS;
1571
1572 PUSHMARK (SP);
1573 PUTBACK;
1574 call_sv (sv_hook, G_DISCARD);
1575 SPAGAIN;
1576
1577 FREETMPS;
1578 LEAVE;
1579 }
1580
1581 if (xs_hook)
1582 xs_hook ();
1392 1583
1393 return 1; 1584 return 1;
1394} 1585}
1395 1586
1396static int 1587static int
1397api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1398{ 1589{
1399 dTHX;
1400 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1401} 1591}
1402 1592
1403static void 1593INLINE void
1404prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct transfer_args *ta)
1405{ 1595{
1406 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1407 1597
1408 for (;;) 1598 for (;;)
… …
1434 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1435 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1436 { 1626 {
1437 UNLOCK; 1627 UNLOCK;
1438 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1439 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1440 continue; 1630 continue;
1441 } 1631 }
1442 1632
1443 --coro_nready; 1633 --coro_nready;
1444 UNLOCK; 1634 UNLOCK;
… …
1447 1637
1448 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1449 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1450 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1451 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1452 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));
1453 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1454 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1455 1645
1456 LOCK; 1646 LOCK;
1457 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1458 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1459 UNLOCK; 1649 UNLOCK;
1460} 1650}
1461 1651
1652INLINE void
1653prepare_cede (pTHX_ struct transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1462static void 1659static void
1463prepare_cede (pTHX_ struct transfer_args *ta) 1660prepare_cede_notself (pTHX_ struct transfer_args *ta)
1464{ 1661{
1465 api_ready (coro_current); 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 ta->prev = ta->next = SvSTATE (prev);
1671}
1672
1673static void
1674api_schedule (pTHX)
1675{
1676 struct transfer_args ta;
1677
1466 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1467} 1680}
1468 1681
1469static int 1682static int
1470prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1471{ 1684{
1472 if (coro_nready) 1685 struct transfer_args ta;
1473 { 1686
1474 SV *prev = SvRV (coro_current);
1475 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1476 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1477 return 1; 1692 return 1;
1478 } 1693 }
1479 else 1694 else
1480 return 0; 1695 return 0;
1481} 1696}
1482 1697
1483static void
1484api_schedule (void)
1485{
1486 dTHX;
1487 struct transfer_args ta;
1488
1489 prepare_schedule (aTHX_ &ta);
1490 TRANSFER (ta, 1);
1491}
1492
1493static int 1698static int
1494api_cede (void) 1699api_cede_notself (pTHX)
1495{ 1700{
1496 dTHX; 1701 if (coro_nready)
1702 {
1497 struct transfer_args ta; 1703 struct transfer_args ta;
1498 1704
1499 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1500
1501 if (expect_true (ta.prev != ta.next))
1502 {
1503 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1504 return 1; 1707 return 1;
1505 } 1708 }
1506 else 1709 else
1507 return 0; 1710 return 0;
1508} 1711}
1509 1712
1510static int
1511api_cede_notself (void)
1512{
1513 dTHX;
1514 struct transfer_args ta;
1515
1516 if (prepare_cede_notself (aTHX_ &ta))
1517 {
1518 TRANSFER (ta, 1);
1519 return 1;
1520 }
1521 else
1522 return 0;
1523}
1524
1525static void 1713static void
1526api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1527{ 1715{
1528 dTHX;
1529 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1530 1717
1531 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1532 { 1719 {
1533 if (!coro->cctx) 1720 if (!coro->cctx)
1534 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1535 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1536 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1537 1724
1538 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1539 } 1726 }
… …
1546 else 1733 else
1547 coro->slot->runops = RUNOPS_DEFAULT; 1734 coro->slot->runops = RUNOPS_DEFAULT;
1548 } 1735 }
1549} 1736}
1550 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
1857#define OPpENTERSUB_SLF 15 /* the part of op_private entersub hopefully doesn't use */
1858
1859enum {
1860 CORO_SLF_CUSTOM = 0,
1861 CORO_SLF_SET_STACKLEVEL = 1,
1862 CORO_SLF_TRANSFER = 2
1863};
1864
1865/* declare prototype */
1866XS(XS_Coro__State__set_stacklevel);
1867
1868/*
1869 * these not obviously related functions are all rolled into one
1870 * function to increase chances that they all will call transfer with the same
1871 * stack offset
1872 * SLF stands for "schedule-like-function".
1873 */
1874static OP *
1875pp_slf (pTHX)
1876{
1877 dSP;
1878 struct transfer_args ta;
1879 SV **arg = PL_stack_base + TOPMARK + 1;
1880 int items = SP - arg; /* args without function object */
1881 int ix = PL_op->op_private & OPpENTERSUB_SLF;
1882 struct CoroSLF *slf = 0;
1883 SV *gv = *sp;
1884
1885 /* do a quick consistency check on the "function" object, and if it isn't */
1886 /* for us, divert to the real entersub */
1887 if (SvTYPE (gv) != SVt_PVGV || CvXSUB (GvCV (gv)) != XS_Coro__State__set_stacklevel)
1888 return PL_ppaddr[OP_ENTERSUB](aTHX);
1889
1890 /* pop args */
1891 SP = PL_stack_base + POPMARK;
1892
1893 if (!(PL_op->op_flags & OPf_STACKED))
1894 {
1895 /* ampersand-form of call, use @_ instead of stack */
1896 AV *av = GvAV (PL_defgv);
1897 arg = AvARRAY (av);
1898 items = AvFILLp (av) + 1;
1899 }
1900
1901 PUTBACK;
1902
1903 if (!ix)
1904 {
1905 slf = (struct CoroSLF *)CvXSUBANY (GvCV (gv)).any_ptr;
1906 ix = slf->prepare (aTHX_ arg, items);
1907 }
1908
1909 switch (ix)
1910 {
1911 case CORO_SLF_SET_STACKLEVEL:
1912 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1913 break;
1914
1915 case CORO_SLF_TRANSFER:
1916 if (items != 2)
1917 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1918
1919 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1920 break;
1921
1922 case CORO_SLF_SCHEDULE:
1923 prepare_schedule (aTHX_ &ta);
1924 break;
1925
1926 case CORO_SLF_CEDE:
1927 prepare_cede (aTHX_ &ta);
1928 break;
1929
1930 case CORO_SLF_CEDE_NOTSELF:
1931 prepare_cede_notself (aTHX_ &ta);
1932 break;
1933
1934 default:
1935 abort ();
1936 }
1937
1938 do
1939 TRANSFER (ta, 0);
1940 while (slf && slf->check (aTHX));
1941
1942 SPAGAIN;
1943
1944 PUTBACK;
1945 SLF_TAIL;
1946 SPAGAIN;
1947 RETURN;
1948}
1949
1950static void
1951coro_slf_patch (pTHX_ CV *cv, int ix, SV **args, int items)
1952{
1953 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1954
1955 assert (("FATAL: SLF call with illegal CV value", CvGV (cv)));
1956 slf_cv = cv;
1957
1958 /* we patch the op, and then re-run the whole call */
1959 /* we have to put the same argument on the stack for this to work */
1960 /* and this will be done by pp_restore */
1961 slf_restore.op_next = (OP *)&slf_restore;
1962 slf_restore.op_type = OP_NULL;
1963 slf_restore.op_ppaddr = pp_restore;
1964 slf_restore.op_first = PL_op;
1965
1966 slf_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0;
1967 slf_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0;
1968
1969 PL_op->op_ppaddr = pp_slf;
1970 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SLF | ix; /* we potentially share our private flags with entersub */
1971
1972 PL_op = (OP *)&slf_restore;
1973}
1974
1975static void
1976api_execute_slf (pTHX_ CV *cv, const struct CoroSLF *slf, SV **arg, int items)
1977{
1978 CvXSUBANY (cv).any_ptr = (void *)slf;
1979 coro_slf_patch (aTHX_ cv, CORO_SLF_CUSTOM, arg, items);
1980}
1981
1551MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1982MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1552 1983
1553PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1554 1985
1555BOOT: 1986BOOT:
1556{ 1987{
1557#ifdef USE_ITHREADS 1988#ifdef USE_ITHREADS
1558 MUTEX_INIT (&coro_mutex); 1989 MUTEX_INIT (&coro_lock);
1990# if CORO_PTHREAD
1991 coro_thx = PERL_GET_CONTEXT;
1992# endif
1559#endif 1993#endif
1560 BOOT_PAGESIZE; 1994 BOOT_PAGESIZE;
1561 1995
1562 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1996 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1563 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1997 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1564 1998
1565 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1999 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1566 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2000 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1567 orig_sigelem_set = PL_vtbl_sigelem.svt_set; 2001 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1568 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1569 2002
1570 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 2003 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1571 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 2004 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1572 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 2005 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1573 2006
… …
1582 main_top_env = PL_top_env; 2015 main_top_env = PL_top_env;
1583 2016
1584 while (main_top_env->je_prev) 2017 while (main_top_env->je_prev)
1585 main_top_env = main_top_env->je_prev; 2018 main_top_env = main_top_env->je_prev;
1586 2019
1587 coroapi.ver = CORO_API_VERSION; 2020 coroapi.ver = CORO_API_VERSION;
1588 coroapi.rev = CORO_API_REVISION; 2021 coroapi.rev = CORO_API_REVISION;
1589 coroapi.transfer = api_transfer; 2022 coroapi.transfer = api_transfer;
2023 coroapi.execute_slf = api_execute_slf;
2024
2025 {
2026 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2027
2028 if (!svp) croak ("Time::HiRes is required");
2029 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2030
2031 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2032 }
1590 2033
1591 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2034 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1592} 2035}
1593 2036
1594SV * 2037SV *
… …
1618 av_push (coro->args, newSVsv (ST (i))); 2061 av_push (coro->args, newSVsv (ST (i)));
1619} 2062}
1620 OUTPUT: 2063 OUTPUT:
1621 RETVAL 2064 RETVAL
1622 2065
1623# these not obviously related functions are all rolled into the same xs
1624# function to increase chances that they all will call transfer with the same
1625# stack offset
1626void 2066void
1627_set_stacklevel (...) 2067_set_stacklevel (...)
1628 ALIAS: 2068 ALIAS:
2069 _set_stacklevel = CORO_SLF_SET_STACKLEVEL
1629 Coro::State::transfer = 1 2070 Coro::State::transfer = CORO_SLF_TRANSFER
1630 Coro::schedule = 2 2071 Coro::schedule = CORO_SLF_SCHEDULE
1631 Coro::cede = 3 2072 Coro::cede = CORO_SLF_CEDE
1632 Coro::cede_notself = 4 2073 Coro::cede_notself = CORO_SLF_CEDE_NOTSELF
1633 CODE: 2074 CODE:
1634{ 2075 coro_slf_patch (aTHX_ cv, ix, &ST (0), items);
1635 struct transfer_args ta;
1636
1637 PUTBACK;
1638 switch (ix)
1639 {
1640 case 0:
1641 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1642 ta.next = 0;
1643 break;
1644
1645 case 1:
1646 if (items != 2)
1647 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1648
1649 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1650 break;
1651
1652 case 2:
1653 prepare_schedule (aTHX_ &ta);
1654 break;
1655
1656 case 3:
1657 prepare_cede (aTHX_ &ta);
1658 break;
1659
1660 case 4:
1661 if (!prepare_cede_notself (aTHX_ &ta))
1662 XSRETURN_EMPTY;
1663
1664 break;
1665 }
1666 SPAGAIN;
1667
1668 BARRIER;
1669 PUTBACK;
1670 TRANSFER (ta, 0);
1671 SPAGAIN; /* might be the sp of a different coroutine now */
1672 /* be extra careful not to ever do anything after TRANSFER */
1673}
1674 2076
1675bool 2077bool
1676_destroy (SV *coro_sv) 2078_destroy (SV *coro_sv)
1677 CODE: 2079 CODE:
1678 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2080 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1679 OUTPUT: 2081 OUTPUT:
1680 RETVAL 2082 RETVAL
1681 2083
1682void 2084void
1683_exit (code) 2085_exit (int code)
1684 int code
1685 PROTOTYPE: $ 2086 PROTOTYPE: $
1686 CODE: 2087 CODE:
1687 _exit (code); 2088 _exit (code);
1688 2089
1689int 2090int
1690cctx_stacksize (int new_stacksize = 0) 2091cctx_stacksize (int new_stacksize = 0)
1691 CODE: 2092 CODE:
1692 RETVAL = coro_stacksize; 2093 RETVAL = cctx_stacksize;
1693 if (new_stacksize) 2094 if (new_stacksize)
2095 {
1694 coro_stacksize = new_stacksize; 2096 cctx_stacksize = new_stacksize;
2097 ++cctx_gen;
2098 }
2099 OUTPUT:
2100 RETVAL
2101
2102int
2103cctx_max_idle (int max_idle = 0)
2104 CODE:
2105 RETVAL = cctx_max_idle;
2106 if (max_idle > 1)
2107 cctx_max_idle = max_idle;
1695 OUTPUT: 2108 OUTPUT:
1696 RETVAL 2109 RETVAL
1697 2110
1698int 2111int
1699cctx_count () 2112cctx_count ()
… …
1723call (Coro::State coro, SV *coderef) 2136call (Coro::State coro, SV *coderef)
1724 ALIAS: 2137 ALIAS:
1725 eval = 1 2138 eval = 1
1726 CODE: 2139 CODE:
1727{ 2140{
1728 if (coro->mainstack) 2141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1729 { 2142 {
1730 struct coro temp; 2143 struct coro temp;
1731 2144
1732 if (!(coro->flags & CF_RUNNING)) 2145 if (!(coro->flags & CF_RUNNING))
1733 { 2146 {
… …
1777 RETVAL = boolSV (coro->flags & ix); 2190 RETVAL = boolSV (coro->flags & ix);
1778 OUTPUT: 2191 OUTPUT:
1779 RETVAL 2192 RETVAL
1780 2193
1781void 2194void
2195throw (Coro::State self, SV *throw = &PL_sv_undef)
2196 PROTOTYPE: $;$
2197 CODE:
2198 SvREFCNT_dec (self->throw);
2199 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2200
2201void
1782api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2202api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2203 C_ARGS: aTHX_ coro, flags
1783 2204
1784SV * 2205SV *
1785has_stack (Coro::State coro) 2206has_cctx (Coro::State coro)
1786 PROTOTYPE: $ 2207 PROTOTYPE: $
1787 CODE: 2208 CODE:
1788 RETVAL = boolSV (!!coro->cctx); 2209 RETVAL = boolSV (!!coro->cctx);
1789 OUTPUT: 2210 OUTPUT:
1790 RETVAL 2211 RETVAL
… …
1795 CODE: 2216 CODE:
1796 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2217 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1797 OUTPUT: 2218 OUTPUT:
1798 RETVAL 2219 RETVAL
1799 2220
1800IV 2221UV
1801rss (Coro::State coro) 2222rss (Coro::State coro)
1802 PROTOTYPE: $ 2223 PROTOTYPE: $
1803 ALIAS: 2224 ALIAS:
1804 usecount = 1 2225 usecount = 1
1805 CODE: 2226 CODE:
… …
1815force_cctx () 2236force_cctx ()
1816 CODE: 2237 CODE:
1817 struct coro *coro = SvSTATE (coro_current); 2238 struct coro *coro = SvSTATE (coro_current);
1818 coro->cctx->idle_sp = 0; 2239 coro->cctx->idle_sp = 0;
1819 2240
1820MODULE = Coro::State PACKAGE = Coro
1821
1822BOOT:
1823{
1824 int i;
1825
1826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1828 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1829
1830 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1831 SvREADONLY_on (coro_current);
1832
1833 coro_stash = gv_stashpv ("Coro", TRUE);
1834
1835 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1836 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1837 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1838 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1839 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1840 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1841
1842 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1843 coro_ready[i] = newAV ();
1844
1845 {
1846 SV *sv = perl_get_sv ("Coro::API", TRUE);
1847 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1848
1849 coroapi.schedule = api_schedule;
1850 coroapi.cede = api_cede;
1851 coroapi.cede_notself = api_cede_notself;
1852 coroapi.ready = api_ready;
1853 coroapi.is_ready = api_is_ready;
1854 coroapi.nready = &coro_nready;
1855 coroapi.current = coro_current;
1856
1857 GCoroAPI = &coroapi;
1858 sv_setiv (sv, (IV)&coroapi);
1859 SvREADONLY_on (sv);
1860 }
1861}
1862
1863void
1864_set_current (SV *current)
1865 PROTOTYPE: $
1866 CODE:
1867 SvREFCNT_dec (SvRV (coro_current));
1868 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1869
1870int
1871prio (Coro::State coro, int newprio = 0)
1872 ALIAS:
1873 nice = 1
1874 CODE:
1875{
1876 RETVAL = coro->prio;
1877
1878 if (items > 1)
1879 {
1880 if (ix)
1881 newprio = coro->prio - newprio;
1882
1883 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1884 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1885
1886 coro->prio = newprio;
1887 }
1888}
1889 OUTPUT:
1890 RETVAL
1891
1892SV *
1893ready (SV *self)
1894 PROTOTYPE: $
1895 CODE:
1896 RETVAL = boolSV (api_ready (self));
1897 OUTPUT:
1898 RETVAL
1899
1900int
1901nready (...)
1902 PROTOTYPE:
1903 CODE:
1904 RETVAL = coro_nready;
1905 OUTPUT:
1906 RETVAL
1907
1908void
1909throw (Coro::State self, SV *throw = &PL_sv_undef)
1910 PROTOTYPE: $;$
1911 CODE:
1912 SvREFCNT_dec (self->throw);
1913 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1914
1915void 2241void
1916swap_defsv (Coro::State self) 2242swap_defsv (Coro::State self)
1917 PROTOTYPE: $ 2243 PROTOTYPE: $
1918 ALIAS: 2244 ALIAS:
1919 swap_defav = 1 2245 swap_defav = 1
… …
1926 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2252 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1927 2253
1928 SV *tmp = *src; *src = *dst; *dst = tmp; 2254 SV *tmp = *src; *src = *dst; *dst = tmp;
1929 } 2255 }
1930 2256
2257MODULE = Coro::State PACKAGE = Coro
2258
2259BOOT:
2260{
2261 int i;
2262
2263 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2264 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2265 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2266
2267 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
2268 SvREADONLY_on (coro_current);
2269
2270 coro_stash = gv_stashpv ("Coro", TRUE);
2271
2272 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2273 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2274 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2275 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2276 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2277 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2278
2279 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2280 coro_ready[i] = newAV ();
2281
2282 {
2283 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2284
2285 coroapi.schedule = api_schedule;
2286 coroapi.cede = api_cede;
2287 coroapi.cede_notself = api_cede_notself;
2288 coroapi.ready = api_ready;
2289 coroapi.is_ready = api_is_ready;
2290 coroapi.nready = coro_nready;
2291 coroapi.current = coro_current;
2292
2293 GCoroAPI = &coroapi;
2294 sv_setiv (sv, (IV)&coroapi);
2295 SvREADONLY_on (sv);
2296 }
2297}
2298
2299void
2300_set_current (SV *current)
2301 PROTOTYPE: $
2302 CODE:
2303 SvREFCNT_dec (SvRV (coro_current));
2304 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2305
2306void
2307_set_readyhook (SV *hook)
2308 PROTOTYPE: $
2309 CODE:
2310 LOCK;
2311 SvREFCNT_dec (coro_readyhook);
2312 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2313 UNLOCK;
2314
2315int
2316prio (Coro::State coro, int newprio = 0)
2317 ALIAS:
2318 nice = 1
2319 CODE:
2320{
2321 RETVAL = coro->prio;
2322
2323 if (items > 1)
2324 {
2325 if (ix)
2326 newprio = coro->prio - newprio;
2327
2328 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
2329 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
2330
2331 coro->prio = newprio;
2332 }
2333}
2334 OUTPUT:
2335 RETVAL
2336
2337SV *
2338ready (SV *self)
2339 PROTOTYPE: $
2340 CODE:
2341 RETVAL = boolSV (api_ready (aTHX_ self));
2342 OUTPUT:
2343 RETVAL
2344
2345int
2346nready (...)
2347 PROTOTYPE:
2348 CODE:
2349 RETVAL = coro_nready;
2350 OUTPUT:
2351 RETVAL
2352
1931# for async_pool speedup 2353# for async_pool speedup
1932void 2354void
1933_pool_1 (SV *cb) 2355_pool_1 (SV *cb)
1934 CODE: 2356 CODE:
1935{ 2357{
… …
1940 AV *invoke_av; 2362 AV *invoke_av;
1941 int i, len; 2363 int i, len;
1942 2364
1943 if (!invoke) 2365 if (!invoke)
1944 { 2366 {
1945 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2367 SV *old = PL_diehook;
2368 PL_diehook = 0;
2369 SvREFCNT_dec (old);
1946 croak ("\3async_pool terminate\2\n"); 2370 croak ("\3async_pool terminate\2\n");
1947 } 2371 }
1948 2372
1949 SvREFCNT_dec (coro->saved_deffh); 2373 SvREFCNT_dec (coro->saved_deffh);
1950 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2374 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1951 2375
1952 hv_store (hv, "desc", sizeof ("desc") - 1, 2376 hv_store (hv, "desc", sizeof ("desc") - 1,
1953 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2377 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1954 2378
1955 invoke_av = (AV *)SvRV (invoke); 2379 invoke_av = (AV *)SvRV (invoke);
… …
1959 2383
1960 if (len > 0) 2384 if (len > 0)
1961 { 2385 {
1962 av_fill (defav, len - 1); 2386 av_fill (defav, len - 1);
1963 for (i = 0; i < len; ++i) 2387 for (i = 0; i < len; ++i)
1964 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2388 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1965 } 2389 }
1966 2390
1967 SvREFCNT_dec (invoke); 2391 SvREFCNT_dec (invoke);
1968} 2392}
1969 2393
… …
1976 sv_setsv (cb, &PL_sv_undef); 2400 sv_setsv (cb, &PL_sv_undef);
1977 2401
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2402 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0; 2403 coro->saved_deffh = 0;
1980 2404
1981 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2405 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2406 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 { 2407 {
1984 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2408 SV *old = PL_diehook;
2409 PL_diehook = 0;
2410 SvREFCNT_dec (old);
1985 croak ("\3async_pool terminate\2\n"); 2411 croak ("\3async_pool terminate\2\n");
1986 } 2412 }
1987 2413
1988 av_clear (GvAV (PL_defgv)); 2414 av_clear (GvAV (PL_defgv));
1989 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2415 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1990 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2416 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1991 2417
1992 coro->prio = 0; 2418 coro->prio = 0;
1993 2419
1994 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2420 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1995 api_trace (coro_current, 0); 2421 api_trace (aTHX_ coro_current, 0);
1996 2422
1997 av_push (av_async_pool, newSVsv (coro_current)); 2423 av_push (av_async_pool, newSVsv (coro_current));
1998} 2424}
1999 2425
2426#if 0
2427
2428void
2429_generator_call (...)
2430 PROTOTYPE: @
2431 PPCODE:
2432 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2433 xxxx
2434 abort ();
2435
2436SV *
2437gensub (SV *sub, ...)
2438 PROTOTYPE: &;@
2439 CODE:
2440{
2441 struct coro *coro;
2442 MAGIC *mg;
2443 CV *xcv;
2444 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2445 int i;
2446
2447 CvGV (ncv) = CvGV (cv);
2448 CvFILE (ncv) = CvFILE (cv);
2449
2450 Newz (0, coro, 1, struct coro);
2451 coro->args = newAV ();
2452 coro->flags = CF_NEW;
2453
2454 av_extend (coro->args, items - 1);
2455 for (i = 1; i < items; i++)
2456 av_push (coro->args, newSVsv (ST (i)));
2457
2458 CvISXSUB_on (ncv);
2459 CvXSUBANY (ncv).any_ptr = (void *)coro;
2460
2461 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2462
2463 CvXSUB (ncv) = CvXSUB (xcv);
2464 CvANON_on (ncv);
2465
2466 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2467 RETVAL = newRV_noinc ((SV *)ncv);
2468}
2469 OUTPUT:
2470 RETVAL
2471
2472#endif
2473
2000 2474
2001MODULE = Coro::State PACKAGE = Coro::AIO 2475MODULE = Coro::State PACKAGE = Coro::AIO
2002 2476
2003SV * 2477void
2004_get_state () 2478_get_state (SV *self)
2005 CODE: 2479 PPCODE:
2006{ 2480{
2007 struct io_state *data; 2481 AV *defav = GvAV (PL_defgv);
2008 2482 AV *av = newAV ();
2483 int i;
2009 RETVAL = newSV (sizeof (struct io_state)); 2484 SV *data_sv = newSV (sizeof (struct io_state));
2010 data = (struct io_state *)SvPVX (RETVAL); 2485 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2011 SvCUR_set (RETVAL, sizeof (struct io_state)); 2486 SvCUR_set (data_sv, sizeof (struct io_state));
2012 SvPOK_only (RETVAL); 2487 SvPOK_only (data_sv);
2013 2488
2014 data->errorno = errno; 2489 data->errorno = errno;
2015 data->laststype = PL_laststype; 2490 data->laststype = PL_laststype;
2016 data->laststatval = PL_laststatval; 2491 data->laststatval = PL_laststatval;
2017 data->statcache = PL_statcache; 2492 data->statcache = PL_statcache;
2493
2494 av_extend (av, AvFILLp (defav) + 1 + 1);
2495
2496 for (i = 0; i <= AvFILLp (defav); ++i)
2497 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2498
2499 av_push (av, data_sv);
2500
2501 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2502
2503 api_ready (aTHX_ self);
2018} 2504}
2019 OUTPUT:
2020 RETVAL
2021 2505
2022void 2506void
2023_set_state (char *data_) 2507_set_state (SV *state)
2024 PROTOTYPE: $ 2508 PROTOTYPE: $
2025 CODE: 2509 PPCODE:
2026{ 2510{
2027 struct io_state *data = (void *)data_; 2511 AV *av = (AV *)SvRV (state);
2512 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2513 int i;
2028 2514
2029 errno = data->errorno; 2515 errno = data->errorno;
2030 PL_laststype = data->laststype; 2516 PL_laststype = data->laststype;
2031 PL_laststatval = data->laststatval; 2517 PL_laststatval = data->laststatval;
2032 PL_statcache = data->statcache; 2518 PL_statcache = data->statcache;
2033}
2034 2519
2520 EXTEND (SP, AvFILLp (av));
2521 for (i = 0; i < AvFILLp (av); ++i)
2522 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2523}
2524
2525
2526MODULE = Coro::State PACKAGE = Coro::AnyEvent
2527
2528BOOT:
2529 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2530
2531SV *
2532_schedule (...)
2533 PROTOTYPE: @
2534 CODE:
2535{
2536 static int incede;
2537
2538 api_cede_notself (aTHX);
2539
2540 ++incede;
2541 while (coro_nready >= incede && api_cede (aTHX))
2542 ;
2543
2544 sv_setsv (sv_activity, &PL_sv_undef);
2545 if (coro_nready >= incede)
2546 {
2547 PUSHMARK (SP);
2548 PUTBACK;
2549 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2550 SPAGAIN;
2551 }
2552
2553 --incede;
2554}
2555
2556
2557MODULE = Coro::State PACKAGE = PerlIO::cede
2558
2559BOOT:
2560 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2561

Diff Legend

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