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.209 by root, Wed Oct 10 02:58:17 2007 UTC vs.
Revision 1.261 by root, Mon Nov 10 05:09:30 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
43#else 52#else
44# define REGISTER_STACK(cctx,start,end) 53# define REGISTER_STACK(cctx,start,end)
45#endif 54#endif
46 55
47/* the maximum number of idle cctx that will be pooled */ 56/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 57static int cctx_max_idle = 4;
49 58
50#define PERL_VERSION_ATLEAST(a,b,c) \ 59#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 60 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 61 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 62 && (PERL_VERSION > (b) \
72# ifndef IS_PADCONST 81# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
74# endif 83# endif
75#endif 84#endif
76 85
86/* 5.11 */
87#ifndef CxHASARGS
88# define CxHASARGS(cx) (cx)->blk_sub.hasargs
89#endif
90
91/* 5.10.0 */
92#ifndef SvREFCNT_inc_NN
93# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
94#endif
95
96/* 5.8.8 */
97#ifndef GV_NOTQUAL
98# define GV_NOTQUAL 0
99#endif
100#ifndef newSV
101# define newSV(l) NEWSV(0,l)
102#endif
103
77/* 5.8.7 */ 104/* 5.8.7 */
78#ifndef SvRV_set 105#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 107#endif
89 108
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 110# undef CORO_STACKGUARD
92#endif 111#endif
123#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
124 143
125#include "CoroAPI.h" 144#include "CoroAPI.h"
126 145
127#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
128static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
130# 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
131#else 155#else
156
132# define LOCK (void)0 157# define LOCK (void)0
133# define UNLOCK (void)0 158# define UNLOCK (void)0
134#endif
135 159
136#define strpair(const) const, sizeof (const) - 1 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
137 166
138/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
139struct io_state 168struct io_state
140{ 169{
170 AV *res;
141 int errorno; 171 int errorno;
142 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
143 int laststatval; 173 int laststatval;
144 Stat_t statcache; 174 Stat_t statcache;
145}; 175};
146 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
147static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 183static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
152static 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};
153 192
154static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
156 195static SV *rv_diehook;
196static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 197static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 198
161/* async_pool helper stuff */ 199/* async_pool helper stuff */
162static SV *sv_pool_rss; 200static SV *sv_pool_rss;
163static SV *sv_pool_size; 201static SV *sv_pool_size;
164static AV *av_async_pool; 202static AV *av_async_pool;
165 203
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 204/* Coro::AnyEvent */
205static SV *sv_activity;
206
207static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 208static int cctx_count, cctx_idle;
168 209
169enum { 210enum {
170 CC_MAPPED = 0x01, 211 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 212 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 213 CC_TRACE = 0x04,
187 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 228 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
188 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 */
189 JMPENV *top_env; 230 JMPENV *top_env;
190 coro_context cctx; 231 coro_context cctx;
191 232
233 U32 gen;
192#if CORO_USE_VALGRIND 234#if CORO_USE_VALGRIND
193 int valgrind_id; 235 int valgrind_id;
194#endif 236#endif
195 unsigned char flags; 237 unsigned char flags;
196} coro_cctx; 238} coro_cctx;
217 259
218/* this is a structure representing a perl-level coroutine */ 260/* this is a structure representing a perl-level coroutine */
219struct coro { 261struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 262 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 263 coro_cctx *cctx;
222 int gimme;
223 264
224 /* process data */ 265 /* process data */
225 AV *mainstack; 266 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 267 perl_slots *slot; /* basically the saved sp */
227 268
256#define PRIO_IDLE -3 297#define PRIO_IDLE -3
257#define PRIO_MIN -4 298#define PRIO_MIN -4
258 299
259/* for Coro.pm */ 300/* for Coro.pm */
260static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
262static int coro_nready; 304static int coro_nready;
263static struct coro *coro_first; 305static struct coro *coro_first;
264 306
265/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
266 308
267static SV * 309static SV *
268coro_get_sv (const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
269{ 311{
270#if PERL_VERSION_ATLEAST (5,9,0) 312#if PERL_VERSION_ATLEAST (5,10,0)
271 /* 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 */
272 get_sv (name, create); 314 get_sv (name, create);
273#endif 315#endif
274 return get_sv (name, create); 316 return get_sv (name, create);
275} 317}
276 318
277static AV * 319static AV *
278coro_get_av (const char *name, int create) 320coro_get_av (pTHX_ const char *name, int create)
279{ 321{
280#if PERL_VERSION_ATLEAST (5,9,0) 322#if PERL_VERSION_ATLEAST (5,10,0)
281 /* 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 */
282 get_av (name, create); 324 get_av (name, create);
283#endif 325#endif
284 return get_av (name, create); 326 return get_av (name, create);
285} 327}
286 328
287static HV * 329static HV *
288coro_get_hv (const char *name, int create) 330coro_get_hv (pTHX_ const char *name, int create)
289{ 331{
290#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
291 /* 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 */
292 get_hv (name, create); 334 get_hv (name, create);
293#endif 335#endif
294 return get_hv (name, create); 336 return get_hv (name, create);
295} 337}
300 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
301 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
302 344
303 newpadlist = newAV (); 345 newpadlist = newAV ();
304 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
305#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
307#else 349#else
308 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
309#endif 351#endif
310 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
311 --AvFILLp (padlist); 353 --AvFILLp (padlist);
312 354
313 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
314 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
315 357
316 return newpadlist; 358 return newpadlist;
317} 359}
318 360
348 390
349 /* casting is fun. */ 391 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
352 394
353 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
354 396
355 return 0; 397 return 0;
356} 398}
357 399
358#define PERL_MAGIC_coro PERL_MAGIC_ext 400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
359 402
360static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 403static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0,
405 coro_cv_free
406};
361 407
362#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
363 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
367 : 0 413 : 0
414
415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
368 417
369static struct coro * 418static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
371{ 420{
372 HV *stash; 421 HV *stash;
384 /* very slow, but rare, check */ 433 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 435 croak ("Coro::State object required");
387 } 436 }
388 437
389 mg = CORO_MAGIC (coro); 438 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 439 return (struct coro *)mg->mg_ptr;
391} 440}
392 441
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 443
395/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
396static void 445static void
397get_padlist (pTHX_ CV *cv) 446get_padlist (pTHX_ CV *cv)
398{ 447{
399 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 449 AV *av;
401 450
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 453 else
405 { 454 {
406#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
407 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
408 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
409 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
410 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
411 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
412#else 462#else
416} 466}
417 467
418static void 468static void
419put_padlist (pTHX_ CV *cv) 469put_padlist (pTHX_ CV *cv)
420{ 470{
421 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 472 AV *av;
423 473
424 if (expect_false (!mg)) 474 if (expect_false (!mg))
425 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 476
432 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
433 478
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
453 GvSV (irsgv) = slot->irsgv; 498 GvSV (irsgv) = slot->irsgv;
454 499
455 #define VAR(name,type) PL_ ## name = slot->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 501 # include "state.h"
457 #undef VAR 502 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 503
462 { 504 {
463 dSP; 505 dSP;
464 506
465 CV *cv; 507 CV *cv;
504 546
505 if (expect_true (CvDEPTH (cv))) 547 if (expect_true (CvDEPTH (cv)))
506 { 548 {
507 EXTEND (SP, 3); 549 EXTEND (SP, 3);
508 PUSHs ((SV *)CvPADLIST (cv)); 550 PUSHs ((SV *)CvPADLIST (cv));
509 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 551 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
510 PUSHs ((SV *)cv); 552 PUSHs ((SV *)cv);
511 553
512 CvDEPTH (cv) = 0; 554 CvDEPTH (cv) = 0;
513 get_padlist (aTHX_ cv); 555 get_padlist (aTHX_ cv);
514 } 556 }
594 636
595 New(54,PL_savestack,24,ANY); 637 New(54,PL_savestack,24,ANY);
596 PL_savestack_ix = 0; 638 PL_savestack_ix = 0;
597 PL_savestack_max = 24; 639 PL_savestack_max = 24;
598 640
599#if !PERL_VERSION_ATLEAST (5,9,0) 641#if !PERL_VERSION_ATLEAST (5,10,0)
600 New(54,PL_retstack,4,OP*); 642 New(54,PL_retstack,4,OP*);
601 PL_retstack_ix = 0; 643 PL_retstack_ix = 0;
602 PL_retstack_max = 4; 644 PL_retstack_max = 4;
603#endif 645#endif
604} 646}
606 648
607/* 649/*
608 * destroy the stacks, the callchain etc... 650 * destroy the stacks, the callchain etc...
609 */ 651 */
610static void 652static void
611coro_destroy_stacks (pTHX) 653coro_destruct_stacks (pTHX)
612{ 654{
613 while (PL_curstackinfo->si_next) 655 while (PL_curstackinfo->si_next)
614 PL_curstackinfo = PL_curstackinfo->si_next; 656 PL_curstackinfo = PL_curstackinfo->si_next;
615 657
616 while (PL_curstackinfo) 658 while (PL_curstackinfo)
627 669
628 Safefree (PL_tmps_stack); 670 Safefree (PL_tmps_stack);
629 Safefree (PL_markstack); 671 Safefree (PL_markstack);
630 Safefree (PL_scopestack); 672 Safefree (PL_scopestack);
631 Safefree (PL_savestack); 673 Safefree (PL_savestack);
632#if !PERL_VERSION_ATLEAST (5,9,0) 674#if !PERL_VERSION_ATLEAST (5,10,0)
633 Safefree (PL_retstack); 675 Safefree (PL_retstack);
634#endif 676#endif
635} 677}
636 678
637static size_t 679static size_t
653 #undef VAR 695 #undef VAR
654 } 696 }
655 else 697 else
656 slot = coro->slot; 698 slot = coro->slot;
657 699
700 if (slot)
701 {
658 rss += sizeof (slot->curstackinfo); 702 rss += sizeof (slot->curstackinfo);
659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 703 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
660 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 *);
661 rss += slot->tmps_max * sizeof (SV *); 705 rss += slot->tmps_max * sizeof (SV *);
662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 706 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
663 rss += slot->scopestack_max * sizeof (I32); 707 rss += slot->scopestack_max * sizeof (I32);
664 rss += slot->savestack_max * sizeof (ANY); 708 rss += slot->savestack_max * sizeof (ANY);
665 709
666#if !PERL_VERSION_ATLEAST (5,9,0) 710#if !PERL_VERSION_ATLEAST (5,10,0)
667 rss += slot->retstack_max * sizeof (OP *); 711 rss += slot->retstack_max * sizeof (OP *);
668#endif 712#endif
713 }
669 } 714 }
670 715
671 return rss; 716 return rss;
672} 717}
673 718
674/** coroutine stack handling ************************************************/ 719/** coroutine stack handling ************************************************/
720
721static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
722static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
723static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
724
725/* apparently < 5.8.8 */
726#ifndef MgPV_nolen_const
727#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
728 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
729 (const char*)(mg)->mg_ptr)
730#endif
731
732/*
733 * This overrides the default magic get method of %SIG elements.
734 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
735 * and instead of tryign to save and restore the hash elements, we just provide
736 * readback here.
737 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
738 * not expecting this to actually change the hook. This is a potential problem
739 * when a schedule happens then, but we ignore this.
740 */
741static int
742coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
743{
744 const char *s = MgPV_nolen_const (mg);
745
746 if (*s == '_')
747 {
748 SV **svp = 0;
749
750 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
751 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
752
753 if (svp)
754 {
755 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
756 return 0;
757 }
758 }
759
760 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
761}
762
763static int
764coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
765{
766 const char *s = MgPV_nolen_const (mg);
767
768 if (*s == '_')
769 {
770 SV **svp = 0;
771
772 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
773 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
774
775 if (svp)
776 {
777 SV *old = *svp;
778 *svp = 0;
779 SvREFCNT_dec (old);
780 return 0;
781 }
782 }
783
784 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
785}
786
787static int
788coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
789{
790 const char *s = MgPV_nolen_const (mg);
791
792 if (*s == '_')
793 {
794 SV **svp = 0;
795
796 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
797 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
798
799 if (svp)
800 {
801 SV *old = *svp;
802 *svp = newSVsv (sv);
803 SvREFCNT_dec (old);
804 return 0;
805 }
806 }
807
808 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
809}
675 810
676static void 811static void
677coro_setup (pTHX_ struct coro *coro) 812coro_setup (pTHX_ struct coro *coro)
678{ 813{
679 /* 814 /*
688 PL_curpm = 0; 823 PL_curpm = 0;
689 PL_curpad = 0; 824 PL_curpad = 0;
690 PL_localizing = 0; 825 PL_localizing = 0;
691 PL_dirty = 0; 826 PL_dirty = 0;
692 PL_restartop = 0; 827 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 828#if PERL_VERSION_ATLEAST (5,10,0)
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 829 PL_parser = 0;
830#endif
831
832 /* recreate the die/warn hooks */
833 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
834 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 835
696 GvSV (PL_defgv) = newSV (0); 836 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 837 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 838 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 839 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
700 PL_rs = newSVsv (GvSV (irsgv)); 840 PL_rs = newSVsv (GvSV (irsgv));
701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 841 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
702 842
703 { 843 {
704 dSP; 844 dSP;
705 LOGOP myop; 845 UNOP myop;
706 846
707 Zero (&myop, 1, LOGOP); 847 Zero (&myop, 1, UNOP);
708 myop.op_next = Nullop; 848 myop.op_next = Nullop;
709 myop.op_flags = OPf_WANT_VOID; 849 myop.op_flags = OPf_WANT_VOID;
710 850
711 PUSHMARK (SP); 851 PUSHMARK (SP);
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 852 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 853 PUTBACK;
714 PL_op = (OP *)&myop; 854 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 855 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 856 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 857 }
858
859 /* this newly created coroutine might be run on an existing cctx which most
860 * likely was suspended in set_stacklevel, called from entersub.
861 * set_stacklevel doesn't do anything on return, but entersub does LEAVE,
862 * so we ENTER here for symmetry.
863 */
864 ENTER;
732} 865}
733 866
734static void 867static void
735coro_destroy (pTHX_ struct coro *coro) 868coro_destruct (pTHX_ struct coro *coro)
736{ 869{
737 if (!IN_DESTRUCT) 870 if (!IN_DESTRUCT)
738 { 871 {
739 /* restore all saved variables and stuff */ 872 /* restore all saved variables and stuff */
740 LEAVE_SCOPE (0); 873 LEAVE_SCOPE (0);
762 SvREFCNT_dec (PL_warnhook); 895 SvREFCNT_dec (PL_warnhook);
763 896
764 SvREFCNT_dec (coro->saved_deffh); 897 SvREFCNT_dec (coro->saved_deffh);
765 SvREFCNT_dec (coro->throw); 898 SvREFCNT_dec (coro->throw);
766 899
767 coro_destroy_stacks (aTHX); 900 coro_destruct_stacks (aTHX);
768} 901}
769 902
770static void 903static void
771free_coro_mortal (pTHX) 904free_coro_mortal (pTHX)
772{ 905{
809 : cx->blk_gimme == G_SCALAR ? bot + 1 942 : cx->blk_gimme == G_SCALAR ? bot + 1
810 : bot; 943 : bot;
811 944
812 av_extend (av, top - bot); 945 av_extend (av, top - bot);
813 while (bot < top) 946 while (bot < top)
814 av_push (av, SvREFCNT_inc (*bot++)); 947 av_push (av, SvREFCNT_inc_NN (*bot++));
815 948
816 PL_runops = RUNOPS_DEFAULT; 949 PL_runops = RUNOPS_DEFAULT;
817 ENTER; 950 ENTER;
818 SAVETMPS; 951 SAVETMPS;
819 EXTEND (SP, 3); 952 EXTEND (SP, 3);
820 PUSHMARK (SP); 953 PUSHMARK (SP);
821 PUSHs (&PL_sv_no); 954 PUSHs (&PL_sv_no);
822 PUSHs (fullname); 955 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 956 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
824 PUTBACK; 957 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 958 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 959 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
827 SPAGAIN; 960 SPAGAIN;
828 FREETMPS; 961 FREETMPS;
829 LEAVE; 962 LEAVE;
830 PL_runops = runops_trace; 963 PL_runops = runops_trace;
857 SAVETMPS; 990 SAVETMPS;
858 EXTEND (SP, 3); 991 EXTEND (SP, 3);
859 PUSHMARK (SP); 992 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes); 993 PUSHs (&PL_sv_yes);
861 PUSHs (fullname); 994 PUSHs (fullname);
862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 995 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
863 PUTBACK; 996 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 997 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
865 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 998 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
866 SPAGAIN; 999 SPAGAIN;
867 FREETMPS; 1000 FREETMPS;
868 LEAVE; 1001 LEAVE;
869 PL_runops = runops_trace; 1002 PL_runops = runops_trace;
883 PL_runops = RUNOPS_DEFAULT; 1016 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP); 1017 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1018 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1019 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK; 1020 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 1021 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1022 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN; 1023 SPAGAIN;
891 FREETMPS; 1024 FREETMPS;
892 LEAVE; 1025 LEAVE;
893 PL_runops = runops_trace; 1026 PL_runops = runops_trace;
899 1032
900 TAINT_NOT; 1033 TAINT_NOT;
901 return 0; 1034 return 0;
902} 1035}
903 1036
1037static void
1038prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1039{
1040 ta->prev = (struct coro *)cctx;
1041 ta->next = 0;
1042}
1043
904/* inject a fake call to Coro::State::_cctx_init into the execution */ 1044/* inject a fake call to Coro::State::_cctx_init into the execution */
905/* _cctx_init should be careful, as it could be called at almost any time */ 1045/* _cctx_init should be careful, as it could be called at almost any time */
906/* during execution of a perl program */ 1046/* during execution of a perl program */
1047/* also initialises PL_top_env */
907static void NOINLINE 1048static void NOINLINE
908cctx_prepare (pTHX_ coro_cctx *cctx) 1049cctx_prepare (pTHX_ coro_cctx *cctx)
909{ 1050{
910 dSP; 1051 dSP;
911 LOGOP myop; 1052 UNOP myop;
912 1053
913 PL_top_env = &PL_start_env; 1054 PL_top_env = &PL_start_env;
914 1055
915 if (cctx->flags & CC_TRACE) 1056 if (cctx->flags & CC_TRACE)
916 PL_runops = runops_trace; 1057 PL_runops = runops_trace;
917 1058
918 Zero (&myop, 1, LOGOP); 1059 Zero (&myop, 1, UNOP);
919 myop.op_next = PL_op; 1060 myop.op_next = PL_op;
920 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1061 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
921 1062
922 PUSHMARK (SP); 1063 PUSHMARK (SP);
923 EXTEND (SP, 2); 1064 EXTEND (SP, 2);
924 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1065 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
925 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1066 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
926 PUTBACK; 1067 PUTBACK;
927 PL_op = (OP *)&myop; 1068 PL_op = (OP *)&myop;
928 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1069 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
929 SPAGAIN; 1070 SPAGAIN;
930} 1071}
931 1072
1073/* the tail of transfer: execute stuff we can onyl do afetr a transfer */
1074static void
1075transfer_tail (void)
1076{
1077 struct coro *next = (struct coro *)transfer_next;
1078 transfer_next = 0; //D for temporary assertion in transfer
1079 assert (("FATAL ERROR: internal error 1067 in Coro module, please report", next));//D
1080
1081 free_coro_mortal (aTHX);
1082 UNLOCK;
1083
1084 if (expect_false (next->throw))
1085 {
1086 SV *exception = sv_2mortal (next->throw);
1087
1088 next->throw = 0;
1089 sv_setsv (ERRSV, exception);
1090 croak (0);
1091 }
1092}
1093
932/* 1094/*
933 * this is a _very_ stripped down perl interpreter ;) 1095 * this is a _very_ stripped down perl interpreter ;)
934 */ 1096 */
935static void 1097static void
936cctx_run (void *arg) 1098cctx_run (void *arg)
937{ 1099{
1100#ifdef USE_ITHREADS
1101# if CORO_PTHREAD
1102 PERL_SET_CONTEXT (coro_thx);
1103# endif
1104#endif
1105 {
938 dTHX; 1106 dTHX;
939 1107
940 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1108 /* entersub called ENTER, but we never 'returned', undo that here */
941 UNLOCK; 1109 LEAVE;
942 1110
943 /* we now skip the entersub that lead to transfer() */ 1111 /* we now skip the entersub that did lead to transfer() */
944 PL_op = PL_op->op_next; 1112 PL_op = PL_op->op_next;
945 1113
946 /* inject a fake subroutine call to cctx_init */ 1114 /* inject a fake subroutine call to cctx_init */
947 cctx_prepare (aTHX_ (coro_cctx *)arg); 1115 cctx_prepare (aTHX_ (coro_cctx *)arg);
948 1116
1117 /* cctx_run is the alternative tail of transfer() */
1118 transfer_tail ();
1119
949 /* somebody or something will hit me for both perl_run and PL_restartop */ 1120 /* somebody or something will hit me for both perl_run and PL_restartop */
950 PL_restartop = PL_op; 1121 PL_restartop = PL_op;
951 perl_run (PL_curinterp); 1122 perl_run (PL_curinterp);
952 1123
953 /* 1124 /*
954 * If perl-run returns we assume exit() was being called or the coro 1125 * If perl-run returns we assume exit() was being called or the coro
955 * fell off the end, which seems to be the only valid (non-bug) 1126 * fell off the end, which seems to be the only valid (non-bug)
956 * reason for perl_run to return. We try to exit by jumping to the 1127 * reason for perl_run to return. We try to exit by jumping to the
957 * bootstrap-time "top" top_env, as we cannot restore the "main" 1128 * bootstrap-time "top" top_env, as we cannot restore the "main"
958 * coroutine as Coro has no such concept 1129 * coroutine as Coro has no such concept
959 */ 1130 */
960 PL_top_env = main_top_env; 1131 PL_top_env = main_top_env;
961 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1132 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1133 }
962} 1134}
963 1135
964static coro_cctx * 1136static coro_cctx *
965cctx_new () 1137cctx_new ()
966{ 1138{
967 coro_cctx *cctx; 1139 coro_cctx *cctx;
1140
1141 ++cctx_count;
1142 New (0, cctx, 1, coro_cctx);
1143
1144 cctx->gen = cctx_gen;
1145 cctx->flags = 0;
1146 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1147
1148 return cctx;
1149}
1150
1151/* create a new cctx only suitable as source */
1152static coro_cctx *
1153cctx_new_empty ()
1154{
1155 coro_cctx *cctx = cctx_new ();
1156
1157 cctx->sptr = 0;
1158 coro_create (&cctx->cctx, 0, 0, 0, 0);
1159
1160 return cctx;
1161}
1162
1163/* create a new cctx suitable as destination/running a perl interpreter */
1164static coro_cctx *
1165cctx_new_run ()
1166{
1167 coro_cctx *cctx = cctx_new ();
968 void *stack_start; 1168 void *stack_start;
969 size_t stack_size; 1169 size_t stack_size;
970 1170
971 ++cctx_count;
972
973 Newz (0, cctx, 1, coro_cctx);
974
975#if HAVE_MMAP 1171#if HAVE_MMAP
976 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1172 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
977 /* mmap supposedly does allocate-on-write for us */ 1173 /* mmap supposedly does allocate-on-write for us */
978 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1174 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
979 1175
980 if (cctx->sptr != (void *)-1) 1176 if (cctx->sptr != (void *)-1)
981 { 1177 {
987 cctx->flags |= CC_MAPPED; 1183 cctx->flags |= CC_MAPPED;
988 } 1184 }
989 else 1185 else
990#endif 1186#endif
991 { 1187 {
992 cctx->ssize = coro_stacksize * (long)sizeof (long); 1188 cctx->ssize = cctx_stacksize * (long)sizeof (long);
993 New (0, cctx->sptr, coro_stacksize, long); 1189 New (0, cctx->sptr, cctx_stacksize, long);
994 1190
995 if (!cctx->sptr) 1191 if (!cctx->sptr)
996 { 1192 {
997 perror ("FATAL: unable to allocate stack for coroutine"); 1193 perror ("FATAL: unable to allocate stack for coroutine");
998 _exit (EXIT_FAILURE); 1194 _exit (EXIT_FAILURE);
1013{ 1209{
1014 if (!cctx) 1210 if (!cctx)
1015 return; 1211 return;
1016 1212
1017 --cctx_count; 1213 --cctx_count;
1214 coro_destroy (&cctx->cctx);
1018 1215
1216 /* coro_transfer creates new, empty cctx's */
1217 if (cctx->sptr)
1218 {
1019#if CORO_USE_VALGRIND 1219#if CORO_USE_VALGRIND
1020 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1220 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1021#endif 1221#endif
1022 1222
1023#if HAVE_MMAP 1223#if HAVE_MMAP
1024 if (cctx->flags & CC_MAPPED) 1224 if (cctx->flags & CC_MAPPED)
1025 munmap (cctx->sptr, cctx->ssize); 1225 munmap (cctx->sptr, cctx->ssize);
1026 else 1226 else
1027#endif 1227#endif
1028 Safefree (cctx->sptr); 1228 Safefree (cctx->sptr);
1229 }
1029 1230
1030 Safefree (cctx); 1231 Safefree (cctx);
1031} 1232}
1032 1233
1033/* wether this cctx should be destructed */ 1234/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1235#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1035 1236
1036static coro_cctx * 1237static coro_cctx *
1037cctx_get (pTHX_ int gimme) 1238cctx_get (pTHX)
1038{ 1239{
1039 while (expect_true (cctx_first[gimme])) 1240 while (expect_true (cctx_first))
1040 { 1241 {
1041 coro_cctx *cctx = cctx_first[gimme]; 1242 coro_cctx *cctx = cctx_first;
1042 cctx_first[gimme] = cctx->next; 1243 cctx_first = cctx->next;
1043 --cctx_idle[gimme]; 1244 --cctx_idle;
1044 1245
1045 if (expect_true (!CCTX_EXPIRED (cctx))) 1246 if (expect_true (!CCTX_EXPIRED (cctx)))
1046 return cctx; 1247 return cctx;
1047 1248
1048 cctx_destroy (cctx); 1249 cctx_destroy (cctx);
1049 } 1250 }
1050 1251
1051 assert (!gimme);
1052 return cctx_new (); 1252 return cctx_new_run ();
1053} 1253}
1054 1254
1055static void 1255static void
1056cctx_put (coro_cctx *cctx, int gimme) 1256cctx_put (coro_cctx *cctx)
1057{ 1257{
1258 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1259
1058 /* free another cctx if overlimit */ 1260 /* free another cctx if overlimit */
1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1261 if (expect_false (cctx_idle >= cctx_max_idle))
1060 { 1262 {
1061 coro_cctx *first = cctx_first[gimme]; 1263 coro_cctx *first = cctx_first;
1062 cctx_first[gimme] = first->next; 1264 cctx_first = first->next;
1063 --cctx_idle[gimme]; 1265 --cctx_idle;
1064 1266
1065 cctx_destroy (first); 1267 cctx_destroy (first);
1066 } 1268 }
1067 1269
1068 ++cctx_idle[gimme]; 1270 ++cctx_idle;
1069 cctx->next = cctx_first[gimme]; 1271 cctx->next = cctx_first;
1070 cctx_first[gimme] = cctx; 1272 cctx_first = cctx;
1071} 1273}
1072 1274
1073/** coroutine switching *****************************************************/ 1275/** coroutine switching *****************************************************/
1074 1276
1075static void 1277static void
1084 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1286 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1085 1287
1086 if (expect_false (next->flags & CF_DESTROYED)) 1288 if (expect_false (next->flags & CF_DESTROYED))
1087 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1289 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1088 1290
1089 if (
1090#if PERL_VERSION_ATLEAST (5,9,0) 1291#if !PERL_VERSION_ATLEAST (5,10,0)
1091 expect_false (PL_parser)
1092#else
1093 expect_false (PL_lex_state != LEX_NOTPARSING) 1292 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1094#endif
1095 )
1096 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1293 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1294#endif
1097 } 1295 }
1098} 1296}
1099 1297
1100/* always use the TRANSFER macro */ 1298/* always use the TRANSFER macro */
1101static void NOINLINE 1299static void NOINLINE
1102transfer (pTHX_ struct coro *prev, struct coro *next) 1300transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1103{ 1301{
1104 dSTACKLEVEL; 1302 dSTACKLEVEL;
1105 1303
1106 /* sometimes transfer is only called to set idle_sp */ 1304 /* sometimes transfer is only called to set idle_sp */
1107 if (expect_false (!next)) 1305 if (expect_false (!next))
1113 { 1311 {
1114 coro_cctx *prev__cctx; 1312 coro_cctx *prev__cctx;
1115 1313
1116 if (expect_false (prev->flags & CF_NEW)) 1314 if (expect_false (prev->flags & CF_NEW))
1117 { 1315 {
1118 /* create a new empty context */ 1316 /* create a new empty/source context */
1119 Newz (0, prev->cctx, 1, coro_cctx); 1317 prev->cctx = cctx_new_empty ();
1120 prev->flags &= ~CF_NEW; 1318 prev->flags &= ~CF_NEW;
1121 prev->flags |= CF_RUNNING; 1319 prev->flags |= CF_RUNNING;
1122 } 1320 }
1123 1321
1124 prev->flags &= ~CF_RUNNING; 1322 prev->flags &= ~CF_RUNNING;
1125 next->flags |= CF_RUNNING; 1323 next->flags |= CF_RUNNING;
1126 1324
1127 LOCK; 1325 LOCK;
1326
1327 /* first get rid of the old state */
1328 save_perl (aTHX_ prev);
1128 1329
1129 if (expect_false (next->flags & CF_NEW)) 1330 if (expect_false (next->flags & CF_NEW))
1130 { 1331 {
1131 /* need to start coroutine */ 1332 /* need to start coroutine */
1132 next->flags &= ~CF_NEW; 1333 next->flags &= ~CF_NEW;
1133 /* first get rid of the old state */
1134 save_perl (aTHX_ prev);
1135 /* setup coroutine call */ 1334 /* setup coroutine call */
1136 coro_setup (aTHX_ next); 1335 coro_setup (aTHX_ next);
1137 } 1336 }
1138 else 1337 else
1139 {
1140 /* coroutine already started */
1141 save_perl (aTHX_ prev);
1142 load_perl (aTHX_ next); 1338 load_perl (aTHX_ next);
1143 }
1144 1339
1145 prev__cctx = prev->cctx; 1340 prev__cctx = prev->cctx;
1146 1341
1147 /* possibly "free" the cctx */ 1342 /* possibly untie and reuse the cctx */
1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1343 if (expect_true (
1344 prev__cctx->idle_sp == STACKLEVEL
1345 && !(prev__cctx->flags & CC_TRACE)
1346 && !force_cctx
1347 ))
1149 { 1348 {
1150 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1349 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1151 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1350 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1152 1351
1153 prev->cctx = 0; 1352 prev->cctx = 0;
1154 1353
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1354 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1355 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1356 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx) 1357 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme); 1358 next->cctx = cctx_get (aTHX);
1160 1359
1161 cctx_put (prev__cctx, prev->gimme); 1360 cctx_put (prev__cctx);
1162 } 1361 }
1163 1362
1164 ++next->usecount; 1363 ++next->usecount;
1165 1364
1166 if (expect_true (!next->cctx)) 1365 if (expect_true (!next->cctx))
1167 next->cctx = cctx_get (aTHX_ next->gimme); 1366 next->cctx = cctx_get (aTHX);
1367
1368 assert (("FATAL ERROR: internal error 1352 in Coro, please report", !transfer_next));//D
1369 transfer_next = next;
1168 1370
1169 if (expect_false (prev__cctx != next->cctx)) 1371 if (expect_false (prev__cctx != next->cctx))
1170 { 1372 {
1171 prev__cctx->top_env = PL_top_env; 1373 prev__cctx->top_env = PL_top_env;
1172 PL_top_env = next->cctx->top_env; 1374 PL_top_env = next->cctx->top_env;
1173 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1375 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1174 } 1376 }
1175 1377
1176 free_coro_mortal (aTHX); 1378 transfer_tail ();
1177 UNLOCK;
1178
1179 if (expect_false (prev->throw || next->throw))
1180 {
1181 struct coro *coro = SvSTATE (coro_current);
1182
1183 if (coro->throw)
1184 {
1185 SV *exception = coro->throw;
1186 coro->throw = 0;
1187 sv_setsv (ERRSV, exception);
1188 croak (0);
1189 }
1190 }
1191 } 1379 }
1192} 1380}
1193 1381
1194struct transfer_args
1195{
1196 struct coro *prev, *next;
1197};
1198
1199#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1382#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1200#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1383#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1201 1384
1202/** high level stuff ********************************************************/ 1385/** high level stuff ********************************************************/
1203 1386
1204static int 1387static int
1228 croak ("FATAL: tried to destroy currently running coroutine"); 1411 croak ("FATAL: tried to destroy currently running coroutine");
1229 1412
1230 save_perl (aTHX_ &temp); 1413 save_perl (aTHX_ &temp);
1231 load_perl (aTHX_ coro); 1414 load_perl (aTHX_ coro);
1232 1415
1233 coro_destroy (aTHX_ coro); 1416 coro_destruct (aTHX_ coro);
1234 1417
1235 load_perl (aTHX_ &temp); 1418 load_perl (aTHX_ &temp);
1236 1419
1237 coro->slot = 0; 1420 coro->slot = 0;
1238 } 1421 }
1298{ 1481{
1299 dTHX; 1482 dTHX;
1300 struct transfer_args ta; 1483 struct transfer_args ta;
1301 1484
1302 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1485 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1303 TRANSFER (ta); 1486 TRANSFER (ta, 1);
1304} 1487}
1305 1488
1306/** Coro ********************************************************************/ 1489/** Coro ********************************************************************/
1307 1490
1308static void 1491static void
1310{ 1493{
1311 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1494 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1312} 1495}
1313 1496
1314static SV * 1497static SV *
1315coro_deq (pTHX_ int min_prio) 1498coro_deq (pTHX)
1316{ 1499{
1317 int prio = PRIO_MAX - PRIO_MIN; 1500 int prio;
1318 1501
1319 min_prio -= PRIO_MIN;
1320 if (min_prio < 0)
1321 min_prio = 0;
1322
1323 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1502 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1324 if (AvFILLp (coro_ready [prio]) >= 0) 1503 if (AvFILLp (coro_ready [prio]) >= 0)
1325 return av_shift (coro_ready [prio]); 1504 return av_shift (coro_ready [prio]);
1326 1505
1327 return 0; 1506 return 0;
1328} 1507}
1330static int 1509static int
1331api_ready (SV *coro_sv) 1510api_ready (SV *coro_sv)
1332{ 1511{
1333 dTHX; 1512 dTHX;
1334 struct coro *coro; 1513 struct coro *coro;
1514 SV *sv_hook;
1515 void (*xs_hook)(void);
1335 1516
1336 if (SvROK (coro_sv)) 1517 if (SvROK (coro_sv))
1337 coro_sv = SvRV (coro_sv); 1518 coro_sv = SvRV (coro_sv);
1338 1519
1339 coro = SvSTATE (coro_sv); 1520 coro = SvSTATE (coro_sv);
1342 return 0; 1523 return 0;
1343 1524
1344 coro->flags |= CF_READY; 1525 coro->flags |= CF_READY;
1345 1526
1346 LOCK; 1527 LOCK;
1528
1529 sv_hook = coro_nready ? 0 : coro_readyhook;
1530 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1531
1347 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1532 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1348 ++coro_nready; 1533 ++coro_nready;
1534
1349 UNLOCK; 1535 UNLOCK;
1536
1537 if (sv_hook)
1538 {
1539 dSP;
1540
1541 ENTER;
1542 SAVETMPS;
1543
1544 PUSHMARK (SP);
1545 PUTBACK;
1546 call_sv (sv_hook, G_DISCARD);
1547 SPAGAIN;
1548
1549 FREETMPS;
1550 LEAVE;
1551 }
1552
1553 if (xs_hook)
1554 xs_hook ();
1350 1555
1351 return 1; 1556 return 1;
1352} 1557}
1353 1558
1354static int 1559static int
1364 SV *prev_sv, *next_sv; 1569 SV *prev_sv, *next_sv;
1365 1570
1366 for (;;) 1571 for (;;)
1367 { 1572 {
1368 LOCK; 1573 LOCK;
1369 next_sv = coro_deq (aTHX_ PRIO_MIN); 1574 next_sv = coro_deq (aTHX);
1370 1575
1371 /* nothing to schedule: call the idle handler */ 1576 /* nothing to schedule: call the idle handler */
1372 if (expect_false (!next_sv)) 1577 if (expect_false (!next_sv))
1373 { 1578 {
1374 dSP; 1579 dSP;
1378 SAVETMPS; 1583 SAVETMPS;
1379 1584
1380 PUSHMARK (SP); 1585 PUSHMARK (SP);
1381 PUTBACK; 1586 PUTBACK;
1382 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1587 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1588 SPAGAIN;
1383 1589
1384 FREETMPS; 1590 FREETMPS;
1385 LEAVE; 1591 LEAVE;
1386 continue; 1592 continue;
1387 } 1593 }
1391 /* cannot transfer to destroyed coros, skip and look for next */ 1597 /* cannot transfer to destroyed coros, skip and look for next */
1392 if (expect_false (ta->next->flags & CF_DESTROYED)) 1598 if (expect_false (ta->next->flags & CF_DESTROYED))
1393 { 1599 {
1394 UNLOCK; 1600 UNLOCK;
1395 SvREFCNT_dec (next_sv); 1601 SvREFCNT_dec (next_sv);
1396 /* coro_nready is already taken care of by destroy */ 1602 /* coro_nready has already been taken care of by destroy */
1397 continue; 1603 continue;
1398 } 1604 }
1399 1605
1400 --coro_nready; 1606 --coro_nready;
1401 UNLOCK; 1607 UNLOCK;
1442{ 1648{
1443 dTHX; 1649 dTHX;
1444 struct transfer_args ta; 1650 struct transfer_args ta;
1445 1651
1446 prepare_schedule (aTHX_ &ta); 1652 prepare_schedule (aTHX_ &ta);
1447 TRANSFER (ta); 1653 TRANSFER (ta, 1);
1448} 1654}
1449 1655
1450static int 1656static int
1451api_cede (void) 1657api_cede (void)
1452{ 1658{
1455 1661
1456 prepare_cede (aTHX_ &ta); 1662 prepare_cede (aTHX_ &ta);
1457 1663
1458 if (expect_true (ta.prev != ta.next)) 1664 if (expect_true (ta.prev != ta.next))
1459 { 1665 {
1460 TRANSFER (ta); 1666 TRANSFER (ta, 1);
1461 return 1; 1667 return 1;
1462 } 1668 }
1463 else 1669 else
1464 return 0; 1670 return 0;
1465} 1671}
1470 dTHX; 1676 dTHX;
1471 struct transfer_args ta; 1677 struct transfer_args ta;
1472 1678
1473 if (prepare_cede_notself (aTHX_ &ta)) 1679 if (prepare_cede_notself (aTHX_ &ta))
1474 { 1680 {
1475 TRANSFER (ta); 1681 TRANSFER (ta, 1);
1476 return 1; 1682 return 1;
1477 } 1683 }
1478 else 1684 else
1479 return 0; 1685 return 0;
1480} 1686}
1486 struct coro *coro = SvSTATE (coro_sv); 1692 struct coro *coro = SvSTATE (coro_sv);
1487 1693
1488 if (flags & CC_TRACE) 1694 if (flags & CC_TRACE)
1489 { 1695 {
1490 if (!coro->cctx) 1696 if (!coro->cctx)
1491 coro->cctx = cctx_new (); 1697 coro->cctx = cctx_new_run ();
1492 else if (!(coro->cctx->flags & CC_TRACE)) 1698 else if (!(coro->cctx->flags & CC_TRACE))
1493 croak ("cannot enable tracing on coroutine with custom stack"); 1699 croak ("cannot enable tracing on coroutine with custom stack");
1494 1700
1495 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1701 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1496 } 1702 }
1503 else 1709 else
1504 coro->slot->runops = RUNOPS_DEFAULT; 1710 coro->slot->runops = RUNOPS_DEFAULT;
1505 } 1711 }
1506} 1712}
1507 1713
1714#if 0
1715static int
1716coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1717{
1718 AV *padlist;
1719 AV *av = (AV *)mg->mg_obj;
1720
1721 abort ();
1722
1723 return 0;
1724}
1725
1726static MGVTBL coro_gensub_vtbl = {
1727 0, 0, 0, 0,
1728 coro_gensub_free
1729};
1730#endif
1731
1732/*****************************************************************************/
1733/* PerlIO::cede */
1734
1735typedef struct
1736{
1737 PerlIOBuf base;
1738 NV next, every;
1739} PerlIOCede;
1740
1741static IV
1742PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1743{
1744 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1745
1746 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1747 self->next = nvtime () + self->every;
1748
1749 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1750}
1751
1752static SV *
1753PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1754{
1755 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1756
1757 return newSVnv (self->every);
1758}
1759
1760static IV
1761PerlIOCede_flush (pTHX_ PerlIO *f)
1762{
1763 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1764 double now = nvtime ();
1765
1766 if (now >= self->next)
1767 {
1768 api_cede ();
1769 self->next = now + self->every;
1770 }
1771
1772 return PerlIOBuf_flush (aTHX_ f);
1773}
1774
1775static PerlIO_funcs PerlIO_cede =
1776{
1777 sizeof(PerlIO_funcs),
1778 "cede",
1779 sizeof(PerlIOCede),
1780 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1781 PerlIOCede_pushed,
1782 PerlIOBuf_popped,
1783 PerlIOBuf_open,
1784 PerlIOBase_binmode,
1785 PerlIOCede_getarg,
1786 PerlIOBase_fileno,
1787 PerlIOBuf_dup,
1788 PerlIOBuf_read,
1789 PerlIOBuf_unread,
1790 PerlIOBuf_write,
1791 PerlIOBuf_seek,
1792 PerlIOBuf_tell,
1793 PerlIOBuf_close,
1794 PerlIOCede_flush,
1795 PerlIOBuf_fill,
1796 PerlIOBase_eof,
1797 PerlIOBase_error,
1798 PerlIOBase_clearerr,
1799 PerlIOBase_setlinebuf,
1800 PerlIOBuf_get_base,
1801 PerlIOBuf_bufsiz,
1802 PerlIOBuf_get_ptr,
1803 PerlIOBuf_get_cnt,
1804 PerlIOBuf_set_ptrcnt,
1805};
1806
1807
1508MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1808MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1509 1809
1510PROTOTYPES: DISABLE 1810PROTOTYPES: DISABLE
1511 1811
1512BOOT: 1812BOOT:
1513{ 1813{
1514#ifdef USE_ITHREADS 1814#ifdef USE_ITHREADS
1515 MUTEX_INIT (&coro_mutex); 1815 MUTEX_INIT (&coro_lock);
1816# if CORO_PTHREAD
1817 coro_thx = PERL_GET_CONTEXT;
1818# endif
1516#endif 1819#endif
1517 BOOT_PAGESIZE; 1820 BOOT_PAGESIZE;
1518 1821
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1822 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1823 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521 1824
1825 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1826 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1827 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1828
1522 hv_sig = coro_get_hv ("SIG", TRUE); 1829 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1830 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1831 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1528 1832
1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1833 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1530 1834
1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1835 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1836 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1537 main_top_env = PL_top_env; 1841 main_top_env = PL_top_env;
1538 1842
1539 while (main_top_env->je_prev) 1843 while (main_top_env->je_prev)
1540 main_top_env = main_top_env->je_prev; 1844 main_top_env = main_top_env->je_prev;
1541 1845
1542 coroapi.ver = CORO_API_VERSION; 1846 coroapi.ver = CORO_API_VERSION;
1847 coroapi.rev = CORO_API_REVISION;
1543 coroapi.transfer = api_transfer; 1848 coroapi.transfer = api_transfer;
1849
1850 {
1851 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1852
1853 if (!svp) croak ("Time::HiRes is required");
1854 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1855
1856 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1857 }
1544 1858
1545 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1859 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1546} 1860}
1547 1861
1548SV * 1862SV *
1549new (char *klass, ...) 1863new (char *klass, ...)
1550 CODE: 1864 CODE:
1551{ 1865{
1552 struct coro *coro; 1866 struct coro *coro;
1867 MAGIC *mg;
1553 HV *hv; 1868 HV *hv;
1554 int i; 1869 int i;
1555 1870
1556 Newz (0, coro, 1, struct coro); 1871 Newz (0, coro, 1, struct coro);
1557 coro->args = newAV (); 1872 coro->args = newAV ();
1560 if (coro_first) coro_first->prev = coro; 1875 if (coro_first) coro_first->prev = coro;
1561 coro->next = coro_first; 1876 coro->next = coro_first;
1562 coro_first = coro; 1877 coro_first = coro;
1563 1878
1564 coro->hv = hv = newHV (); 1879 coro->hv = hv = newHV ();
1565 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1880 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1881 mg->mg_flags |= MGf_DUP;
1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1882 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1567 1883
1568 av_extend (coro->args, items - 1); 1884 av_extend (coro->args, items - 1);
1569 for (i = 1; i < items; i++) 1885 for (i = 1; i < items; i++)
1570 av_push (coro->args, newSVsv (ST (i))); 1886 av_push (coro->args, newSVsv (ST (i)));
1576# function to increase chances that they all will call transfer with the same 1892# function to increase chances that they all will call transfer with the same
1577# stack offset 1893# stack offset
1578void 1894void
1579_set_stacklevel (...) 1895_set_stacklevel (...)
1580 ALIAS: 1896 ALIAS:
1581 Coro::State::transfer = 1 1897 Coro::State::transfer = 1
1582 Coro::schedule = 2 1898 Coro::schedule = 2
1583 Coro::cede = 3 1899 Coro::cede = 3
1584 Coro::cede_notself = 4 1900 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1587 PPCODE: 1901 CODE:
1588{ 1902{
1589 struct transfer_args ta; 1903 struct transfer_args ta;
1590 int again = 0;
1591 1904
1592 do 1905 PUTBACK;
1906 switch (ix)
1593 { 1907 {
1594 switch (ix)
1595 {
1596 case 0: 1908 case 0:
1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1909 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (ST (0)));
1598 ta.next = 0;
1599 break; 1910 break;
1600 1911
1601 case 1: 1912 case 1:
1602 if (items != 2) 1913 if (items != 2)
1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1914 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1604 1915
1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1)); 1916 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1606 break; 1917 break;
1607 1918
1608 case 2: 1919 case 2:
1609 prepare_schedule (aTHX_ &ta); 1920 prepare_schedule (aTHX_ &ta);
1610 break; 1921 break;
1611 1922
1612 case 3: 1923 case 3:
1613 prepare_cede (aTHX_ &ta); 1924 prepare_cede (aTHX_ &ta);
1614 break; 1925 break;
1615 1926
1616 case 4: 1927 case 4:
1617 if (!prepare_cede_notself (aTHX_ &ta)) 1928 if (!prepare_cede_notself (aTHX_ &ta))
1618 XSRETURN_EMPTY; 1929 XSRETURN_EMPTY;
1619 1930
1620 break; 1931 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1669 } 1932 }
1670 while (again); 1933 SPAGAIN;
1671 1934
1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1935 BARRIER;
1673 XSRETURN_YES; 1936 PUTBACK;
1674 1937 TRANSFER (ta, 0);
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */ 1938 SPAGAIN; /* might be the sp of a different coroutine now */
1939 /* be extra careful not to ever do anything after TRANSFER */
1676} 1940}
1677 1941
1678bool 1942bool
1679_destroy (SV *coro_sv) 1943_destroy (SV *coro_sv)
1680 CODE: 1944 CODE:
1681 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1945 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1682 OUTPUT: 1946 OUTPUT:
1683 RETVAL 1947 RETVAL
1684 1948
1685void 1949void
1686_exit (code) 1950_exit (int code)
1687 int code
1688 PROTOTYPE: $ 1951 PROTOTYPE: $
1689 CODE: 1952 CODE:
1690 _exit (code); 1953 _exit (code);
1691 1954
1692int 1955int
1693cctx_stacksize (int new_stacksize = 0) 1956cctx_stacksize (int new_stacksize = 0)
1694 CODE: 1957 CODE:
1695 RETVAL = coro_stacksize; 1958 RETVAL = cctx_stacksize;
1696 if (new_stacksize) 1959 if (new_stacksize)
1960 {
1697 coro_stacksize = new_stacksize; 1961 cctx_stacksize = new_stacksize;
1962 ++cctx_gen;
1963 }
1964 OUTPUT:
1965 RETVAL
1966
1967int
1968cctx_max_idle (int max_idle = 0)
1969 CODE:
1970 RETVAL = cctx_max_idle;
1971 if (max_idle > 1)
1972 cctx_max_idle = max_idle;
1698 OUTPUT: 1973 OUTPUT:
1699 RETVAL 1974 RETVAL
1700 1975
1701int 1976int
1702cctx_count () 1977cctx_count ()
1706 RETVAL 1981 RETVAL
1707 1982
1708int 1983int
1709cctx_idle () 1984cctx_idle ()
1710 CODE: 1985 CODE:
1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1986 RETVAL = cctx_idle;
1712 OUTPUT: 1987 OUTPUT:
1713 RETVAL 1988 RETVAL
1714 1989
1715void 1990void
1716list () 1991list ()
1726call (Coro::State coro, SV *coderef) 2001call (Coro::State coro, SV *coderef)
1727 ALIAS: 2002 ALIAS:
1728 eval = 1 2003 eval = 1
1729 CODE: 2004 CODE:
1730{ 2005{
1731 if (coro->mainstack) 2006 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1732 { 2007 {
1733 struct coro temp; 2008 struct coro temp;
1734 2009
1735 if (!(coro->flags & CF_RUNNING)) 2010 if (!(coro->flags & CF_RUNNING))
1736 { 2011 {
2012 PUTBACK;
1737 save_perl (aTHX_ &temp); 2013 save_perl (aTHX_ &temp);
1738 load_perl (aTHX_ coro); 2014 load_perl (aTHX_ coro);
1739 } 2015 }
1740 2016
1741 { 2017 {
1750 eval_sv (coderef, 0); 2026 eval_sv (coderef, 0);
1751 else 2027 else
1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 2028 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753 2029
1754 POPSTACK; 2030 POPSTACK;
2031 SPAGAIN;
1755 FREETMPS; 2032 FREETMPS;
1756 LEAVE; 2033 LEAVE;
2034 PUTBACK;
1757 } 2035 }
1758 2036
1759 if (!(coro->flags & CF_RUNNING)) 2037 if (!(coro->flags & CF_RUNNING))
1760 { 2038 {
1761 save_perl (aTHX_ coro); 2039 save_perl (aTHX_ coro);
1762 load_perl (aTHX_ &temp); 2040 load_perl (aTHX_ &temp);
2041 SPAGAIN;
1763 } 2042 }
1764 } 2043 }
1765} 2044}
1766 2045
1767SV * 2046SV *
1776 RETVAL = boolSV (coro->flags & ix); 2055 RETVAL = boolSV (coro->flags & ix);
1777 OUTPUT: 2056 OUTPUT:
1778 RETVAL 2057 RETVAL
1779 2058
1780void 2059void
2060throw (Coro::State self, SV *throw = &PL_sv_undef)
2061 PROTOTYPE: $;$
2062 CODE:
2063 SvREFCNT_dec (self->throw);
2064 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2065
2066void
1781api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2067api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1782 2068
1783SV * 2069SV *
1784has_stack (Coro::State coro) 2070has_cctx (Coro::State coro)
1785 PROTOTYPE: $ 2071 PROTOTYPE: $
1786 CODE: 2072 CODE:
1787 RETVAL = boolSV (!!coro->cctx); 2073 RETVAL = boolSV (!!coro->cctx);
1788 OUTPUT: 2074 OUTPUT:
1789 RETVAL 2075 RETVAL
1794 CODE: 2080 CODE:
1795 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2081 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1796 OUTPUT: 2082 OUTPUT:
1797 RETVAL 2083 RETVAL
1798 2084
1799IV 2085UV
1800rss (Coro::State coro) 2086rss (Coro::State coro)
1801 PROTOTYPE: $ 2087 PROTOTYPE: $
1802 ALIAS: 2088 ALIAS:
1803 usecount = 1 2089 usecount = 1
1804 CODE: 2090 CODE:
1808 case 1: RETVAL = coro->usecount; break; 2094 case 1: RETVAL = coro->usecount; break;
1809 } 2095 }
1810 OUTPUT: 2096 OUTPUT:
1811 RETVAL 2097 RETVAL
1812 2098
2099void
2100force_cctx ()
2101 CODE:
2102 struct coro *coro = SvSTATE (coro_current);
2103 coro->cctx->idle_sp = 0;
2104
2105void
2106swap_defsv (Coro::State self)
2107 PROTOTYPE: $
2108 ALIAS:
2109 swap_defav = 1
2110 CODE:
2111 if (!self->slot)
2112 croak ("cannot swap state with coroutine that has no saved state");
2113 else
2114 {
2115 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2116 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2117
2118 SV *tmp = *src; *src = *dst; *dst = tmp;
2119 }
1813 2120
1814MODULE = Coro::State PACKAGE = Coro 2121MODULE = Coro::State PACKAGE = Coro
1815 2122
1816BOOT: 2123BOOT:
1817{ 2124{
1818 int i; 2125 int i;
1819 2126
1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2127 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2128 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2129 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1823 2130
1824 coro_current = coro_get_sv ("Coro::current", FALSE); 2131 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1825 SvREADONLY_on (coro_current); 2132 SvREADONLY_on (coro_current);
1826 2133
1827 coro_stash = gv_stashpv ("Coro", TRUE); 2134 coro_stash = gv_stashpv ("Coro", TRUE);
1828 2135
1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2136 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1857void 2164void
1858_set_current (SV *current) 2165_set_current (SV *current)
1859 PROTOTYPE: $ 2166 PROTOTYPE: $
1860 CODE: 2167 CODE:
1861 SvREFCNT_dec (SvRV (coro_current)); 2168 SvREFCNT_dec (SvRV (coro_current));
1862 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2169 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2170
2171void
2172_set_readyhook (SV *hook)
2173 PROTOTYPE: $
2174 CODE:
2175 LOCK;
2176 SvREFCNT_dec (coro_readyhook);
2177 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2178 UNLOCK;
1863 2179
1864int 2180int
1865prio (Coro::State coro, int newprio = 0) 2181prio (Coro::State coro, int newprio = 0)
1866 ALIAS: 2182 ALIAS:
1867 nice = 1 2183 nice = 1
1897 CODE: 2213 CODE:
1898 RETVAL = coro_nready; 2214 RETVAL = coro_nready;
1899 OUTPUT: 2215 OUTPUT:
1900 RETVAL 2216 RETVAL
1901 2217
1902void
1903throw (Coro::State self, SV *throw = &PL_sv_undef)
1904 PROTOTYPE: $;$
1905 CODE:
1906 SvREFCNT_dec (self->throw);
1907 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1908
1909# for async_pool speedup 2218# for async_pool speedup
1910void 2219void
1911_pool_1 (SV *cb) 2220_pool_1 (SV *cb)
1912 CODE: 2221 CODE:
1913{ 2222{
1914 struct coro *coro = SvSTATE (coro_current); 2223 struct coro *coro = SvSTATE (coro_current);
1915 HV *hv = (HV *)SvRV (coro_current); 2224 HV *hv = (HV *)SvRV (coro_current);
1916 AV *defav = GvAV (PL_defgv); 2225 AV *defav = GvAV (PL_defgv);
1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2226 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1918 AV *invoke_av; 2227 AV *invoke_av;
1919 int i, len; 2228 int i, len;
1920 2229
1921 if (!invoke) 2230 if (!invoke)
2231 {
2232 SV *old = PL_diehook;
2233 PL_diehook = 0;
2234 SvREFCNT_dec (old);
1922 croak ("\3async_pool terminate\2\n"); 2235 croak ("\3async_pool terminate\2\n");
2236 }
1923 2237
1924 SvREFCNT_dec (coro->saved_deffh); 2238 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2239 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1926 2240
1927 hv_store (hv, "desc", sizeof ("desc") - 1, 2241 hv_store (hv, "desc", sizeof ("desc") - 1,
1928 newSVpvn (strpair ("[async_pool]")), 0); 2242 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1929 2243
1930 invoke_av = (AV *)SvRV (invoke); 2244 invoke_av = (AV *)SvRV (invoke);
1931 len = av_len (invoke_av); 2245 len = av_len (invoke_av);
1932 2246
1933 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2247 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1934 2248
1935 if (len > 0) 2249 if (len > 0)
1936 { 2250 {
1937 av_fill (defav, len - 1); 2251 av_fill (defav, len - 1);
1938 for (i = 0; i < len; ++i) 2252 for (i = 0; i < len; ++i)
1939 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2253 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1940 } 2254 }
1941 2255
1942 SvREFCNT_dec (invoke); 2256 SvREFCNT_dec (invoke);
1943} 2257}
1944 2258
1951 sv_setsv (cb, &PL_sv_undef); 2265 sv_setsv (cb, &PL_sv_undef);
1952 2266
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2267 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0; 2268 coro->saved_deffh = 0;
1955 2269
1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2270 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2271 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2272 {
2273 SV *old = PL_diehook;
2274 PL_diehook = 0;
2275 SvREFCNT_dec (old);
1958 croak ("\3async_pool terminate\2\n"); 2276 croak ("\3async_pool terminate\2\n");
2277 }
1959 2278
1960 av_clear (GvAV (PL_defgv)); 2279 av_clear (GvAV (PL_defgv));
1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2280 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1962 newSVpvn (strpair ("[async_pool idle]")), 0); 2281 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1963 2282
1964 coro->prio = 0; 2283 coro->prio = 0;
1965 2284
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2285 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0); 2286 api_trace (coro_current, 0);
1968 2287
1969 av_push (av_async_pool, newSVsv (coro_current)); 2288 av_push (av_async_pool, newSVsv (coro_current));
1970} 2289}
1971 2290
2291#if 0
2292
2293void
2294_generator_call (...)
2295 PROTOTYPE: @
2296 PPCODE:
2297 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2298 xxxx
2299 abort ();
2300
2301SV *
2302gensub (SV *sub, ...)
2303 PROTOTYPE: &;@
2304 CODE:
2305{
2306 struct coro *coro;
2307 MAGIC *mg;
2308 CV *xcv;
2309 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2310 int i;
2311
2312 CvGV (ncv) = CvGV (cv);
2313 CvFILE (ncv) = CvFILE (cv);
2314
2315 Newz (0, coro, 1, struct coro);
2316 coro->args = newAV ();
2317 coro->flags = CF_NEW;
2318
2319 av_extend (coro->args, items - 1);
2320 for (i = 1; i < items; i++)
2321 av_push (coro->args, newSVsv (ST (i)));
2322
2323 CvISXSUB_on (ncv);
2324 CvXSUBANY (ncv).any_ptr = (void *)coro;
2325
2326 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2327
2328 CvXSUB (ncv) = CvXSUB (xcv);
2329 CvANON_on (ncv);
2330
2331 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2332 RETVAL = newRV_noinc ((SV *)ncv);
2333}
2334 OUTPUT:
2335 RETVAL
2336
2337#endif
2338
1972 2339
1973MODULE = Coro::State PACKAGE = Coro::AIO 2340MODULE = Coro::State PACKAGE = Coro::AIO
1974 2341
1975SV * 2342void
1976_get_state () 2343_get_state (SV *self)
1977 CODE: 2344 PPCODE:
1978{ 2345{
1979 struct io_state *data; 2346 AV *defav = GvAV (PL_defgv);
1980 2347 AV *av = newAV ();
2348 int i;
1981 RETVAL = newSV (sizeof (struct io_state)); 2349 SV *data_sv = newSV (sizeof (struct io_state));
1982 data = (struct io_state *)SvPVX (RETVAL); 2350 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1983 SvCUR_set (RETVAL, sizeof (struct io_state)); 2351 SvCUR_set (data_sv, sizeof (struct io_state));
1984 SvPOK_only (RETVAL); 2352 SvPOK_only (data_sv);
1985 2353
1986 data->errorno = errno; 2354 data->errorno = errno;
1987 data->laststype = PL_laststype; 2355 data->laststype = PL_laststype;
1988 data->laststatval = PL_laststatval; 2356 data->laststatval = PL_laststatval;
1989 data->statcache = PL_statcache; 2357 data->statcache = PL_statcache;
2358
2359 av_extend (av, AvFILLp (defav) + 1 + 1);
2360
2361 for (i = 0; i <= AvFILLp (defav); ++i)
2362 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2363
2364 av_push (av, data_sv);
2365
2366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2367
2368 api_ready (self);
1990} 2369}
1991 OUTPUT:
1992 RETVAL
1993 2370
1994void 2371void
1995_set_state (char *data_) 2372_set_state (SV *state)
1996 PROTOTYPE: $ 2373 PROTOTYPE: $
1997 CODE: 2374 PPCODE:
1998{ 2375{
1999 struct io_state *data = (void *)data_; 2376 AV *av = (AV *)SvRV (state);
2377 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2378 int i;
2000 2379
2001 errno = data->errorno; 2380 errno = data->errorno;
2002 PL_laststype = data->laststype; 2381 PL_laststype = data->laststype;
2003 PL_laststatval = data->laststatval; 2382 PL_laststatval = data->laststatval;
2004 PL_statcache = data->statcache; 2383 PL_statcache = data->statcache;
2005}
2006 2384
2385 EXTEND (SP, AvFILLp (av));
2386 for (i = 0; i < AvFILLp (av); ++i)
2387 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2388}
2389
2390
2391MODULE = Coro::State PACKAGE = Coro::AnyEvent
2392
2393BOOT:
2394 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2395
2396SV *
2397_schedule (...)
2398 PROTOTYPE: @
2399 CODE:
2400{
2401 static int incede;
2402
2403 api_cede_notself ();
2404
2405 ++incede;
2406 while (coro_nready >= incede && api_cede ())
2407 ;
2408
2409 sv_setsv (sv_activity, &PL_sv_undef);
2410 if (coro_nready >= incede)
2411 {
2412 PUSHMARK (SP);
2413 PUTBACK;
2414 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2415 SPAGAIN;
2416 }
2417
2418 --incede;
2419}
2420
2421
2422MODULE = Coro::State PACKAGE = PerlIO::cede
2423
2424BOOT:
2425 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines