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.171 by root, Sat Sep 29 19:42:10 2007 UTC vs.
Revision 1.198 by root, Sun Oct 7 03:58:37 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
131static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 147static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 149static SV *coro_mortal; /* will be freed after next transfer */
150
151static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */
136 153
137/* async_pool helper stuff */ 154/* async_pool helper stuff */
138static SV *sv_pool_rss; 155static SV *sv_pool_rss;
139static SV *sv_pool_size; 156static SV *sv_pool_size;
140static AV *av_async_pool; 157static AV *av_async_pool;
176 CF_READY = 0x0002, /* coroutine is ready */ 193 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 194 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 195 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 196};
180 197
198/* the structure where most of the perl state is stored, overlaid on the cxstack */
199typedef struct {
200 SV *defsv;
201 AV *defav;
202 SV *errsv;
203 SV *irsgv;
204#define VAR(name,type) type name;
205# include "state.h"
206#undef VAR
207} perl_slots;
208
209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
210
181/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
182struct coro { 212struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 213 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 214 coro_cctx *cctx;
185 215
216 /* process data */
217 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */
219
186 /* data associated with this coroutine (initial args) */ 220 /* data associated with this coroutine (initial args) */
187 AV *args; 221 AV *args;
188 int refcnt; 222 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 223 int flags; /* CF_ flags */
191 224
192 /* optionally saved, might be zero */ 225 /* statistics */
193 AV *defav; /* @_ */ 226 int usecount; /* number of transfers to this coro */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 227
204 /* coro process data */ 228 /* coro process data */
205 int prio; 229 int prio;
230 SV *throw;
231
232 /* async_pool */
233 SV *saved_deffh;
206 234
207 /* linked list */ 235 /* linked list */
208 struct coro *next, *prev; 236 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
210}; 238};
308 MAGIC *mg; 336 MAGIC *mg;
309 337
310 if (SvROK (coro)) 338 if (SvROK (coro))
311 coro = SvRV (coro); 339 coro = SvRV (coro);
312 340
341 if (expect_false (SvTYPE (coro) != SVt_PVHV))
342 croak ("Coro::State object required");
343
313 stash = SvSTASH (coro); 344 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 345 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 346 {
316 /* very slow, but rare, check */ 347 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 349 croak ("Coro::State object required");
319 } 350 }
329get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
330{ 361{
331 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
332 AV *av; 363 AV *av;
333 364
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 367 else
337 { 368 {
338#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
351put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
352{ 383{
353 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
354 AV *av; 385 AV *av;
355 386
356 if (!mg) 387 if (expect_false (!mg))
357 { 388 {
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
362 } 393 }
363 394
364 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
365 396
366 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
368 399
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 401}
371 402
372/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
373 404
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378
379static void 405static void
380load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
381{ 407{
408 perl_slots *slot = c->slot;
409 c->slot = 0;
410
411 PL_mainstack = c->mainstack;
412
413 GvSV (PL_defgv) = slot->defsv;
414 GvAV (PL_defgv) = slot->defav;
415 GvSV (PL_errgv) = slot->errsv;
416 GvSV (irsgv) = slot->irsgv;
417
382#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
383# include "state.h" 419 # include "state.h"
384#undef VAR 420 #undef VAR
385
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 421
406 { 422 {
407 dSP; 423 dSP;
424
408 CV *cv; 425 CV *cv;
409 426
410 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
412 { 429 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
416 } 433 }
435 452
436 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
438 for (;;) 455 for (;;)
439 { 456 {
440 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
441 { 458 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
443 460
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 462 {
446 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
447 464
448 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
449 { 466 {
450 EXTEND (SP, 3); 467 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
456 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
457 } 474 }
458 } 475 }
459 } 476 }
460 477
461 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 479 break;
463 480
464 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
467 } 484 }
468 485
469 PUTBACK; 486 PUTBACK;
470 } 487 }
471 488
472 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 489 /* allocate some space on the context stack for our purposes */
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 490 {
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 491 /* we manually unroll here, as usually 2 slots is enough */
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 492 int i;
476 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 493 if (SLOT_COUNT >= 1) CXINC;
494 if (SLOT_COUNT >= 2) CXINC;
495 if (SLOT_COUNT >= 3) CXINC;
496 for (i = 3; i < SLOT_COUNT; ++i)
497 CXINC;
477 498
499 cxstack_ix -= SLOT_COUNT; /* undo allocation */
500 }
501
502 c->mainstack = PL_mainstack;
503
504 {
505 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
506
507 slot->defav = GvAV (PL_defgv);
508 slot->defsv = DEFSV;
509 slot->errsv = ERRSV;
510 slot->irsgv = GvSV (irsgv);
511
478#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
479# include "state.h" 513 # include "state.h"
480#undef VAR 514 #undef VAR
515 }
481} 516}
482 517
483/* 518/*
484 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
485 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
490# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
491#else 526#else
492static void 527static void
493coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
494{ 529{
495 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
496 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
497 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
499 534
500 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
501 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
503 538
504 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
505 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
506 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
507 PL_tmps_max = 64; 542 PL_tmps_max = 32;
508 543
509 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
510 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
511 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
512 547
513#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
514 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
515#endif 550#endif
516 551
517 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
518 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
519 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
520 555
521 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
522 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
523 PL_savestack_max = 64; 558 PL_savestack_max = 24;
524 559
525#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
526 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
527 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
528 PL_retstack_max = 4; 563 PL_retstack_max = 4;
534 * destroy the stacks, the callchain etc... 569 * destroy the stacks, the callchain etc...
535 */ 570 */
536static void 571static void
537coro_destroy_stacks (pTHX) 572coro_destroy_stacks (pTHX)
538{ 573{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 574 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 575 PL_curstackinfo = PL_curstackinfo->si_next;
558 576
559 while (PL_curstackinfo) 577 while (PL_curstackinfo)
560 { 578 {
578} 596}
579 597
580static size_t 598static size_t
581coro_rss (pTHX_ struct coro *coro) 599coro_rss (pTHX_ struct coro *coro)
582{ 600{
583 size_t rss = sizeof (coro); 601 size_t rss = sizeof (*coro);
584 602
585 if (coro->mainstack) 603 if (coro->mainstack)
586 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
587 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
588 { 609 {
610 slot = &tmp_slot;
611
589 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
590 # include "state.h" 613 # include "state.h"
591 #undef VAR 614 #undef VAR
592 } 615 }
616 else
617 slot = coro->slot;
593 618
594 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
602 626
603#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
604 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
605#endif 629#endif
606 } 630 }
607 631
608 return rss; 632 return rss;
609} 633}
610 634
611/** coroutine stack handling ************************************************/ 635/** coroutine stack handling ************************************************/
612 636
613static void 637static void
614setup_coro (pTHX_ struct coro *coro) 638coro_setup (pTHX_ struct coro *coro)
615{ 639{
616 /* 640 /*
617 * emulate part of the perl startup here. 641 * emulate part of the perl startup here.
618 */ 642 */
619 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
621 PL_runops = RUNOPS_DEFAULT; 645 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 648 PL_comppad = 0;
625 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
626 PL_localizing = 0; 651 PL_localizing = 0;
627 PL_dirty = 0; 652 PL_dirty = 0;
628 PL_restartop = 0; 653 PL_restartop = 0;
654 PL_diehook = 0;
655 PL_warnhook = 0;
656
657 GvSV (PL_defgv) = newSV (0);
658 GvAV (PL_defgv) = coro->args; coro->args = 0;
659 GvSV (PL_errgv) = newSV (0);
660 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
661 PL_rs = newSVsv (GvSV (irsgv));
662 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
629 663
630 { 664 {
631 dSP; 665 dSP;
632 LOGOP myop; 666 LOGOP myop;
633 667
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 668 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 669 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 670 myop.op_flags = OPf_WANT_VOID;
640 671
641 PUSHMARK (SP); 672 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 673 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 674 PUTBACK;
644 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 677 SPAGAIN;
647 } 678 }
648 679
649 ENTER; /* necessary e.g. for dounwind */ 680 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
681}
682
683static void
684coro_destroy (pTHX_ struct coro *coro)
685{
686 if (!IN_DESTRUCT)
687 {
688 /* restore all saved variables and stuff */
689 LEAVE_SCOPE (0);
690 assert (PL_tmps_floor == -1);
691
692 /* free all temporaries */
693 FREETMPS;
694 assert (PL_tmps_ix == -1);
695
696 /* unwind all extra stacks */
697 POPSTACK_TO (PL_mainstack);
698
699 /* unwind main stack */
700 dounwind (-1);
701 }
702
703 SvREFCNT_dec (GvSV (PL_defgv));
704 SvREFCNT_dec (GvAV (PL_defgv));
705 SvREFCNT_dec (GvSV (PL_errgv));
706 SvREFCNT_dec (PL_defoutgv);
707 SvREFCNT_dec (PL_rs);
708 SvREFCNT_dec (GvSV (irsgv));
709
710 SvREFCNT_dec (PL_diehook);
711 SvREFCNT_dec (PL_warnhook);
712
713 SvREFCNT_dec (coro->saved_deffh);
714 SvREFCNT_dec (coro->throw);
715
716 coro_destroy_stacks (aTHX);
650} 717}
651 718
652static void 719static void
653free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
654{ 721{
655 if (coro_mortal) 722 if (expect_true (coro_mortal))
656 { 723 {
657 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 725 coro_mortal = 0;
659 } 726 }
660} 727}
669 736
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 737 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 738 {
672 PERL_ASYNC_CHECK (); 739 PERL_ASYNC_CHECK ();
673 740
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 741 if (cctx->flags & CC_TRACE_ALL)
675 { 742 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 743 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 744 {
745 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
746 SV **bot, **top;
747 AV *av = newAV (); /* return values */
720 SV **cb; 748 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 749 dSP;
750
751 GV *gv = CvGV (cx->blk_sub.cv);
752 SV *fullname = sv_2mortal (newSV (0));
753 if (isGV (gv))
754 gv_efullname3 (fullname, gv, 0);
755
756 bot = PL_stack_base + cx->blk_oldsp + 1;
757 top = cx->blk_gimme == G_ARRAY ? SP + 1
758 : cx->blk_gimme == G_SCALAR ? bot + 1
759 : bot;
760
761 av_extend (av, top - bot);
762 while (bot < top)
763 av_push (av, SvREFCNT_inc (*bot++));
764
765 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 766 ENTER;
724 SAVETMPS; 767 SAVETMPS;
725 EXTEND (SP, 3); 768 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 769 PUSHMARK (SP);
770 PUSHs (&PL_sv_no);
771 PUSHs (fullname);
772 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
773 PUTBACK;
774 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
775 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
776 SPAGAIN;
777 FREETMPS;
778 LEAVE;
779 PL_runops = runops_trace;
780 }
727 781
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 782 if (oldcop != PL_curcop)
783 {
784 oldcop = PL_curcop;
785
786 if (PL_curcop != &PL_compiling)
729 { 787 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 788 SV **cb;
731 789
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 790 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 791 {
792 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
793
794 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
795 {
796 runops_proc_t old_runops = PL_runops;
797 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 798 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 799 SV *fullname = sv_2mortal (newSV (0));
800
736 if (isGV (gv)) 801 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 802 gv_efullname3 (fullname, gv, 0);
738 803
804 PL_runops = RUNOPS_DEFAULT;
805 ENTER;
806 SAVETMPS;
807 EXTEND (SP, 3);
808 PUSHMARK (SP);
809 PUSHs (&PL_sv_yes);
810 PUSHs (fullname);
811 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
812 PUTBACK;
813 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
814 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
815 SPAGAIN;
816 FREETMPS;
817 LEAVE;
818 PL_runops = runops_trace;
819 }
820
821 oldcxix = cxstack_ix;
822 }
823
824 if (cctx->flags & CC_TRACE_LINE)
825 {
826 dSP;
827
828 PL_runops = RUNOPS_DEFAULT;
829 ENTER;
830 SAVETMPS;
831 EXTEND (SP, 3);
832 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 833 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 834 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 835 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 836 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 837 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 838 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 839 SPAGAIN;
840 FREETMPS;
841 LEAVE;
842 PL_runops = runops_trace;
747 } 843 }
748
749 oldcxix = cxstack_ix;
750 } 844 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 845 }
767 } 846 }
768 } 847 }
769 848
770 TAINT_NOT; 849 TAINT_NOT;
899 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
900 979
901 Safefree (cctx); 980 Safefree (cctx);
902} 981}
903 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
904static coro_cctx * 986static coro_cctx *
905cctx_get (pTHX) 987cctx_get (pTHX)
906{ 988{
907 while (cctx_first) 989 while (expect_true (cctx_first))
908 { 990 {
909 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
910 cctx_first = cctx->next; 992 cctx_first = cctx->next;
911 --cctx_idle; 993 --cctx_idle;
912 994
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 996 return cctx;
915 997
916 cctx_destroy (cctx); 998 cctx_destroy (cctx);
917 } 999 }
918 1000
921 1003
922static void 1004static void
923cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
924{ 1006{
925 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
927 { 1009 {
928 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
929 cctx_first = first->next; 1011 cctx_first = first->next;
930 --cctx_idle; 1012 --cctx_idle;
931 1013
937 cctx_first = cctx; 1019 cctx_first = cctx;
938} 1020}
939 1021
940/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
941 1023
942static void NOINLINE 1024static void
943transfer_check (pTHX_ struct coro *prev, struct coro *next) 1025transfer_check (pTHX_ struct coro *prev, struct coro *next)
944{ 1026{
945 if (prev != next) 1027 if (expect_true (prev != next))
946 { 1028 {
947 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1029 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
948 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1030 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
949 1031
950 if (next->flags & CF_RUNNING) 1032 if (expect_false (next->flags & CF_RUNNING))
951 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1033 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
952 1034
953 if (next->flags & CF_DESTROYED) 1035 if (expect_false (next->flags & CF_DESTROYED))
954 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1036 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
955 1037
1038 if (
1039#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser)
1041#else
956 if (PL_lex_state != LEX_NOTPARSING) 1042 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif
1044 )
957 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1045 croak ("Coro::State::transfer called while parsing, but this is not supported");
958 } 1046 }
959} 1047}
960 1048
961/* always use the TRANSFER macro */ 1049/* always use the TRANSFER macro */
963transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
964{ 1052{
965 dSTACKLEVEL; 1053 dSTACKLEVEL;
966 1054
967 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
968 if (!next) 1056 if (expect_false (!next))
969 { 1057 {
970 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
971 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1059 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
972 } 1060 }
973 else if (prev != next) 1061 else if (expect_true (prev != next))
974 { 1062 {
975 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
976 1064
977 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
978 { 1066 {
979 /* create a new empty context */ 1067 /* create a new empty context */
980 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
981 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
982 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
985 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
986 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
987 1075
988 LOCK; 1076 LOCK;
989 1077
990 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
991 { 1079 {
992 /* need to start coroutine */ 1080 /* need to start coroutine */
993 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
994 /* first get rid of the old state */ 1082 /* first get rid of the old state */
995 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
996 /* setup coroutine call */ 1084 /* setup coroutine call */
997 setup_coro (aTHX_ next); 1085 coro_setup (aTHX_ next);
998 } 1086 }
999 else 1087 else
1000 { 1088 {
1001 /* coroutine already started */ 1089 /* coroutine already started */
1002 save_perl (aTHX_ prev); 1090 save_perl (aTHX_ prev);
1004 } 1092 }
1005 1093
1006 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
1007 1095
1008 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
1009 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1097 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1010 { 1098 {
1011 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1099 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1012 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1100 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1013 1101
1014 prev->cctx = 0; 1102 prev->cctx = 0;
1015 1103
1104 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1105 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1106 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1107 next->cctx = cctx_get (aTHX);
1108
1016 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
1017 } 1110 }
1018 1111
1112 ++next->usecount;
1113
1019 if (!next->cctx) 1114 if (expect_true (!next->cctx))
1020 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
1021 1116
1022 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
1023 { 1118 {
1024 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
1025 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
1026 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1027 } 1122 }
1028 1123
1029 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
1030 UNLOCK; 1125 UNLOCK;
1126
1127 if (expect_false (prev->throw || next->throw))
1128 {
1129 struct coro *coro = SvSTATE (coro_current);
1130
1131 if (coro->throw)
1132 {
1133 SV *exception = coro->throw;
1134 coro->throw = 0;
1135 sv_setsv (ERRSV, exception);
1136 croak (0);
1137 }
1138 }
1031 } 1139 }
1032} 1140}
1033 1141
1034struct transfer_args 1142struct transfer_args
1035{ 1143{
1062 1170
1063 if (coro->mainstack && coro->mainstack != main_mainstack) 1171 if (coro->mainstack && coro->mainstack != main_mainstack)
1064 { 1172 {
1065 struct coro temp; 1173 struct coro temp;
1066 1174
1067 assert (!(coro->flags & CF_RUNNING));
1068
1069 Zero (&temp, 1, struct coro);
1070 temp.save = CORO_SAVE_ALL;
1071
1072 if (coro->flags & CF_RUNNING) 1175 if (coro->flags & CF_RUNNING)
1073 croak ("FATAL: tried to destroy currently running coroutine"); 1176 croak ("FATAL: tried to destroy currently running coroutine");
1074 1177
1075 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
1076 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
1077 1180
1078 coro_destroy_stacks (aTHX); 1181 coro_destroy (aTHX_ coro);
1079 1182
1080 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
1081 1184
1082 coro->mainstack = 0; 1185 coro->slot = 0;
1083 } 1186 }
1084 1187
1085 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
1086 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
1087 1190
1146 1249
1147 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1250 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1148 TRANSFER (ta); 1251 TRANSFER (ta);
1149} 1252}
1150 1253
1151static int
1152api_save (SV *coro_sv, int new_save)
1153{
1154 dTHX;
1155 struct coro *coro = SvSTATE (coro_sv);
1156 int old_save = coro->save;
1157
1158 if (new_save >= 0)
1159 coro->save = new_save;
1160
1161 return old_save;
1162}
1163
1164/** Coro ********************************************************************/ 1254/** Coro ********************************************************************/
1165 1255
1166static void 1256static void
1167coro_enq (pTHX_ SV *coro_sv) 1257coro_enq (pTHX_ SV *coro_sv)
1168{ 1258{
1225 { 1315 {
1226 LOCK; 1316 LOCK;
1227 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1228 1318
1229 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1230 if (!next_sv) 1320 if (expect_false (!next_sv))
1231 { 1321 {
1232 dSP; 1322 dSP;
1233 UNLOCK; 1323 UNLOCK;
1234 1324
1235 ENTER; 1325 ENTER;
1245 } 1335 }
1246 1336
1247 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1248 1338
1249 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1250 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1251 { 1341 {
1252 UNLOCK; 1342 UNLOCK;
1253 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1254 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1255 continue; 1345 continue;
1311 dTHX; 1401 dTHX;
1312 struct transfer_args ta; 1402 struct transfer_args ta;
1313 1403
1314 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1315 1405
1316 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1317 { 1407 {
1318 TRANSFER (ta); 1408 TRANSFER (ta);
1319 return 1; 1409 return 1;
1320 } 1410 }
1321 else 1411 else
1335 } 1425 }
1336 else 1426 else
1337 return 0; 1427 return 0;
1338} 1428}
1339 1429
1430static void
1431api_trace (SV *coro_sv, int flags)
1432{
1433 dTHX;
1434 struct coro *coro = SvSTATE (coro_sv);
1435
1436 if (flags & CC_TRACE)
1437 {
1438 if (!coro->cctx)
1439 coro->cctx = cctx_new ();
1440 else if (!(coro->cctx->flags & CC_TRACE))
1441 croak ("cannot enable tracing on coroutine with custom stack");
1442
1443 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1444 }
1445 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1446 {
1447 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1448
1449 if (coro->flags & CF_RUNNING)
1450 PL_runops = RUNOPS_DEFAULT;
1451 else
1452 coro->slot->runops = RUNOPS_DEFAULT;
1453 }
1454}
1455
1340MODULE = Coro::State PACKAGE = Coro::State 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1341 1457
1342PROTOTYPES: DISABLE 1458PROTOTYPES: DISABLE
1343 1459
1344BOOT: 1460BOOT:
1345{ 1461{
1346#ifdef USE_ITHREADS 1462#ifdef USE_ITHREADS
1347 MUTEX_INIT (&coro_mutex); 1463 MUTEX_INIT (&coro_mutex);
1348#endif 1464#endif
1349 BOOT_PAGESIZE; 1465 BOOT_PAGESIZE;
1466
1467 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1468 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1350 1469
1351 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1352 1471
1353 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1354 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1355 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1474 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1356 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1475 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1357 1476
1358 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1359 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1360 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1361 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1362 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1363 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1364 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1365
1366 main_mainstack = PL_mainstack; 1477 main_mainstack = PL_mainstack;
1367 main_top_env = PL_top_env; 1478 main_top_env = PL_top_env;
1368 1479
1369 while (main_top_env->je_prev) 1480 while (main_top_env->je_prev)
1370 main_top_env = main_top_env->je_prev; 1481 main_top_env = main_top_env->je_prev;
1382 struct coro *coro; 1493 struct coro *coro;
1383 HV *hv; 1494 HV *hv;
1384 int i; 1495 int i;
1385 1496
1386 Newz (0, coro, 1, struct coro); 1497 Newz (0, coro, 1, struct coro);
1387 coro->args = newAV (); 1498 coro->args = newAV ();
1388 coro->save = CORO_SAVE_DEF;
1389 coro->flags = CF_NEW; 1499 coro->flags = CF_NEW;
1390 1500
1391 if (coro_first) coro_first->prev = coro; 1501 if (coro_first) coro_first->prev = coro;
1392 coro->next = coro_first; 1502 coro->next = coro_first;
1393 coro_first = coro; 1503 coro_first = coro;
1394 1504
1395 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1396 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1506 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1397 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1398 1508
1509 av_extend (coro->args, items - 1);
1399 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1400 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1401} 1512}
1402 OUTPUT: 1513 OUTPUT:
1403 RETVAL 1514 RETVAL
1404 1515
1405int 1516# these not obviously related functions are all rolled into the same xs
1406save (SV *coro, int new_save = -1) 1517# function to increase chances that they all will call transfer with the same
1407 CODE: 1518# stack offset
1408 RETVAL = api_save (coro, new_save);
1409 OUTPUT:
1410 RETVAL
1411
1412int
1413save_also (SV *coro_sv, int save_also)
1414 CODE:
1415{
1416 struct coro *coro = SvSTATE (coro_sv);
1417 RETVAL = coro->save;
1418 coro->save |= save_also;
1419}
1420 OUTPUT:
1421 RETVAL
1422
1423void 1519void
1424_set_stacklevel (...) 1520_set_stacklevel (...)
1425 ALIAS: 1521 ALIAS:
1426 Coro::State::transfer = 1 1522 Coro::State::transfer = 1
1427 Coro::schedule = 2 1523 Coro::schedule = 2
1461 } 1557 }
1462 1558
1463 BARRIER; 1559 BARRIER;
1464 TRANSFER (ta); 1560 TRANSFER (ta);
1465 1561
1466 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1467 XSRETURN_YES; 1563 XSRETURN_YES;
1468} 1564}
1469 1565
1470bool 1566bool
1471_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
1521 CODE: 1617 CODE:
1522{ 1618{
1523 if (coro->mainstack) 1619 if (coro->mainstack)
1524 { 1620 {
1525 struct coro temp; 1621 struct coro temp;
1526 Zero (&temp, 1, struct coro);
1527 temp.save = CORO_SAVE_ALL;
1528 1622
1529 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1530 { 1624 {
1531 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1532 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
1536 dSP; 1630 dSP;
1537 ENTER; 1631 ENTER;
1538 SAVETMPS; 1632 SAVETMPS;
1539 PUSHMARK (SP); 1633 PUSHMARK (SP);
1540 PUTBACK; 1634 PUTBACK;
1635
1541 if (ix) 1636 if (ix)
1542 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1543 else 1638 else
1544 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1545 SPAGAIN; 1641 SPAGAIN;
1546 FREETMPS; 1642 FREETMPS;
1547 LEAVE; 1643 LEAVE;
1548 PUTBACK; 1644 PUTBACK;
1549 } 1645 }
1553 save_perl (aTHX_ coro); 1649 save_perl (aTHX_ coro);
1554 load_perl (aTHX_ &temp); 1650 load_perl (aTHX_ &temp);
1555 } 1651 }
1556 } 1652 }
1557} 1653}
1558 1654
1559SV * 1655SV *
1560is_ready (Coro::State coro) 1656is_ready (Coro::State coro)
1561 PROTOTYPE: $ 1657 PROTOTYPE: $
1562 ALIAS: 1658 ALIAS:
1563 is_ready = CF_READY 1659 is_ready = CF_READY
1568 RETVAL = boolSV (coro->flags & ix); 1664 RETVAL = boolSV (coro->flags & ix);
1569 OUTPUT: 1665 OUTPUT:
1570 RETVAL 1666 RETVAL
1571 1667
1572void 1668void
1573trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1669api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1574 CODE:
1575 if (flags & CC_TRACE)
1576 {
1577 if (!coro->cctx)
1578 coro->cctx = cctx_new ();
1579 else if (!(coro->cctx->flags & CC_TRACE))
1580 croak ("cannot enable tracing on coroutine with custom stack");
1581
1582 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1583 }
1584 else
1585 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 {
1587 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1588 coro->cctx->flags |= CC_NOREUSE;
1589
1590 if (coro->flags & CF_RUNNING)
1591 PL_runops = RUNOPS_DEFAULT;
1592 else
1593 coro->runops = RUNOPS_DEFAULT;
1594 }
1595 1670
1596SV * 1671SV *
1597has_stack (Coro::State coro) 1672has_stack (Coro::State coro)
1598 PROTOTYPE: $ 1673 PROTOTYPE: $
1599 CODE: 1674 CODE:
1610 RETVAL 1685 RETVAL
1611 1686
1612IV 1687IV
1613rss (Coro::State coro) 1688rss (Coro::State coro)
1614 PROTOTYPE: $ 1689 PROTOTYPE: $
1690 ALIAS:
1691 usecount = 1
1615 CODE: 1692 CODE:
1693 switch (ix)
1694 {
1616 RETVAL = coro_rss (aTHX_ coro); 1695 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1696 case 1: RETVAL = coro->usecount; break;
1697 }
1617 OUTPUT: 1698 OUTPUT:
1618 RETVAL 1699 RETVAL
1619 1700
1620 1701
1621MODULE = Coro::State PACKAGE = Coro 1702MODULE = Coro::State PACKAGE = Coro
1623BOOT: 1704BOOT:
1624{ 1705{
1625 int i; 1706 int i;
1626 1707
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1708 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1709 get_sv ("Coro::POOL_RSS" , TRUE); /* silence stupid 5.10 warning */
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1710 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1711 get_sv ("Coro::POOL_SIZE" , TRUE); /* silence stupid 5.10 warning */
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 1712 av_async_pool = get_av ("Coro::async_pool", TRUE);
1713 get_av ("Coro::async_pool", TRUE); /* silence stupid 5.10 warning */
1630 1714
1631 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1633 1717
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1719
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1642 1726
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1645 1729
1646 { 1730 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 1731 SV *sv = perl_get_sv ("Coro::API", TRUE);
1732 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 1733
1649 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1650 coroapi.save = api_save;
1651 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1652 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1653 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
1654 coroapi.is_ready = api_is_ready; 1738 coroapi.is_ready = api_is_ready;
1655 coroapi.nready = &coro_nready; 1739 coroapi.nready = &coro_nready;
1704 CODE: 1788 CODE:
1705 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1706 OUTPUT: 1790 OUTPUT:
1707 RETVAL 1791 RETVAL
1708 1792
1793void
1794throw (Coro::State self, SV *throw = &PL_sv_undef)
1795 PROTOTYPE: $;$
1796 CODE:
1797 SvREFCNT_dec (self->throw);
1798 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1799
1709# for async_pool speedup 1800# for async_pool speedup
1710void 1801void
1711_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1712 CODE: 1803 CODE:
1713{ 1804{
1714 int i, len; 1805 struct coro *coro = SvSTATE (coro_current);
1715 HV *hv = (HV *)SvRV (coro_current); 1806 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv); 1807 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1718 AV *invoke_av; 1809 AV *invoke_av;
1810 int i, len;
1719 1811
1720 if (!invoke) 1812 if (!invoke)
1721 croak ("\3terminate\2\n"); 1813 croak ("\3async_pool terminate\2\n");
1814
1815 SvREFCNT_dec (coro->saved_deffh);
1816 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1722 1817
1723 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
1724 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1819 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1725 1820
1726 invoke_av = (AV *)SvRV (invoke); 1821 invoke_av = (AV *)SvRV (invoke);
1744{ 1839{
1745 struct coro *coro = SvSTATE (coro_current); 1840 struct coro *coro = SvSTATE (coro_current);
1746 1841
1747 sv_setsv (cb, &PL_sv_undef); 1842 sv_setsv (cb, &PL_sv_undef);
1748 1843
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0;
1846
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1752 1850
1753 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 coro->save = CORO_SAVE_DEF; 1854
1757 coro->prio = 0; 1855 coro->prio = 0;
1856
1857 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1858 api_trace (coro_current, 0);
1859
1758 av_push (av_async_pool, newSVsv (coro_current)); 1860 av_push (av_async_pool, newSVsv (coro_current));
1759} 1861}
1760 1862
1761 1863
1762MODULE = Coro::State PACKAGE = Coro::AIO 1864MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines