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.177 by root, Tue Oct 2 10:24:44 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 */
193 AV *defav; /* @_ */
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
204 /* statistics */ 225 /* statistics */
205 int usecount; /* number of switches to this coro */ 226 int usecount; /* number of transfers to this coro */
206 227
207 /* coro process data */ 228 /* coro process data */
208 int prio; 229 int prio;
230 SV *throw;
231
232 /* async_pool */
233 SV *saved_deffh;
209 234
210 /* linked list */ 235 /* linked list */
211 struct coro *next, *prev; 236 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
213}; 238};
… …
311 MAGIC *mg; 336 MAGIC *mg;
312 337
313 if (SvROK (coro)) 338 if (SvROK (coro))
314 coro = SvRV (coro); 339 coro = SvRV (coro);
315 340
316 if (SvTYPE (coro) != SVt_PVHV) 341 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 342 croak ("Coro::State object required");
318 343
319 stash = SvSTASH (coro); 344 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 345 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 346 {
322 /* very slow, but rare, check */ 347 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 349 croak ("Coro::State object required");
325 } 350 }
… …
335get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
336{ 361{
337 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 363 AV *av;
339 364
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 367 else
343 { 368 {
344#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
358{ 383{
359 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 385 AV *av;
361 386
362 if (!mg) 387 if (expect_false (!mg))
363 { 388 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
368 } 393 }
369 394
370 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
371 396
372 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
374 399
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 401}
377 402
378/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
379 404
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 405static void
386load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
387{ 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
388#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 419 # include "state.h"
390#undef VAR 420 #undef VAR
391
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 421
412 { 422 {
413 dSP; 423 dSP;
424
414 CV *cv; 425 CV *cv;
415 426
416 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
418 { 429 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
422 } 433 }
… …
441 452
442 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
444 for (;;) 455 for (;;)
445 { 456 {
446 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
447 { 458 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
449 460
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 462 {
452 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
453 464
454 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
455 { 466 {
456 EXTEND (SP, 3); 467 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
463 } 474 }
464 } 475 }
465 } 476 }
466 477
467 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 479 break;
469 480
470 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
473 } 484 }
474 485
475 PUTBACK; 486 PUTBACK;
476 } 487 }
477 488
478 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 */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 490 {
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 491 /* we manually unroll here, as usually 2 slots is enough */
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 492 int i;
482 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;
483 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
484#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 513 # include "state.h"
486#undef VAR 514 #undef VAR
515 }
487} 516}
488 517
489/* 518/*
490 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
497#else 526#else
498static void 527static void
499coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
500{ 529{
501 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 534
506 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 538
510 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 542 PL_tmps_max = 32;
514 543
515 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
518 547
519#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
521#endif 550#endif
522 551
523 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
526 555
527 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 558 PL_savestack_max = 24;
530 559
531#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 563 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 569 * destroy the stacks, the callchain etc...
541 */ 570 */
542static void 571static void
543coro_destroy_stacks (pTHX) 572coro_destroy_stacks (pTHX)
544{ 573{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 574 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 575 PL_curstackinfo = PL_curstackinfo->si_next;
564 576
565 while (PL_curstackinfo) 577 while (PL_curstackinfo)
566 { 578 {
… …
584} 596}
585 597
586static size_t 598static size_t
587coro_rss (pTHX_ struct coro *coro) 599coro_rss (pTHX_ struct coro *coro)
588{ 600{
589 size_t rss = sizeof (coro); 601 size_t rss = sizeof (*coro);
590 602
591 if (coro->mainstack) 603 if (coro->mainstack)
592 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
593 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
594 { 609 {
610 slot = &tmp_slot;
611
595 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 613 # include "state.h"
597 #undef VAR 614 #undef VAR
598 } 615 }
616 else
617 slot = coro->slot;
599 618
600 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
608 626
609#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
611#endif 629#endif
612 } 630 }
613 631
614 return rss; 632 return rss;
615} 633}
616 634
617/** coroutine stack handling ************************************************/ 635/** coroutine stack handling ************************************************/
618 636
619static void 637static void
620setup_coro (pTHX_ struct coro *coro) 638coro_setup (pTHX_ struct coro *coro)
621{ 639{
622 /* 640 /*
623 * emulate part of the perl startup here. 641 * emulate part of the perl startup here.
624 */ 642 */
625 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 645 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 648 PL_comppad = 0;
631 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
632 PL_localizing = 0; 651 PL_localizing = 0;
633 PL_dirty = 0; 652 PL_dirty = 0;
634 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);
635 663
636 { 664 {
637 dSP; 665 dSP;
638 LOGOP myop; 666 LOGOP myop;
639 667
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 668 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 669 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 670 myop.op_flags = OPf_WANT_VOID;
646 671
647 PUSHMARK (SP); 672 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 673 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 674 PUTBACK;
650 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 677 SPAGAIN;
653 } 678 }
654 679
655 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);
656} 717}
657 718
658static void 719static void
659free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
660{ 721{
661 if (coro_mortal) 722 if (expect_true (coro_mortal))
662 { 723 {
663 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 725 coro_mortal = 0;
665 } 726 }
666} 727}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 756 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 757 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 758 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 759 : bot;
699 760
761 av_extend (av, top - bot);
700 while (bot < top) 762 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 763 av_push (av, SvREFCNT_inc (*bot++));
702 764
703 PL_runops = RUNOPS_DEFAULT; 765 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 766 ENTER;
… …
916 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
917 979
918 Safefree (cctx); 980 Safefree (cctx);
919} 981}
920 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
921static coro_cctx * 986static coro_cctx *
922cctx_get (pTHX) 987cctx_get (pTHX)
923{ 988{
924 while (cctx_first) 989 while (expect_true (cctx_first))
925 { 990 {
926 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 992 cctx_first = cctx->next;
928 --cctx_idle; 993 --cctx_idle;
929 994
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 996 return cctx;
932 997
933 cctx_destroy (cctx); 998 cctx_destroy (cctx);
934 } 999 }
935 1000
… …
938 1003
939static void 1004static void
940cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
941{ 1006{
942 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1009 {
945 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1011 cctx_first = first->next;
947 --cctx_idle; 1012 --cctx_idle;
948 1013
… …
954 cctx_first = cctx; 1019 cctx_first = cctx;
955} 1020}
956 1021
957/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
958 1023
959static void NOINLINE 1024static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1025transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1026{
962 if (prev != next) 1027 if (expect_true (prev != next))
963 { 1028 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1029 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 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");
966 1031
967 if (next->flags & CF_RUNNING) 1032 if (expect_false (next->flags & CF_RUNNING))
968 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");
969 1034
970 if (next->flags & CF_DESTROYED) 1035 if (expect_false (next->flags & CF_DESTROYED))
971 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");
972 1037
1038 if (
1039#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser)
1041#else
973 if (PL_lex_state != LEX_NOTPARSING) 1042 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif
1044 )
974 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");
975 } 1046 }
976} 1047}
977 1048
978/* always use the TRANSFER macro */ 1049/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1052{
982 dSTACKLEVEL; 1053 dSTACKLEVEL;
983 1054
984 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1056 if (expect_false (!next))
986 { 1057 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 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 */
989 } 1060 }
990 else if (prev != next) 1061 else if (expect_true (prev != next))
991 { 1062 {
992 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
993 1064
994 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
995 { 1066 {
996 /* create a new empty context */ 1067 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
1004 1075
1005 LOCK; 1076 LOCK;
1006 1077
1007 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
1008 { 1079 {
1009 /* need to start coroutine */ 1080 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1082 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1084 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1085 coro_setup (aTHX_ next);
1015 } 1086 }
1016 else 1087 else
1017 { 1088 {
1018 /* coroutine already started */ 1089 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1090 save_perl (aTHX_ prev);
… …
1021 } 1092 }
1022 1093
1023 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
1024 1095
1025 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
1026 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)))
1027 { 1098 {
1028 /* 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 */
1029 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));
1030 1101
1031 prev->cctx = 0; 1102 prev->cctx = 0;
1032 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
1033 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
1034 } 1110 }
1035 1111
1036 ++next->usecount; 1112 ++next->usecount;
1037 1113
1038 if (!next->cctx) 1114 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
1040 1116
1041 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
1042 { 1118 {
1043 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1122 }
1047 1123
1048 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
1049 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 }
1050 } 1139 }
1051} 1140}
1052 1141
1053struct transfer_args 1142struct transfer_args
1054{ 1143{
… …
1084 struct coro temp; 1173 struct coro temp;
1085 1174
1086 if (coro->flags & CF_RUNNING) 1175 if (coro->flags & CF_RUNNING)
1087 croak ("FATAL: tried to destroy currently running coroutine"); 1176 croak ("FATAL: tried to destroy currently running coroutine");
1088 1177
1089 Zero (&temp, 1, struct coro);
1090 temp.save = CORO_SAVE_ALL;
1091
1092 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
1093 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
1094 1180
1095 coro_destroy_stacks (aTHX); 1181 coro_destroy (aTHX_ coro);
1096 1182
1097 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
1098 1184
1099 coro->mainstack = 0; 1185 coro->slot = 0;
1100 } 1186 }
1101 1187
1102 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
1103 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
1104 1190
… …
1163 1249
1164 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1250 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1165 TRANSFER (ta); 1251 TRANSFER (ta);
1166} 1252}
1167 1253
1168static int
1169api_save (SV *coro_sv, int new_save)
1170{
1171 dTHX;
1172 struct coro *coro = SvSTATE (coro_sv);
1173 int old_save = coro->save;
1174
1175 if (new_save >= 0)
1176 coro->save = new_save;
1177
1178 return old_save;
1179}
1180
1181/** Coro ********************************************************************/ 1254/** Coro ********************************************************************/
1182 1255
1183static void 1256static void
1184coro_enq (pTHX_ SV *coro_sv) 1257coro_enq (pTHX_ SV *coro_sv)
1185{ 1258{
… …
1242 { 1315 {
1243 LOCK; 1316 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1245 1318
1246 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1320 if (expect_false (!next_sv))
1248 { 1321 {
1249 dSP; 1322 dSP;
1250 UNLOCK; 1323 UNLOCK;
1251 1324
1252 ENTER; 1325 ENTER;
… …
1262 } 1335 }
1263 1336
1264 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1265 1338
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1341 {
1269 UNLOCK; 1342 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1272 continue; 1345 continue;
… …
1328 dTHX; 1401 dTHX;
1329 struct transfer_args ta; 1402 struct transfer_args ta;
1330 1403
1331 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1332 1405
1333 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1334 { 1407 {
1335 TRANSFER (ta); 1408 TRANSFER (ta);
1336 return 1; 1409 return 1;
1337 } 1410 }
1338 else 1411 else
… …
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1447 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1448
1376 if (coro->flags & CF_RUNNING) 1449 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1450 PL_runops = RUNOPS_DEFAULT;
1378 else 1451 else
1379 coro->runops = RUNOPS_DEFAULT; 1452 coro->slot->runops = RUNOPS_DEFAULT;
1380 } 1453 }
1381} 1454}
1382 1455
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1457
… …
1388{ 1461{
1389#ifdef USE_ITHREADS 1462#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1463 MUTEX_INIT (&coro_mutex);
1391#endif 1464#endif
1392 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);
1393 1469
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1471
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1474 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1475 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1400 1476
1401 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1403 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1407 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1408
1409 main_mainstack = PL_mainstack; 1477 main_mainstack = PL_mainstack;
1410 main_top_env = PL_top_env; 1478 main_top_env = PL_top_env;
1411 1479
1412 while (main_top_env->je_prev) 1480 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1481 main_top_env = main_top_env->je_prev;
… …
1425 struct coro *coro; 1493 struct coro *coro;
1426 HV *hv; 1494 HV *hv;
1427 int i; 1495 int i;
1428 1496
1429 Newz (0, coro, 1, struct coro); 1497 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1498 coro->args = newAV ();
1431 coro->save = CORO_SAVE_DEF;
1432 coro->flags = CF_NEW; 1499 coro->flags = CF_NEW;
1433 1500
1434 if (coro_first) coro_first->prev = coro; 1501 if (coro_first) coro_first->prev = coro;
1435 coro->next = coro_first; 1502 coro->next = coro_first;
1436 coro_first = coro; 1503 coro_first = coro;
1437 1504
1438 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1439 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;
1440 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1441 1508
1509 av_extend (coro->args, items - 1);
1442 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1444} 1512}
1445 OUTPUT: 1513 OUTPUT:
1446 RETVAL
1447
1448int
1449save (SV *coro, int new_save = -1)
1450 CODE:
1451 RETVAL = api_save (coro, new_save);
1452 OUTPUT:
1453 RETVAL
1454
1455int
1456save_also (SV *coro_sv, int save_also)
1457 CODE:
1458{
1459 struct coro *coro = SvSTATE (coro_sv);
1460 RETVAL = coro->save;
1461 coro->save |= save_also;
1462}
1463 OUTPUT:
1464 RETVAL 1514 RETVAL
1465 1515
1466# these not obviously related functions are all rolled into the same xs 1516# these not obviously related functions are all rolled into the same xs
1467# function to increase chances that they all will call transfer with the same 1517# function to increase chances that they all will call transfer with the same
1468# stack offset 1518# stack offset
… …
1507 } 1557 }
1508 1558
1509 BARRIER; 1559 BARRIER;
1510 TRANSFER (ta); 1560 TRANSFER (ta);
1511 1561
1512 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1513 XSRETURN_YES; 1563 XSRETURN_YES;
1514} 1564}
1515 1565
1516bool 1566bool
1517_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
… …
1567 CODE: 1617 CODE:
1568{ 1618{
1569 if (coro->mainstack) 1619 if (coro->mainstack)
1570 { 1620 {
1571 struct coro temp; 1621 struct coro temp;
1572 Zero (&temp, 1, struct coro);
1573 temp.save = CORO_SAVE_ALL;
1574 1622
1575 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1576 { 1624 {
1577 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1578 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
… …
1582 dSP; 1630 dSP;
1583 ENTER; 1631 ENTER;
1584 SAVETMPS; 1632 SAVETMPS;
1585 PUSHMARK (SP); 1633 PUSHMARK (SP);
1586 PUTBACK; 1634 PUTBACK;
1635
1587 if (ix) 1636 if (ix)
1588 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1589 else 1638 else
1590 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1591 SPAGAIN; 1641 SPAGAIN;
1592 FREETMPS; 1642 FREETMPS;
1593 LEAVE; 1643 LEAVE;
1594 PUTBACK; 1644 PUTBACK;
1595 } 1645 }
… …
1654BOOT: 1704BOOT:
1655{ 1705{
1656 int i; 1706 int i;
1657 1707
1658 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 */
1659 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 */
1660 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 */
1661 1714
1662 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1663 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1664 1717
1665 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1666 1719
1667 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1668 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1669 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1670 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1673 1726
1674 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1675 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1676 1729
1677 { 1730 {
1678 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 */
1679 1733
1680 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1681 coroapi.save = api_save;
1682 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
1685 coroapi.is_ready = api_is_ready; 1738 coroapi.is_ready = api_is_ready;
1686 coroapi.nready = &coro_nready; 1739 coroapi.nready = &coro_nready;
… …
1735 CODE: 1788 CODE:
1736 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1737 OUTPUT: 1790 OUTPUT:
1738 RETVAL 1791 RETVAL
1739 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
1740# for async_pool speedup 1800# for async_pool speedup
1741void 1801void
1742_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1743 CODE: 1803 CODE:
1744{ 1804{
1745 int i, len; 1805 struct coro *coro = SvSTATE (coro_current);
1746 HV *hv = (HV *)SvRV (coro_current); 1806 HV *hv = (HV *)SvRV (coro_current);
1747 AV *defav = GvAV (PL_defgv); 1807 AV *defav = GvAV (PL_defgv);
1748 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1749 AV *invoke_av; 1809 AV *invoke_av;
1810 int i, len;
1750 1811
1751 if (!invoke) 1812 if (!invoke)
1752 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);
1753 1817
1754 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1819 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1756 1820
1757 invoke_av = (AV *)SvRV (invoke); 1821 invoke_av = (AV *)SvRV (invoke);
… …
1775{ 1839{
1776 struct coro *coro = SvSTATE (coro_current); 1840 struct coro *coro = SvSTATE (coro_current);
1777 1841
1778 sv_setsv (cb, &PL_sv_undef); 1842 sv_setsv (cb, &PL_sv_undef);
1779 1843
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0;
1846
1780 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1781 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1782 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1783 1850
1784 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1785 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1786 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1787 1854
1788 coro->save = CORO_SAVE_DEF;
1789 coro->prio = 0; 1855 coro->prio = 0;
1790 1856
1791 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1857 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1792 api_trace (coro_current, 0); 1858 api_trace (coro_current, 0);
1793 1859

Diff Legend

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