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.301 by root, Wed Nov 19 02:41:31 2008 UTC vs.
Revision 1.337 by root, Fri Dec 5 18:26:10 2008 UTC

16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline 143# define INLINE static inline
167static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 174static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
172static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 184static SV *rv_diehook;
175static SV *rv_warnhook; 185static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
177 187
178/* async_pool helper stuff */ 188/* async_pool helper stuff */
179static SV *sv_pool_rss; 189static SV *sv_pool_rss;
180static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
182 196
183/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
184static SV *sv_activity; 198static SV *sv_activity;
185 199
186static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
215 int valgrind_id; 229 int valgrind_id;
216#endif 230#endif
217 unsigned char flags; 231 unsigned char flags;
218} coro_cctx; 232} coro_cctx;
219 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
220enum { 238enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
229{ 247{
230 SV *defsv; 248 SV *defsv;
231 AV *defav; 249 AV *defav;
232 SV *errsv; 250 SV *errsv;
233 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
234#define VAR(name,type) type name; 253#define VAR(name,type) type name;
235# include "state.h" 254# include "state.h"
236#undef VAR 255#undef VAR
237} perl_slots; 256} perl_slots;
238 257
246 /* state data */ 265 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 267 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
250 269
270 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
256 276
257 /* statistics */ 277 /* statistics */
258 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
259 279
260 /* coro process data */ 280 /* coro process data */
261 int prio; 281 int prio;
262 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
263 284
264 /* async_pool */ 285 /* async_pool */
265 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
266 289
267 /* linked list */ 290 /* linked list */
268 struct coro *next, *prev; 291 struct coro *next, *prev;
269}; 292};
270 293
287 310
288/* for Coro.pm */ 311/* for Coro.pm */
289static SV *coro_current; 312static SV *coro_current;
290static SV *coro_readyhook; 313static SV *coro_readyhook;
291static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
315static CV *cv_coro_run, *cv_coro_terminate;
292static struct coro *coro_first; 316static struct coro *coro_first;
293#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
294 318
295/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
296 320
322 get_hv (name, create); 346 get_hv (name, create);
323#endif 347#endif
324 return get_hv (name, create); 348 return get_hv (name, create);
325} 349}
326 350
351/* may croak */
352INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv)
354{
355 HV *st;
356 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
327static AV * 412static AV *
328coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
329{ 414{
330 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
332 417
333 newpadlist = newAV (); 418 newpadlist = newAV ();
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 424#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 426 --AvFILLp (padlist);
342 427
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
345 430
346 return newpadlist; 431 return newpadlist;
347} 432}
348 433
349static void 434static void
350free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
351{ 436{
352 /* may be during global destruction */ 437 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
354 { 439 {
355 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
356 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
357 { 443 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
359 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 446 I32 j = AvFILLp (av);
361 SV *sv; 447
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 453 }
368 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
370 } 459 }
371} 460}
372 461
373static int 462static int
382 471
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 473
385 return 0; 474 return 0;
386} 475}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 476
391static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 478 0, 0, 0, 0,
393 coro_cv_free 479 coro_cv_free
394}; 480};
395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
401#define CORO_MAGIC(sv, type) \
402 (expect_true (SvMAGIC (sv)) \
403 ? CORO_MAGIC_NN (sv, type) \
404 : 0)
405
406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
408
409INLINE struct coro *
410SvSTATE_ (pTHX_ SV *coro)
411{
412 HV *stash;
413 MAGIC *mg;
414
415 if (SvROK (coro))
416 coro = SvRV (coro);
417
418 if (expect_false (SvTYPE (coro) != SVt_PVHV))
419 croak ("Coro::State object required");
420
421 stash = SvSTASH (coro);
422 if (expect_false (stash != coro_stash && stash != coro_state_stash))
423 {
424 /* very slow, but rare, check */
425 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
426 croak ("Coro::State object required");
427 }
428
429 mg = CORO_MAGIC_state (coro);
430 return (struct coro *)mg->mg_ptr;
431}
432
433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
438 481
439/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
440static void 483static void
441get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
442{ 485{
448 else 491 else
449 { 492 {
450#if CORO_PREFER_PERL_FUNCTIONS 493#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 494 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 495 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
457#else 500#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 502#endif
460 } 503 }
461} 504}
462 505
463static void 506static void
470 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
471 514
472 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
473 516
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
476 519
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 521}
479 522
480/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
485 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
486 c->slot = 0; 529 c->slot = 0;
487 530
488 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
489 532
490 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
494 538
495 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 540 # include "state.h"
497 #undef VAR 541 #undef VAR
498 542
584 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
585 629
586 { 630 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 632
589 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
593 638
594 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 640 # include "state.h"
596 #undef VAR 641 #undef VAR
597 } 642 }
602 * of perl.c:init_stacks, except that it uses less memory 647 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 648 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 649 * not usually need a lot of stackspace.
605 */ 650 */
606#if CORO_PREFER_PERL_FUNCTIONS 651#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 652# define coro_init_stacks(thx) init_stacks ()
608#else 653#else
609static void 654static void
610coro_init_stacks (pTHX) 655coro_init_stacks (pTHX)
611{ 656{
612 PL_curstackinfo = new_stackinfo(32, 8); 657 PL_curstackinfo = new_stackinfo(32, 8);
675#if !PERL_VERSION_ATLEAST (5,10,0) 720#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 721 Safefree (PL_retstack);
677#endif 722#endif
678} 723}
679 724
725#define CORO_RSS \
726 rss += sizeof (SYM (curstackinfo)); \
727 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
728 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
729 rss += SYM (tmps_max) * sizeof (SV *); \
730 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
731 rss += SYM (scopestack_max) * sizeof (I32); \
732 rss += SYM (savestack_max) * sizeof (ANY);
733
680static size_t 734static size_t
681coro_rss (pTHX_ struct coro *coro) 735coro_rss (pTHX_ struct coro *coro)
682{ 736{
683 size_t rss = sizeof (*coro); 737 size_t rss = sizeof (*coro);
684 738
685 if (coro->mainstack) 739 if (coro->mainstack)
686 { 740 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 741 if (coro->flags & CF_RUNNING)
691 { 742 {
692 slot = &tmp_slot; 743 #define SYM(sym) PL_ ## sym
693 744 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 745 #undef SYM
697 } 746 }
698 else 747 else
699 slot = coro->slot;
700
701 if (slot)
702 { 748 {
703 rss += sizeof (slot->curstackinfo); 749 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 750 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 751 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 752 }
715 } 753 }
716 754
717 return rss; 755 return rss;
718} 756}
820slf_check_nop (pTHX_ struct CoroSLF *frame) 858slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 859{
822 return 0; 860 return 0;
823} 861}
824 862
863static int
864slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{
866 return 1;
867}
868
825static UNOP coro_setup_op; 869static UNOP coro_setup_op;
826 870
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 871static void NOINLINE /* noinline to keep it out of the transfer fast path */
828coro_setup (pTHX_ struct coro *coro) 872coro_setup (pTHX_ struct coro *coro)
829{ 873{
834 878
835 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 886 PL_curpm = 0;
840 PL_curpad = 0; 887 PL_curpad = 0;
841 PL_localizing = 0; 888 PL_localizing = 0;
842 PL_dirty = 0; 889 PL_dirty = 0;
843 PL_restartop = 0; 890 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 892 PL_parser = 0;
846#endif 893#endif
894 PL_hints = 0;
847 895
848 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
850 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 899
852 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 907
859 { 908 {
860 dSP; 909 dSP;
861 UNOP myop; 910 UNOP myop;
862 911
863 Zero (&myop, 1, UNOP); 912 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 913 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 915 myop.op_flags = OPf_WANT_VOID;
866 916
867 PUSHMARK (SP); 917 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 918 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 919 PUTBACK;
870 PL_op = (OP *)&myop; 920 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 922 }
874 923
875 /* this newly created coroutine might be run on an existing cctx which most 924 /* this newly created coroutine might be run on an existing cctx which most
876 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 926 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
879 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 929
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op; 931 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 932 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 933 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 934 /* no flags etc. required, as an init function won't be called */
886 935
887 PL_op = (OP *)&coro_setup_op; 936 PL_op = (OP *)&coro_setup_op;
888 937
889 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
890 CORO_THROW = coro->except; 939 CORO_THROW = coro->except;
891} 940}
892 941
893static void 942static void
894coro_destruct (pTHX_ struct coro *coro) 943coro_unwind_stacks (pTHX)
895{ 944{
896 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
897 { 946 {
898 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
907 POPSTACK_TO (PL_mainstack); 956 POPSTACK_TO (PL_mainstack);
908 957
909 /* unwind main stack */ 958 /* unwind main stack */
910 dounwind (-1); 959 dounwind (-1);
911 } 960 }
961}
962
963static void
964coro_destruct_perl (pTHX_ struct coro *coro)
965{
966 coro_unwind_stacks (aTHX);
912 967
913 SvREFCNT_dec (GvSV (PL_defgv)); 968 SvREFCNT_dec (GvSV (PL_defgv));
914 SvREFCNT_dec (GvAV (PL_defgv)); 969 SvREFCNT_dec (GvAV (PL_defgv));
915 SvREFCNT_dec (GvSV (PL_errgv)); 970 SvREFCNT_dec (GvSV (PL_errgv));
916 SvREFCNT_dec (PL_defoutgv); 971 SvREFCNT_dec (PL_defoutgv);
917 SvREFCNT_dec (PL_rs); 972 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv)); 973 SvREFCNT_dec (GvSV (irsgv));
974 SvREFCNT_dec (GvHV (PL_hintgv));
919 975
920 SvREFCNT_dec (PL_diehook); 976 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook); 977 SvREFCNT_dec (PL_warnhook);
922 978
923 SvREFCNT_dec (coro->saved_deffh); 979 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 980 SvREFCNT_dec (coro->rouse_cb);
981 SvREFCNT_dec (coro->invoke_cb);
982 SvREFCNT_dec (coro->invoke_av);
925 983
926 coro_destruct_stacks (aTHX); 984 coro_destruct_stacks (aTHX);
927} 985}
928 986
929INLINE void 987INLINE void
939static int 997static int
940runops_trace (pTHX) 998runops_trace (pTHX)
941{ 999{
942 COP *oldcop = 0; 1000 COP *oldcop = 0;
943 int oldcxix = -2; 1001 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1002
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1003 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1004 {
949 PERL_ASYNC_CHECK (); 1005 PERL_ASYNC_CHECK ();
950 1006
951 if (cctx->flags & CC_TRACE_ALL) 1007 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1008 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1009 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 1010 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1011 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1012 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1013 AV *av = newAV (); /* return values */
958 SV **cb; 1014 SV **cb;
995 1051
996 if (PL_curcop != &PL_compiling) 1052 if (PL_curcop != &PL_compiling)
997 { 1053 {
998 SV **cb; 1054 SV **cb;
999 1055
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1056 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1057 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1058 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1059
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1060 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1061 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1062 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1063 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1064 SV *fullname = sv_2mortal (newSV (0));
1010 1065
1011 if (isGV (gv)) 1066 if (isGV (gv))
1016 SAVETMPS; 1071 SAVETMPS;
1017 EXTEND (SP, 3); 1072 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1073 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1074 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1075 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1076 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1077 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1078 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1024 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1079 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1080 SPAGAIN;
1026 FREETMPS; 1081 FREETMPS;
1029 } 1084 }
1030 1085
1031 oldcxix = cxstack_ix; 1086 oldcxix = cxstack_ix;
1032 } 1087 }
1033 1088
1034 if (cctx->flags & CC_TRACE_LINE) 1089 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1090 {
1036 dSP; 1091 dSP;
1037 1092
1038 PL_runops = RUNOPS_DEFAULT; 1093 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1094 ENTER;
1058 1113
1059 TAINT_NOT; 1114 TAINT_NOT;
1060 return 0; 1115 return 0;
1061} 1116}
1062 1117
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1118static struct CoroSLF cctx_ssl_frame;
1065 1119
1066static void 1120static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1121slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1122{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1123 ta->prev = 0;
1071} 1124}
1072 1125
1073static int 1126static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1127slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1128{
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1131 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1132}
1080 1133
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1134/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1135static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1136cctx_prepare (pTHX)
1084{ 1137{
1085 PL_top_env = &PL_start_env; 1138 PL_top_env = &PL_start_env;
1086 1139
1087 if (cctx->flags & CC_TRACE) 1140 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1141 PL_runops = runops_trace;
1089 1142
1090 /* we already must be executing an SLF op, there is no other valid way 1143 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1144 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1145 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1146 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1147
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1148 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1149 cctx_ssl_frame = slf_frame;
1098 1150
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1151 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1152 slf_frame.check = slf_check_set_stacklevel;
1101} 1153}
1124 /* normally we would need to skip the entersub here */ 1176 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1177 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1178 /* PL_nop = PL_nop->op_next */
1127 1179
1128 /* inject a fake subroutine call to cctx_init */ 1180 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1181 cctx_prepare (aTHX);
1130 1182
1131 /* cctx_run is the alternative tail of transfer() */ 1183 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1184 transfer_tail (aTHX);
1133 1185
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1186 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1187 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1188 perl_run (PL_curinterp);
1189 /*
1190 * Unfortunately, there is no way to get at the return values of the
1191 * coro body here, as perl_run destroys these
1192 */
1137 1193
1138 /* 1194 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1195 * If perl-run returns we assume exit() was being called or the coro
1140 * fell off the end, which seems to be the only valid (non-bug) 1196 * fell off the end, which seems to be the only valid (non-bug)
1141 * reason for perl_run to return. We try to exit by jumping to the 1197 * reason for perl_run to return. We try to exit by jumping to the
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1198 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1199 * coroutine as Coro has no such concept.
1200 * This actually isn't valid with the pthread backend, but OSes requiring
1201 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1202 */
1145 PL_top_env = main_top_env; 1203 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1204 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1205 }
1148} 1206}
1225cctx_destroy (coro_cctx *cctx) 1283cctx_destroy (coro_cctx *cctx)
1226{ 1284{
1227 if (!cctx) 1285 if (!cctx)
1228 return; 1286 return;
1229 1287
1288 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1289
1230 --cctx_count; 1290 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1291 coro_destroy (&cctx->cctx);
1232 1292
1233 /* coro_transfer creates new, empty cctx's */ 1293 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1294 if (cctx->sptr)
1297 /* TODO: throwing up here is considered harmful */ 1357 /* TODO: throwing up here is considered harmful */
1298 1358
1299 if (expect_true (prev != next)) 1359 if (expect_true (prev != next))
1300 { 1360 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1362 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1303 1363
1304 if (expect_false (next->flags & CF_RUNNING)) 1364 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306 1366
1307 if (expect_false (next->flags & CF_DESTROYED)) 1367 if (expect_false (next->flags & CF_DESTROYED))
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1379transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1380{
1321 dSTACKLEVEL; 1381 dSTACKLEVEL;
1322 1382
1323 /* sometimes transfer is only called to set idle_sp */ 1383 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1384 if (expect_false (!prev))
1325 { 1385 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1386 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1387 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1388 }
1329 else if (expect_true (prev != next)) 1389 else if (expect_true (prev != next))
1330 { 1390 {
1331 coro_cctx *prev__cctx; 1391 coro_cctx *cctx_prev;
1332 1392
1333 if (expect_false (prev->flags & CF_NEW)) 1393 if (expect_false (prev->flags & CF_NEW))
1334 { 1394 {
1335 /* create a new empty/source context */ 1395 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1396 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1397 prev->flags |= CF_RUNNING;
1339 } 1398 }
1340 1399
1341 prev->flags &= ~CF_RUNNING; 1400 prev->flags &= ~CF_RUNNING;
1352 coro_setup (aTHX_ next); 1411 coro_setup (aTHX_ next);
1353 } 1412 }
1354 else 1413 else
1355 load_perl (aTHX_ next); 1414 load_perl (aTHX_ next);
1356 1415
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1416 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1417 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1418 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1419 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1420 && !force_cctx
1364 )) 1421 ))
1365 { 1422 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1423 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1424 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1425
1369 prev->cctx = 0;
1370
1371 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1426 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1372 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1427 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1428 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1429 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1430 next->cctx = cctx_get (aTHX);
1376 1431
1377 cctx_put (prev__cctx); 1432 cctx_put (cctx_current);
1378 } 1433 }
1434 else
1435 prev->cctx = cctx_current;
1379 1436
1380 ++next->usecount; 1437 ++next->usecount;
1381 1438
1382 if (expect_true (!next->cctx)) 1439 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1440 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1441
1385 if (expect_false (prev__cctx != next->cctx)) 1442 next->cctx = 0;
1443
1444 if (expect_false (cctx_prev != cctx_current))
1386 { 1445 {
1387 prev__cctx->top_env = PL_top_env; 1446 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1447 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1448 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1449 }
1391 1450
1392 transfer_tail (aTHX); 1451 transfer_tail (aTHX);
1393 } 1452 }
1394} 1453}
1416 --coro_nready; 1475 --coro_nready;
1417 } 1476 }
1418 else 1477 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1478 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1479
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1480 if (coro->mainstack
1481 && coro->mainstack != main_mainstack
1482 && coro->slot
1483 && !PL_dirty)
1422 { 1484 {
1423 struct coro temp; 1485 struct coro temp;
1424 1486
1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1426 1488
1427 save_perl (aTHX_ &temp); 1489 save_perl (aTHX_ &temp);
1428 load_perl (aTHX_ coro); 1490 load_perl (aTHX_ coro);
1429 1491
1430 coro_destruct (aTHX_ coro); 1492 coro_destruct_perl (aTHX_ coro);
1431 1493
1432 load_perl (aTHX_ &temp); 1494 load_perl (aTHX_ &temp);
1433 1495
1434 coro->slot = 0; 1496 coro->slot = 0;
1435 } 1497 }
1436 1498
1437 cctx_destroy (coro->cctx); 1499 cctx_destroy (coro->cctx);
1500 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1501 SvREFCNT_dec (coro->args);
1502 SvREFCNT_dec (CORO_THROW);
1439 1503
1440 if (coro->next) coro->next->prev = coro->prev; 1504 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1505 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1506 if (coro == coro_first) coro_first = coro->next;
1443 1507
1497 1561
1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1562 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1499 TRANSFER (ta, 1); 1563 TRANSFER (ta, 1);
1500} 1564}
1501 1565
1566/*****************************************************************************/
1567/* gensub: simple closure generation utility */
1568
1569#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1570
1571/* create a closure from XS, returns a code reference */
1572/* the arg can be accessed via GENSUB_ARG from the callback */
1573/* the callback must use dXSARGS/XSRETURN */
1574static SV *
1575gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1576{
1577 CV *cv = (CV *)newSV (0);
1578
1579 sv_upgrade ((SV *)cv, SVt_PVCV);
1580
1581 CvANON_on (cv);
1582 CvISXSUB_on (cv);
1583 CvXSUB (cv) = xsub;
1584 GENSUB_ARG = arg;
1585
1586 return newRV_noinc ((SV *)cv);
1587}
1588
1502/** Coro ********************************************************************/ 1589/** Coro ********************************************************************/
1503 1590
1504INLINE void 1591INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1592coro_enq (pTHX_ struct coro *coro)
1506{ 1593{
1524{ 1611{
1525 struct coro *coro; 1612 struct coro *coro;
1526 SV *sv_hook; 1613 SV *sv_hook;
1527 void (*xs_hook)(void); 1614 void (*xs_hook)(void);
1528 1615
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1616 coro = SvSTATE (coro_sv);
1533 1617
1534 if (coro->flags & CF_READY) 1618 if (coro->flags & CF_READY)
1535 return 0; 1619 return 0;
1536 1620
1567api_is_ready (pTHX_ SV *coro_sv) 1651api_is_ready (pTHX_ SV *coro_sv)
1568{ 1652{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1653 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1654}
1571 1655
1656/* expects to own a reference to next->hv */
1572INLINE void 1657INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1658prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1659{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1660 SV *prev_sv = SvRV (coro_current);
1661
1614 ta->prev = SvSTATE_hv (prev_sv); 1662 ta->prev = SvSTATE_hv (prev_sv);
1663 ta->next = next;
1664
1615 TRANSFER_CHECK (*ta); 1665 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1666
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1667 SvRV_set (coro_current, (SV *)next->hv);
1619 1668
1620 free_coro_mortal (aTHX); 1669 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1670 coro_mortal = prev_sv;
1622} 1671}
1623 1672
1673static void
1674prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1675{
1676 for (;;)
1677 {
1678 SV *next_sv = coro_deq (aTHX);
1679
1680 if (expect_true (next_sv))
1681 {
1682 struct coro *next = SvSTATE_hv (next_sv);
1683
1684 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED))
1686 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1687 else
1688 {
1689 next->flags &= ~CF_READY;
1690 --coro_nready;
1691
1692 prepare_schedule_to (aTHX_ ta, next);
1693 break;
1694 }
1695 }
1696 else
1697 {
1698 /* nothing to schedule: call the idle handler */
1699 if (SvROK (sv_idle)
1700 && SvOBJECT (SvRV (sv_idle)))
1701 {
1702 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1703 api_ready (aTHX_ SvRV (sv_idle));
1704 --coro_nready;
1705 }
1706 else
1707 {
1708 dSP;
1709
1710 ENTER;
1711 SAVETMPS;
1712
1713 PUSHMARK (SP);
1714 PUTBACK;
1715 call_sv (sv_idle, G_VOID | G_DISCARD);
1716
1717 FREETMPS;
1718 LEAVE;
1719 }
1720 }
1721 }
1722}
1723
1624INLINE void 1724INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1725prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1726{
1627 api_ready (aTHX_ coro_current); 1727 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1728 prepare_schedule (aTHX_ ta);
1647{ 1747{
1648 struct coro_transfer_args ta; 1748 struct coro_transfer_args ta;
1649 1749
1650 prepare_schedule (aTHX_ &ta); 1750 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1751 TRANSFER (ta, 1);
1752}
1753
1754static void
1755api_schedule_to (pTHX_ SV *coro_sv)
1756{
1757 struct coro_transfer_args ta;
1758 struct coro *next = SvSTATE (coro_sv);
1759
1760 SvREFCNT_inc_NN (coro_sv);
1761 prepare_schedule_to (aTHX_ &ta, next);
1652} 1762}
1653 1763
1654static int 1764static int
1655api_cede (pTHX) 1765api_cede (pTHX)
1656{ 1766{
1685static void 1795static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1796api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1797{
1688 struct coro *coro = SvSTATE (coro_sv); 1798 struct coro *coro = SvSTATE (coro_sv);
1689 1799
1800 if (coro->flags & CF_RUNNING)
1801 croak ("cannot enable tracing on a running coroutine, caught");
1802
1690 if (flags & CC_TRACE) 1803 if (flags & CC_TRACE)
1691 { 1804 {
1692 if (!coro->cctx) 1805 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1806 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1807 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1808 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1809
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1810 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1811 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1812 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1813 {
1703 if (coro->flags & CF_RUNNING) 1816 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1817 PL_runops = RUNOPS_DEFAULT;
1705 else 1818 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1819 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1820 }
1821}
1822
1823static void
1824coro_call_on_destroy (pTHX_ struct coro *coro)
1825{
1826 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1827 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1828
1829 if (on_destroyp)
1830 {
1831 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1832
1833 while (AvFILLp (on_destroy) >= 0)
1834 {
1835 dSP; /* don't disturb outer sp */
1836 SV *cb = av_pop (on_destroy);
1837
1838 PUSHMARK (SP);
1839
1840 if (statusp)
1841 {
1842 int i;
1843 AV *status = (AV *)SvRV (*statusp);
1844 EXTEND (SP, AvFILLp (status) + 1);
1845
1846 for (i = 0; i <= AvFILLp (status); ++i)
1847 PUSHs (AvARRAY (status)[i]);
1848 }
1849
1850 PUTBACK;
1851 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1852 }
1853 }
1854}
1855
1856static void
1857slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1858{
1859 int i;
1860 HV *hv = (HV *)SvRV (coro_current);
1861 AV *av = newAV ();
1862
1863 av_extend (av, items - 1);
1864 for (i = 0; i < items; ++i)
1865 av_push (av, SvREFCNT_inc_NN (arg [i]));
1866
1867 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1868
1869 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1870 api_ready (aTHX_ sv_manager);
1871
1872 frame->prepare = prepare_schedule;
1873 frame->check = slf_check_repeat;
1874
1875 /* as a minor optimisation, we could unwind all stacks here */
1876 /* but that puts extra pressure on pp_slf, and is not worth much */
1877 /*coro_unwind_stacks (aTHX);*/
1878}
1879
1880/*****************************************************************************/
1881/* async pool handler */
1882
1883static int
1884slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1885{
1886 HV *hv = (HV *)SvRV (coro_current);
1887 struct coro *coro = (struct coro *)frame->data;
1888
1889 if (!coro->invoke_cb)
1890 return 1; /* loop till we have invoke */
1891 else
1892 {
1893 hv_store (hv, "desc", sizeof ("desc") - 1,
1894 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1895
1896 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1897
1898 {
1899 dSP;
1900 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1901 PUTBACK;
1902 }
1903
1904 SvREFCNT_dec (GvAV (PL_defgv));
1905 GvAV (PL_defgv) = coro->invoke_av;
1906 coro->invoke_av = 0;
1907
1908 return 0;
1909 }
1910}
1911
1912static void
1913slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1914{
1915 HV *hv = (HV *)SvRV (coro_current);
1916 struct coro *coro = SvSTATE_hv ((SV *)hv);
1917
1918 if (expect_true (coro->saved_deffh))
1919 {
1920 /* subsequent iteration */
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0;
1923
1924 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1925 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1926 {
1927 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1928 coro->invoke_av = newAV ();
1929
1930 frame->prepare = prepare_nop;
1931 }
1932 else
1933 {
1934 av_clear (GvAV (PL_defgv));
1935 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1936
1937 coro->prio = 0;
1938
1939 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1940 api_trace (aTHX_ coro_current, 0);
1941
1942 frame->prepare = prepare_schedule;
1943 av_push (av_async_pool, SvREFCNT_inc (hv));
1944 }
1945 }
1946 else
1947 {
1948 /* first iteration, simply fall through */
1949 frame->prepare = prepare_nop;
1950 }
1951
1952 frame->check = slf_check_pool_handler;
1953 frame->data = (void *)coro;
1954}
1955
1956/*****************************************************************************/
1957/* rouse callback */
1958
1959#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1960
1961static void
1962coro_rouse_callback (pTHX_ CV *cv)
1963{
1964 dXSARGS;
1965 SV *data = (SV *)GENSUB_ARG;
1966
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 {
1969 /* first call, set args */
1970 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972
1973 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976
1977 /* better take a full copy of the arguments */
1978 while (items--)
1979 av_store (av, items, newSVsv (ST (items)));
1980 }
1981
1982 XSRETURN_EMPTY;
1983}
1984
1985static int
1986slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1987{
1988 SV *data = (SV *)frame->data;
1989
1990 if (CORO_THROW)
1991 return 0;
1992
1993 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1994 return 1;
1995
1996 /* now push all results on the stack */
1997 {
1998 dSP;
1999 AV *av = (AV *)SvRV (data);
2000 int i;
2001
2002 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005
2006 /* we have stolen the elements, so ste length to zero and free */
2007 AvFILLp (av) = -1;
2008 av_undef (av);
2009
2010 PUTBACK;
2011 }
2012
2013 return 0;
2014}
2015
2016static void
2017slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2018{
2019 SV *cb;
2020
2021 if (items)
2022 cb = arg [0];
2023 else
2024 {
2025 struct coro *coro = SvSTATE_current;
2026
2027 if (!coro->rouse_cb)
2028 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2029
2030 cb = sv_2mortal (coro->rouse_cb);
2031 coro->rouse_cb = 0;
2032 }
2033
2034 if (!SvROK (cb)
2035 || SvTYPE (SvRV (cb)) != SVt_PVCV
2036 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2037 croak ("Coro::rouse_wait called with illegal callback argument,");
2038
2039 {
2040 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2041 SV *data = (SV *)GENSUB_ARG;
2042
2043 frame->data = (void *)data;
2044 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2045 frame->check = slf_check_rouse_wait;
2046 }
2047}
2048
2049static SV *
2050coro_new_rouse_cb (pTHX)
2051{
2052 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv (hv);
2054 SV *data = newRV_inc ((SV *)hv);
2055 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2056
2057 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2058 SvREFCNT_dec (data); /* magicext increases the refcount */
2059
2060 SvREFCNT_dec (coro->rouse_cb);
2061 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2062
2063 return cb;
1708} 2064}
1709 2065
1710/*****************************************************************************/ 2066/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2067/* schedule-like-function opcode (SLF) */
1712 2068
1759static void 2115static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2116slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2117{
1762 frame->prepare = prepare_schedule; 2118 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2119 frame->check = slf_check_nop;
2120}
2121
2122static void
2123slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2124{
2125 struct coro *next = (struct coro *)slf_frame.data;
2126
2127 SvREFCNT_inc_NN (next->hv);
2128 prepare_schedule_to (aTHX_ ta, next);
2129}
2130
2131static void
2132slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 if (!items)
2135 croak ("Coro::schedule_to expects a coroutine argument, caught");
2136
2137 frame->data = (void *)SvSTATE (arg [0]);
2138 frame->prepare = slf_prepare_schedule_to;
2139 frame->check = slf_check_nop;
2140}
2141
2142static void
2143slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2144{
2145 api_ready (aTHX_ SvRV (coro_current));
2146
2147 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2148}
1765 2149
1766static void 2150static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2151slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2152{
1914 } 2298 }
1915 else 2299 else
1916 slf_argc = 0; 2300 slf_argc = 0;
1917 2301
1918 PL_op->op_ppaddr = pp_slf; 2302 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2304
1921 PL_op = (OP *)&slf_restore; 2305 PL_op = (OP *)&slf_restore;
1922} 2306}
1923 2307
1924/*****************************************************************************/ 2308/*****************************************************************************/
2007 SV **ary; 2391 SV **ary;
2008 2392
2009 /* unfortunately, building manually saves memory */ 2393 /* unfortunately, building manually saves memory */
2010 Newx (ary, 2, SV *); 2394 Newx (ary, 2, SV *);
2011 AvALLOC (av) = ary; 2395 AvALLOC (av) = ary;
2396#if PERL_VERSION_ATLEAST (5,10,0)
2012 AvARRAY (av) = ary; 2397 AvARRAY (av) = ary;
2398#else
2399 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2400 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2401 SvPVX ((SV *)av) = (char *)ary;
2402#endif
2013 AvMAX (av) = 1; 2403 AvMAX (av) = 1;
2014 AvFILLp (av) = 0; 2404 AvFILLp (av) = 0;
2015 ary [0] = newSViv (count); 2405 ary [0] = newSViv (count);
2016 2406
2017 return newRV_noinc ((SV *)av); 2407 return newRV_noinc ((SV *)av);
2037 AvARRAY (av)[0] = AvARRAY (av)[1]; 2427 AvARRAY (av)[0] = AvARRAY (av)[1];
2038 AvARRAY (av)[1] = count_sv; 2428 AvARRAY (av)[1] = count_sv;
2039 cb = av_shift (av); 2429 cb = av_shift (av);
2040 2430
2041 if (SvOBJECT (cb)) 2431 if (SvOBJECT (cb))
2432 {
2042 api_ready (aTHX_ cb); 2433 api_ready (aTHX_ cb);
2043 else 2434 --count;
2044 croak ("callbacks not yet supported"); 2435 }
2436 else if (SvTYPE (cb) == SVt_PVCV)
2437 {
2438 dSP;
2439 PUSHMARK (SP);
2440 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2441 PUTBACK;
2442 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2443 }
2045 2444
2046 SvREFCNT_dec (cb); 2445 SvREFCNT_dec (cb);
2047
2048 --count;
2049 } 2446 }
2050} 2447}
2051 2448
2052static void 2449static void
2053coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2450coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2135} 2532}
2136 2533
2137static void 2534static void
2138slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2535slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2139{ 2536{
2537 if (items >= 2)
2538 {
2539 /* callback form */
2540 AV *av = (AV *)SvRV (arg [0]);
2541 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2542
2543 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2544
2545 if (SvIVX (AvARRAY (av)[0]) > 0)
2546 coro_semaphore_adjust (aTHX_ av, 0);
2547
2548 frame->prepare = prepare_nop;
2549 frame->check = slf_check_nop;
2550 }
2551 else
2552 {
2140 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2553 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2141 frame->check = slf_check_semaphore_wait; 2554 frame->check = slf_check_semaphore_wait;
2555 }
2142} 2556}
2143 2557
2144/* signal */ 2558/* signal */
2145 2559
2146static void 2560static void
2194 2608
2195 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2609 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2196 frame->prepare = prepare_schedule; 2610 frame->prepare = prepare_schedule;
2197 frame->check = slf_check_signal_wait; 2611 frame->check = slf_check_signal_wait;
2198 } 2612 }
2199}
2200
2201/*****************************************************************************/
2202/* gensub: simple closure generation utility */
2203
2204#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2205
2206/* create a closure from XS, returns a code reference */
2207/* the arg can be accessed via GENSUB_ARG from the callback */
2208/* the callback must use dXSARGS/XSRETURN */
2209static SV *
2210gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2211{
2212 CV *cv = (CV *)newSV (0);
2213
2214 sv_upgrade ((SV *)cv, SVt_PVCV);
2215
2216 CvANON_on (cv);
2217 CvISXSUB_on (cv);
2218 CvXSUB (cv) = xsub;
2219 GENSUB_ARG = arg;
2220
2221 return newRV_noinc ((SV *)cv);
2222} 2613}
2223 2614
2224/*****************************************************************************/ 2615/*****************************************************************************/
2225/* Coro::AIO */ 2616/* Coro::AIO */
2226 2617
2241 dXSARGS; 2632 dXSARGS;
2242 AV *state = (AV *)GENSUB_ARG; 2633 AV *state = (AV *)GENSUB_ARG;
2243 SV *coro = av_pop (state); 2634 SV *coro = av_pop (state);
2244 SV *data_sv = newSV (sizeof (struct io_state)); 2635 SV *data_sv = newSV (sizeof (struct io_state));
2245 2636
2246 av_extend (state, items); 2637 av_extend (state, items - 1);
2247 2638
2248 sv_upgrade (data_sv, SVt_PV); 2639 sv_upgrade (data_sv, SVt_PV);
2249 SvCUR_set (data_sv, sizeof (struct io_state)); 2640 SvCUR_set (data_sv, sizeof (struct io_state));
2250 SvPOK_only (data_sv); 2641 SvPOK_only (data_sv);
2251 2642
2386 XSRETURN_EMPTY; 2777 XSRETURN_EMPTY;
2387} 2778}
2388 2779
2389/*****************************************************************************/ 2780/*****************************************************************************/
2390 2781
2782#if CORO_CLONE
2783# include "clone.c"
2784#endif
2785
2391MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2786MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2392 2787
2393PROTOTYPES: DISABLE 2788PROTOTYPES: DISABLE
2394 2789
2395BOOT: 2790BOOT:
2399 coro_thx = PERL_GET_CONTEXT; 2794 coro_thx = PERL_GET_CONTEXT;
2400# endif 2795# endif
2401#endif 2796#endif
2402 BOOT_PAGESIZE; 2797 BOOT_PAGESIZE;
2403 2798
2799 cctx_current = cctx_new_empty ();
2800
2404 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2801 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2405 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2802 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2406 2803
2407 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2804 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2408 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2805 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2427 2824
2428 { 2825 {
2429 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2826 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2430 2827
2431 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2828 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2432 hv_store_ent (PL_custom_op_names, slf, 2829 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2433 newSVpv ("coro_slf", 0), 0);
2434 2830
2435 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2831 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2436 hv_store_ent (PL_custom_op_descs, slf, 2832 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2437 newSVpv ("coro schedule like function", 0), 0);
2438 } 2833 }
2439 2834
2440 coroapi.ver = CORO_API_VERSION; 2835 coroapi.ver = CORO_API_VERSION;
2441 coroapi.rev = CORO_API_REVISION; 2836 coroapi.rev = CORO_API_REVISION;
2442 2837
2461 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2856 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2462} 2857}
2463 2858
2464SV * 2859SV *
2465new (char *klass, ...) 2860new (char *klass, ...)
2861 ALIAS:
2862 Coro::new = 1
2466 CODE: 2863 CODE:
2467{ 2864{
2468 struct coro *coro; 2865 struct coro *coro;
2469 MAGIC *mg; 2866 MAGIC *mg;
2470 HV *hv; 2867 HV *hv;
2868 CV *cb;
2471 int i; 2869 int i;
2870
2871 if (items > 1)
2872 {
2873 cb = coro_sv_2cv (aTHX_ ST (1));
2874
2875 if (!ix)
2876 {
2877 if (CvISXSUB (cb))
2878 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2879
2880 if (!CvROOT (cb))
2881 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2882 }
2883 }
2472 2884
2473 Newz (0, coro, 1, struct coro); 2885 Newz (0, coro, 1, struct coro);
2474 coro->args = newAV (); 2886 coro->args = newAV ();
2475 coro->flags = CF_NEW; 2887 coro->flags = CF_NEW;
2476 2888
2481 coro->hv = hv = newHV (); 2893 coro->hv = hv = newHV ();
2482 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2894 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2483 mg->mg_flags |= MGf_DUP; 2895 mg->mg_flags |= MGf_DUP;
2484 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2896 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2485 2897
2898 if (items > 1)
2899 {
2486 av_extend (coro->args, items - 1); 2900 av_extend (coro->args, items - 1 + ix - 1);
2901
2902 if (ix)
2903 {
2904 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2905 cb = cv_coro_run;
2906 }
2907
2908 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2909
2487 for (i = 1; i < items; i++) 2910 for (i = 2; i < items; i++)
2488 av_push (coro->args, newSVsv (ST (i))); 2911 av_push (coro->args, newSVsv (ST (i)));
2912 }
2489} 2913}
2490 OUTPUT: 2914 OUTPUT:
2491 RETVAL 2915 RETVAL
2492 2916
2493void 2917void
2506void 2930void
2507_exit (int code) 2931_exit (int code)
2508 PROTOTYPE: $ 2932 PROTOTYPE: $
2509 CODE: 2933 CODE:
2510 _exit (code); 2934 _exit (code);
2935
2936SV *
2937clone (Coro::State coro)
2938 CODE:
2939{
2940#if CORO_CLONE
2941 struct coro *ncoro = coro_clone (aTHX_ coro);
2942 MAGIC *mg;
2943 /* TODO: too much duplication */
2944 ncoro->hv = newHV ();
2945 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2946 mg->mg_flags |= MGf_DUP;
2947 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2948#else
2949 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2950#endif
2951}
2952 OUTPUT:
2953 RETVAL
2511 2954
2512int 2955int
2513cctx_stacksize (int new_stacksize = 0) 2956cctx_stacksize (int new_stacksize = 0)
2514 PROTOTYPE: ;$ 2957 PROTOTYPE: ;$
2515 CODE: 2958 CODE:
2636 3079
2637SV * 3080SV *
2638has_cctx (Coro::State coro) 3081has_cctx (Coro::State coro)
2639 PROTOTYPE: $ 3082 PROTOTYPE: $
2640 CODE: 3083 CODE:
2641 RETVAL = boolSV (!!coro->cctx); 3084 /* maybe manage the running flag differently */
3085 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2642 OUTPUT: 3086 OUTPUT:
2643 RETVAL 3087 RETVAL
2644 3088
2645int 3089int
2646is_traced (Coro::State coro) 3090is_traced (Coro::State coro)
2666 3110
2667void 3111void
2668force_cctx () 3112force_cctx ()
2669 PROTOTYPE: 3113 PROTOTYPE:
2670 CODE: 3114 CODE:
2671 SvSTATE_current->cctx->idle_sp = 0; 3115 cctx_current->idle_sp = 0;
2672 3116
2673void 3117void
2674swap_defsv (Coro::State self) 3118swap_defsv (Coro::State self)
2675 PROTOTYPE: $ 3119 PROTOTYPE: $
2676 ALIAS: 3120 ALIAS:
2691 3135
2692BOOT: 3136BOOT:
2693{ 3137{
2694 int i; 3138 int i;
2695 3139
2696 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3140 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3141 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2699 3142 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3143 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2700 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3144 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2701 SvREADONLY_on (coro_current); 3145 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3146 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3147 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3148 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3149
3150 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3151 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3152 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3153 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2702 3154
2703 coro_stash = gv_stashpv ("Coro", TRUE); 3155 coro_stash = gv_stashpv ("Coro", TRUE);
2704 3156
2705 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3157 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2706 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3158 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2714 3166
2715 { 3167 {
2716 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3168 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2717 3169
2718 coroapi.schedule = api_schedule; 3170 coroapi.schedule = api_schedule;
3171 coroapi.schedule_to = api_schedule_to;
2719 coroapi.cede = api_cede; 3172 coroapi.cede = api_cede;
2720 coroapi.cede_notself = api_cede_notself; 3173 coroapi.cede_notself = api_cede_notself;
2721 coroapi.ready = api_ready; 3174 coroapi.ready = api_ready;
2722 coroapi.is_ready = api_is_ready; 3175 coroapi.is_ready = api_is_ready;
2723 coroapi.nready = coro_nready; 3176 coroapi.nready = coro_nready;
2728 SvREADONLY_on (sv); 3181 SvREADONLY_on (sv);
2729 } 3182 }
2730} 3183}
2731 3184
2732void 3185void
3186terminate (...)
3187 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3189
3190void
2733schedule (...) 3191schedule (...)
2734 CODE: 3192 CODE:
2735 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3193 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3194
3195void
3196schedule_to (...)
3197 CODE:
3198 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3199
3200void
3201cede_to (...)
3202 CODE:
3203 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2736 3204
2737void 3205void
2738cede (...) 3206cede (...)
2739 CODE: 3207 CODE:
2740 CORO_EXECUTE_SLF_XS (slf_init_cede); 3208 CORO_EXECUTE_SLF_XS (slf_init_cede);
2741 3209
2742void 3210void
2743cede_notself (...) 3211cede_notself (...)
2744 CODE: 3212 CODE:
2745 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214
3215void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
2746 3220
2747void 3221void
2748_set_current (SV *current) 3222_set_current (SV *current)
2749 PROTOTYPE: $ 3223 PROTOTYPE: $
2750 CODE: 3224 CODE:
2795 CODE: 3269 CODE:
2796 RETVAL = coro_nready; 3270 RETVAL = coro_nready;
2797 OUTPUT: 3271 OUTPUT:
2798 RETVAL 3272 RETVAL
2799 3273
2800# for async_pool speedup
2801void 3274void
2802_pool_1 (SV *cb) 3275_pool_handler (...)
2803 CODE: 3276 CODE:
2804{ 3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2805 HV *hv = (HV *)SvRV (coro_current);
2806 struct coro *coro = SvSTATE_hv ((SV *)hv);
2807 AV *defav = GvAV (PL_defgv);
2808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2809 AV *invoke_av;
2810 int i, len;
2811 3278
2812 if (!invoke) 3279void
3280async_pool (SV *cv, ...)
3281 PROTOTYPE: &@
3282 PPCODE:
3283{
3284 HV *hv = (HV *)av_pop (av_async_pool);
3285 AV *av = newAV ();
3286 SV *cb = ST (0);
3287 int i;
3288
3289 av_extend (av, items - 2);
3290 for (i = 1; i < items; ++i)
3291 av_push (av, SvREFCNT_inc_NN (ST (i)));
3292
3293 if ((SV *)hv == &PL_sv_undef)
2813 { 3294 {
2814 SV *old = PL_diehook; 3295 PUSHMARK (SP);
2815 PL_diehook = 0; 3296 EXTEND (SP, 2);
2816 SvREFCNT_dec (old); 3297 PUSHs (sv_Coro);
2817 croak ("\3async_pool terminate\2\n"); 3298 PUSHs ((SV *)cv_pool_handler);
3299 PUTBACK;
3300 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3301 SPAGAIN;
3302
3303 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2818 } 3304 }
2819 3305
2820 SvREFCNT_dec (coro->saved_deffh);
2821 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2822
2823 hv_store (hv, "desc", sizeof ("desc") - 1,
2824 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2825
2826 invoke_av = (AV *)SvRV (invoke);
2827 len = av_len (invoke_av);
2828
2829 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2830
2831 if (len > 0)
2832 { 3306 {
2833 av_fill (defav, len - 1); 3307 struct coro *coro = SvSTATE_hv (hv);
2834 for (i = 0; i < len; ++i) 3308
2835 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3309 assert (!coro->invoke_cb);
3310 assert (!coro->invoke_av);
3311 coro->invoke_cb = SvREFCNT_inc (cb);
3312 coro->invoke_av = av;
2836 } 3313 }
3314
3315 api_ready (aTHX_ (SV *)hv);
3316
3317 if (GIMME_V != G_VOID)
3318 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3319 else
3320 SvREFCNT_dec (hv);
2837} 3321}
3322
3323SV *
3324rouse_cb ()
3325 PROTOTYPE:
3326 CODE:
3327 RETVAL = coro_new_rouse_cb (aTHX);
3328 OUTPUT:
3329 RETVAL
2838 3330
2839void 3331void
2840_pool_2 (SV *cb) 3332rouse_wait (...)
3333 PROTOTYPE: ;$
2841 CODE: 3334 PPCODE:
2842{ 3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2843 HV *hv = (HV *)SvRV (coro_current);
2844 struct coro *coro = SvSTATE_hv ((SV *)hv);
2845
2846 sv_setsv (cb, &PL_sv_undef);
2847
2848 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2849 coro->saved_deffh = 0;
2850
2851 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2852 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2853 {
2854 SV *old = PL_diehook;
2855 PL_diehook = 0;
2856 SvREFCNT_dec (old);
2857 croak ("\3async_pool terminate\2\n");
2858 }
2859
2860 av_clear (GvAV (PL_defgv));
2861 hv_store (hv, "desc", sizeof ("desc") - 1,
2862 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2863
2864 coro->prio = 0;
2865
2866 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2867 api_trace (aTHX_ coro_current, 0);
2868
2869 av_push (av_async_pool, newSVsv (coro_current));
2870}
2871 3336
2872 3337
2873MODULE = Coro::State PACKAGE = PerlIO::cede 3338MODULE = Coro::State PACKAGE = PerlIO::cede
2874 3339
2875BOOT: 3340BOOT:
2909 adjust = 1 3374 adjust = 1
2910 CODE: 3375 CODE:
2911 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3376 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2912 3377
2913void 3378void
2914down (SV *self) 3379down (...)
2915 CODE: 3380 CODE:
2916 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3381 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2917 3382
2918void 3383void
2919wait (SV *self) 3384wait (...)
2920 CODE: 3385 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3386 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2922 3387
2923void 3388void
2924try (SV *self) 3389try (SV *self)
2967 ); 3432 );
2968 OUTPUT: 3433 OUTPUT:
2969 RETVAL 3434 RETVAL
2970 3435
2971void 3436void
2972wait (SV *self) 3437wait (...)
2973 CODE: 3438 CODE:
2974 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3439 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
2975 3440
2976void 3441void
2977broadcast (SV *self) 3442broadcast (SV *self)
3034 3499
3035void 3500void
3036_register (char *target, char *proto, SV *req) 3501_register (char *target, char *proto, SV *req)
3037 CODE: 3502 CODE:
3038{ 3503{
3039 HV *st; 3504 CV *req_cv = coro_sv_2cv (aTHX_ req);
3040 GV *gvp;
3041 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3042 /* newXSproto doesn't return the CV on 5.8 */ 3505 /* newXSproto doesn't return the CV on 5.8 */
3043 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3506 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3044 sv_setpv ((SV *)slf_cv, proto); 3507 sv_setpv ((SV *)slf_cv, proto);
3045 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3508 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3046} 3509}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines