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.194 by root, Sat Oct 6 00:08:04 2007 UTC vs.
Revision 1.221 by root, Sun Jan 13 09:47:22 2008 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
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
143static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 148static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
149 151
150static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
152 157
153/* async_pool helper stuff */ 158/* async_pool helper stuff */
154static SV *sv_pool_rss; 159static SV *sv_pool_rss;
155static SV *sv_pool_size; 160static SV *sv_pool_size;
156static AV *av_async_pool; 161static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 200};
196 201
202/* the structure where most of the perl state is stored, overlaid on the cxstack */
203typedef struct {
204 SV *defsv;
205 AV *defav;
206 SV *errsv;
207 SV *irsgv;
208#define VAR(name,type) type name;
209# include "state.h"
210#undef VAR
211} perl_slots;
212
213#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
214
197/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
198struct coro { 216struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 218 coro_cctx *cctx;
201 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
202 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
206 227 HV *hv; /* the perl hash associated with this coro, if any */
207 /* optionally saved, might be zero */
208 AV *defav; /* @_ */
209 SV *defsv; /* $_ */
210 SV *errsv; /* $@ */
211 SV *deffh; /* default filehandle */
212 SV *irssv; /* $/ */
213 SV *irssv_sv; /* real $/ cache */
214
215#define VAR(name,type) type name;
216# include "state.h"
217#undef VAR
218 228
219 /* statistics */ 229 /* statistics */
220 int usecount; /* number of transfers to this coro */ 230 int usecount; /* number of transfers to this coro */
221 231
222 /* coro process data */ 232 /* coro process data */
223 int prio; 233 int prio;
224 //SV *throw; 234 SV *throw; /* exception to be thrown */
225 235
226 /* async_pool */ 236 /* async_pool */
227 SV *saved_deffh; 237 SV *saved_deffh;
228 238
229 /* linked list */ 239 /* linked list */
230 struct coro *next, *prev; 240 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 241};
233 242
234typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
236 245
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249static int coro_nready; 258static int coro_nready;
250static struct coro *coro_first; 259static struct coro *coro_first;
251 260
252/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
262
263static SV *
264coro_get_sv (pTHX_ const char *name, int create)
265{
266#if PERL_VERSION_ATLEAST (5,9,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create);
269#endif
270 return get_sv (name, create);
271}
272
273static AV *
274coro_get_av (pTHX_ const char *name, int create)
275{
276#if PERL_VERSION_ATLEAST (5,9,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create);
279#endif
280 return get_av (name, create);
281}
282
283static HV *
284coro_get_hv (pTHX_ const char *name, int create)
285{
286#if PERL_VERSION_ATLEAST (5,9,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create);
289#endif
290 return get_hv (name, create);
291}
253 292
254static AV * 293static AV *
255coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
256{ 295{
257 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
305 344
306 /* casting is fun. */ 345 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
309 348
310 SvREFCNT_dec (av);
311
312 return 0; 349 return 0;
313} 350}
314 351
315#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 354
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
318 359
319#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
324 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 369
326static struct coro * 370static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
328{ 372{
329 HV *stash; 373 HV *stash;
341 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
344 } 388 }
345 389
346 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
348} 392}
349 393
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 395
352/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
353static void 397static void
354get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
355{ 399{
356 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 401 AV *av;
358 402
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 405 else
373} 417}
374 418
375static void 419static void
376put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
377{ 421{
378 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 423 AV *av;
380 424
381 if (expect_false (!mg)) 425 if (expect_false (!mg))
382 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
385 mg->mg_virtual = &vtbl_coro;
386 mg->mg_obj = (SV *)newAV ();
387 }
388 427
389 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
390 429
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
398 437
399static void 438static void
400load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
401{ 440{
441 perl_slots *slot = c->slot;
442 c->slot = 0;
443
444 PL_mainstack = c->mainstack;
445
446 GvSV (PL_defgv) = slot->defsv;
447 GvAV (PL_defgv) = slot->defav;
448 GvSV (PL_errgv) = slot->errsv;
449 GvSV (irsgv) = slot->irsgv;
450
402#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 452 # include "state.h"
404#undef VAR 453 #undef VAR
405
406 GvSV (PL_defgv) = c->defsv;
407 GvAV (PL_defgv) = c->defav;
408 GvSV (PL_errgv) = c->errsv;
409 GvSV (irsgv) = c->irssv_sv;
410 454
411 { 455 {
412 dSP; 456 dSP;
457
413 CV *cv; 458 CV *cv;
414 459
415 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
417 { 462 {
472 } 517 }
473 518
474 PUTBACK; 519 PUTBACK;
475 } 520 }
476 521
522 /* allocate some space on the context stack for our purposes */
523 /* we manually unroll here, as usually 2 slots is enough */
524 if (SLOT_COUNT >= 1) CXINC;
525 if (SLOT_COUNT >= 2) CXINC;
526 if (SLOT_COUNT >= 3) CXINC;
527 {
528 int i;
529 for (i = 3; i < SLOT_COUNT; ++i)
530 CXINC;
531 }
532 cxstack_ix -= SLOT_COUNT; /* undo allocation */
533
534 c->mainstack = PL_mainstack;
535
536 {
537 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
538
477 c->defav = GvAV (PL_defgv); 539 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 540 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 541 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 542 slot->irsgv = GvSV (irsgv);
481 543
482#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 545 # include "state.h"
484#undef VAR 546 #undef VAR
547 }
485} 548}
486 549
487/* 550/*
488 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
495#else 558#else
496static void 559static void
497coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
498{ 561{
499 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 566
504 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 570
508 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 574 PL_tmps_max = 32;
512 575
513 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
516 579
517#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
519#endif 582#endif
520 583
521 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
524 587
525 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 590 PL_savestack_max = 24;
528 591
529#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
530 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 595 PL_retstack_max = 4;
569{ 632{
570 size_t rss = sizeof (*coro); 633 size_t rss = sizeof (*coro);
571 634
572 if (coro->mainstack) 635 if (coro->mainstack)
573 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
574 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
575 { 641 {
642 slot = &tmp_slot;
643
576 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 645 # include "state.h"
578 #undef VAR 646 #undef VAR
579 } 647 }
648 else
649 slot = coro->slot;
580 650
581 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
582 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
589 658
590#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
591 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
592#endif 661#endif
593 } 662 }
594 663
595 return rss; 664 return rss;
596} 665}
597 666
598/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 const char *s = MgPV_nolen_const (mg);
685
686 if (*s == '_')
687 {
688 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
689 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
690 }
691
692 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
693}
694
695static int
696coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
697{
698 const char *s = MgPV_nolen_const (mg);
699
700 if (*s == '_')
701 {
702 SV **svp = 0;
703
704 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
705 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
706
707 if (svp)
708 {
709 SV *old = *svp;
710 *svp = newSVsv (sv);
711 SvREFCNT_dec (old);
712 return;
713 }
714 }
715
716 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
717}
599 718
600static void 719static void
601coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
602{ 721{
603 /* 722 /*
608 PL_runops = RUNOPS_DEFAULT; 727 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 728 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 729 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 730 PL_comppad = 0;
612 PL_curpm = 0; 731 PL_curpm = 0;
732 PL_curpad = 0;
613 PL_localizing = 0; 733 PL_localizing = 0;
614 PL_dirty = 0; 734 PL_dirty = 0;
615 PL_restartop = 0; 735 PL_restartop = 0;
736
737 /* recreate the die/warn hooks */
738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
616 740
617 GvSV (PL_defgv) = newSV (0); 741 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0); 743 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 744 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv)); 745 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv); 746 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
625 747
626 { 748 {
627 dSP; 749 dSP;
628 LOGOP myop; 750 LOGOP myop;
629 751
636 PUTBACK; 758 PUTBACK;
637 PL_op = (OP *)&myop; 759 PL_op = (OP *)&myop;
638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 760 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
639 SPAGAIN; 761 SPAGAIN;
640 } 762 }
763
764 /* this newly created coroutine might be run on an existing cctx which most
765 * likely was suspended in set_stacklevel, called from entersub.
766 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
767 * so we ENTER here for symmetry
768 */
769 ENTER;
641} 770}
642 771
643static void 772static void
644coro_destroy (pTHX_ struct coro *coro) 773coro_destroy (pTHX_ struct coro *coro)
645{ 774{
665 SvREFCNT_dec (GvSV (PL_errgv)); 794 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv); 795 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs); 796 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv)); 797 SvREFCNT_dec (GvSV (irsgv));
669 798
799 SvREFCNT_dec (PL_diehook);
800 SvREFCNT_dec (PL_warnhook);
801
670 SvREFCNT_dec (coro->saved_deffh); 802 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw); 803 SvREFCNT_dec (coro->throw);
672 804
673 coro_destroy_stacks (aTHX); 805 coro_destroy_stacks (aTHX);
674} 806}
675 807
676static void 808static void
809 941
810/* inject a fake call to Coro::State::_cctx_init into the execution */ 942/* inject a fake call to Coro::State::_cctx_init into the execution */
811/* _cctx_init should be careful, as it could be called at almost any time */ 943/* _cctx_init should be careful, as it could be called at almost any time */
812/* during execution of a perl program */ 944/* during execution of a perl program */
813static void NOINLINE 945static void NOINLINE
814prepare_cctx (pTHX_ coro_cctx *cctx) 946cctx_prepare (pTHX_ coro_cctx *cctx)
815{ 947{
816 dSP; 948 dSP;
817 LOGOP myop; 949 LOGOP myop;
818 950
819 PL_top_env = &PL_start_env; 951 PL_top_env = &PL_start_env;
837 969
838/* 970/*
839 * this is a _very_ stripped down perl interpreter ;) 971 * this is a _very_ stripped down perl interpreter ;)
840 */ 972 */
841static void 973static void
842coro_run (void *arg) 974cctx_run (void *arg)
843{ 975{
844 dTHX; 976 dTHX;
845 977
846 /* coro_run is the alternative tail of transfer(), so unlock here. */ 978 /* cctx_run is the alternative tail of transfer(), so unlock here. */
847 UNLOCK; 979 UNLOCK;
848 980
849 /* we now skip the entersub that lead to transfer() */ 981 /* we now skip the entersub that lead to transfer() */
850 PL_op = PL_op->op_next; 982 PL_op = PL_op->op_next;
851 983
852 /* inject a fake subroutine call to cctx_init */ 984 /* inject a fake subroutine call to cctx_init */
853 prepare_cctx (aTHX_ (coro_cctx *)arg); 985 cctx_prepare (aTHX_ (coro_cctx *)arg);
854 986
855 /* somebody or something will hit me for both perl_run and PL_restartop */ 987 /* somebody or something will hit me for both perl_run and PL_restartop */
856 PL_restartop = PL_op; 988 PL_restartop = PL_op;
857 perl_run (PL_curinterp); 989 perl_run (PL_curinterp);
858 990
877 ++cctx_count; 1009 ++cctx_count;
878 1010
879 Newz (0, cctx, 1, coro_cctx); 1011 Newz (0, cctx, 1, coro_cctx);
880 1012
881#if HAVE_MMAP 1013#if HAVE_MMAP
882
883 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1014 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
884 /* mmap supposedly does allocate-on-write for us */ 1015 /* mmap supposedly does allocate-on-write for us */
885 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1016 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
886 1017
887 if (cctx->sptr != (void *)-1) 1018 if (cctx->sptr != (void *)-1)
908 stack_start = cctx->sptr; 1039 stack_start = cctx->sptr;
909 stack_size = cctx->ssize; 1040 stack_size = cctx->ssize;
910 } 1041 }
911 1042
912 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1043 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
913 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1044 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
914 1045
915 return cctx; 1046 return cctx;
916} 1047}
917 1048
918static void 1049static void
990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1121 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
991 1122
992 if (expect_false (next->flags & CF_DESTROYED)) 1123 if (expect_false (next->flags & CF_DESTROYED))
993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1124 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
994 1125
1126 if (
1127#if PERL_VERSION_ATLEAST (5,9,0)
1128 expect_false (PL_parser)
1129#else
995 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1130 expect_false (PL_lex_state != LEX_NOTPARSING)
1131#endif
1132 )
996 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1133 croak ("Coro::State::transfer called while parsing, but this is not supported");
997 } 1134 }
998} 1135}
999 1136
1000/* always use the TRANSFER macro */ 1137/* always use the TRANSFER macro */
1001static void NOINLINE 1138static void NOINLINE
1002transfer (pTHX_ struct coro *prev, struct coro *next) 1139transfer (pTHX_ struct coro *prev, struct coro *next)
1003{ 1140{
1004 dSTACKLEVEL; 1141 dSTACKLEVEL;
1142 static volatile int has_throw;
1005 1143
1006 /* sometimes transfer is only called to set idle_sp */ 1144 /* sometimes transfer is only called to set idle_sp */
1007 if (expect_false (!next)) 1145 if (expect_false (!next))
1008 { 1146 {
1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1147 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1024 prev->flags &= ~CF_RUNNING; 1162 prev->flags &= ~CF_RUNNING;
1025 next->flags |= CF_RUNNING; 1163 next->flags |= CF_RUNNING;
1026 1164
1027 LOCK; 1165 LOCK;
1028 1166
1167 /* first get rid of the old state */
1168 save_perl (aTHX_ prev);
1169
1029 if (expect_false (next->flags & CF_NEW)) 1170 if (expect_false (next->flags & CF_NEW))
1030 { 1171 {
1031 /* need to start coroutine */ 1172 /* need to start coroutine */
1032 next->flags &= ~CF_NEW; 1173 next->flags &= ~CF_NEW;
1033 /* first get rid of the old state */
1034 save_perl (aTHX_ prev);
1035 /* setup coroutine call */ 1174 /* setup coroutine call */
1036 coro_setup (aTHX_ next); 1175 coro_setup (aTHX_ next);
1037 } 1176 }
1038 else 1177 else
1039 {
1040 /* coroutine already started */
1041 save_perl (aTHX_ prev);
1042 load_perl (aTHX_ next); 1178 load_perl (aTHX_ next);
1043 }
1044 1179
1045 prev__cctx = prev->cctx; 1180 prev__cctx = prev->cctx;
1046 1181
1047 /* possibly "free" the cctx */ 1182 /* possibly "free" the cctx */
1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1183 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1053 prev->cctx = 0; 1188 prev->cctx = 0;
1054 1189
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1190 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1191 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1192 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1193 if (!next->cctx)
1058 next->cctx = cctx_get (aTHX); 1194 next->cctx = cctx_get (aTHX);
1059 1195
1060 cctx_put (prev__cctx); 1196 cctx_put (prev__cctx);
1061 } 1197 }
1062 1198
1063 ++next->usecount; 1199 ++next->usecount;
1064 1200
1065 if (expect_true (!next->cctx)) 1201 if (expect_true (!next->cctx))
1066 next->cctx = cctx_get (aTHX); 1202 next->cctx = cctx_get (aTHX);
1203
1204 has_throw = !!next->throw;
1067 1205
1068 if (expect_false (prev__cctx != next->cctx)) 1206 if (expect_false (prev__cctx != next->cctx))
1069 { 1207 {
1070 prev__cctx->top_env = PL_top_env; 1208 prev__cctx->top_env = PL_top_env;
1071 PL_top_env = next->cctx->top_env; 1209 PL_top_env = next->cctx->top_env;
1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1210 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1073 } 1211 }
1074 1212
1075 free_coro_mortal (aTHX); 1213 free_coro_mortal (aTHX);
1076 UNLOCK; 1214 UNLOCK;
1215
1216 if (expect_false (has_throw))
1217 {
1218 struct coro *coro = SvSTATE (coro_current);
1219
1220 if (coro->throw)
1221 {
1222 SV *exception = coro->throw;
1223 coro->throw = 0;
1224 sv_setsv (ERRSV, exception);
1225 croak (0);
1226 }
1227 }
1077 } 1228 }
1078} 1229}
1079 1230
1080struct transfer_args 1231struct transfer_args
1081{ 1232{
1116 save_perl (aTHX_ &temp); 1267 save_perl (aTHX_ &temp);
1117 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1118 1269
1119 coro_destroy (aTHX_ coro); 1270 coro_destroy (aTHX_ coro);
1120 1271
1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1272 load_perl (aTHX_ &temp);
1122 1273
1123 coro->mainstack = 0; 1274 coro->slot = 0;
1124 } 1275 }
1125 1276
1126 cctx_destroy (coro->cctx); 1277 cctx_destroy (coro->cctx);
1127 SvREFCNT_dec (coro->args); 1278 SvREFCNT_dec (coro->args);
1128 1279
1196{ 1347{
1197 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1348 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1198} 1349}
1199 1350
1200static SV * 1351static SV *
1201coro_deq (pTHX_ int min_prio) 1352coro_deq (pTHX)
1202{ 1353{
1203 int prio = PRIO_MAX - PRIO_MIN; 1354 int prio;
1204 1355
1205 min_prio -= PRIO_MIN;
1206 if (min_prio < 0)
1207 min_prio = 0;
1208
1209 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1356 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1210 if (AvFILLp (coro_ready [prio]) >= 0) 1357 if (AvFILLp (coro_ready [prio]) >= 0)
1211 return av_shift (coro_ready [prio]); 1358 return av_shift (coro_ready [prio]);
1212 1359
1213 return 0; 1360 return 0;
1214} 1361}
1250 SV *prev_sv, *next_sv; 1397 SV *prev_sv, *next_sv;
1251 1398
1252 for (;;) 1399 for (;;)
1253 { 1400 {
1254 LOCK; 1401 LOCK;
1255 next_sv = coro_deq (aTHX_ PRIO_MIN); 1402 next_sv = coro_deq (aTHX);
1256 1403
1257 /* nothing to schedule: call the idle handler */ 1404 /* nothing to schedule: call the idle handler */
1258 if (expect_false (!next_sv)) 1405 if (expect_false (!next_sv))
1259 { 1406 {
1260 dSP; 1407 dSP;
1264 SAVETMPS; 1411 SAVETMPS;
1265 1412
1266 PUSHMARK (SP); 1413 PUSHMARK (SP);
1267 PUTBACK; 1414 PUTBACK;
1268 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1269 1417
1270 FREETMPS; 1418 FREETMPS;
1271 LEAVE; 1419 LEAVE;
1272 continue; 1420 continue;
1273 } 1421 }
1385 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1533 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1386 1534
1387 if (coro->flags & CF_RUNNING) 1535 if (coro->flags & CF_RUNNING)
1388 PL_runops = RUNOPS_DEFAULT; 1536 PL_runops = RUNOPS_DEFAULT;
1389 else 1537 else
1390 coro->runops = RUNOPS_DEFAULT; 1538 coro->slot->runops = RUNOPS_DEFAULT;
1391 } 1539 }
1392} 1540}
1393 1541
1394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1542MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1395 1543
1402#endif 1550#endif
1403 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1404 1552
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1555
1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560
1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1407 1564
1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1409 1566
1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1417 1574
1418 while (main_top_env->je_prev) 1575 while (main_top_env->je_prev)
1419 main_top_env = main_top_env->je_prev; 1576 main_top_env = main_top_env->je_prev;
1420 1577
1421 coroapi.ver = CORO_API_VERSION; 1578 coroapi.ver = CORO_API_VERSION;
1579 coroapi.rev = CORO_API_REVISION;
1422 coroapi.transfer = api_transfer; 1580 coroapi.transfer = api_transfer;
1423 1581
1424 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1582 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1425} 1583}
1426 1584
1427SV * 1585SV *
1428new (char *klass, ...) 1586new (char *klass, ...)
1429 CODE: 1587 CODE:
1430{ 1588{
1431 struct coro *coro; 1589 struct coro *coro;
1590 MAGIC *mg;
1432 HV *hv; 1591 HV *hv;
1433 int i; 1592 int i;
1434 1593
1435 Newz (0, coro, 1, struct coro); 1594 Newz (0, coro, 1, struct coro);
1436 coro->args = newAV (); 1595 coro->args = newAV ();
1439 if (coro_first) coro_first->prev = coro; 1598 if (coro_first) coro_first->prev = coro;
1440 coro->next = coro_first; 1599 coro->next = coro_first;
1441 coro_first = coro; 1600 coro_first = coro;
1442 1601
1443 coro->hv = hv = newHV (); 1602 coro->hv = hv = newHV ();
1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1603 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1604 mg->mg_flags |= MGf_DUP;
1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1605 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1446 1606
1447 av_extend (coro->args, items - 1); 1607 av_extend (coro->args, items - 1);
1448 for (i = 1; i < items; i++) 1608 for (i = 1; i < items; i++)
1449 av_push (coro->args, newSVsv (ST (i))); 1609 av_push (coro->args, newSVsv (ST (i)));
1463 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1464 CODE: 1624 CODE:
1465{ 1625{
1466 struct transfer_args ta; 1626 struct transfer_args ta;
1467 1627
1628 PUTBACK;
1468 switch (ix) 1629 switch (ix)
1469 { 1630 {
1470 case 0: 1631 case 0:
1471 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1472 ta.next = 0; 1633 ta.next = 0;
1491 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1492 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1493 1654
1494 break; 1655 break;
1495 } 1656 }
1657 SPAGAIN;
1496 1658
1497 BARRIER; 1659 BARRIER;
1660 PUTBACK;
1498 TRANSFER (ta); 1661 TRANSFER (ta);
1499 1662 SPAGAIN; /* might be the sp of a different coroutine now */
1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1663 /* be extra careful not to ever do anything after TRANSFER */
1501 XSRETURN_YES;
1502} 1664}
1503 1665
1504bool 1666bool
1505_destroy (SV *coro_sv) 1667_destroy (SV *coro_sv)
1506 CODE: 1668 CODE:
1555 CODE: 1717 CODE:
1556{ 1718{
1557 if (coro->mainstack) 1719 if (coro->mainstack)
1558 { 1720 {
1559 struct coro temp; 1721 struct coro temp;
1560 Zero (&temp, 1, struct coro);
1561 1722
1562 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1563 { 1724 {
1725 PUTBACK;
1564 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1565 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1566 } 1728 }
1567 1729
1568 { 1730 {
1569 dSP; 1731 dSP;
1570 ENTER; 1732 ENTER;
1571 SAVETMPS; 1733 SAVETMPS;
1734 PUTBACK;
1735 PUSHSTACK;
1572 PUSHMARK (SP); 1736 PUSHMARK (SP);
1573 PUTBACK; 1737
1574 if (ix) 1738 if (ix)
1575 eval_sv (coderef, 0); 1739 eval_sv (coderef, 0);
1576 else 1740 else
1577 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1741 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1742
1743 POPSTACK;
1578 SPAGAIN; 1744 SPAGAIN;
1579 FREETMPS; 1745 FREETMPS;
1580 LEAVE; 1746 LEAVE;
1581 PUTBACK; 1747 PUTBACK;
1582 } 1748 }
1583 1749
1584 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1585 { 1751 {
1586 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1587 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1588 } 1755 }
1589 } 1756 }
1590} 1757}
1591 1758
1592SV * 1759SV *
1640 1807
1641BOOT: 1808BOOT:
1642{ 1809{
1643 int i; 1810 int i;
1644 1811
1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1647 av_async_pool = get_av ("Coro::async_pool", TRUE); 1814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1648 1815
1649 coro_current = get_sv ("Coro::current", FALSE); 1816 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1650 SvREADONLY_on (coro_current); 1817 SvREADONLY_on (coro_current);
1651 1818
1652 coro_stash = gv_stashpv ("Coro", TRUE); 1819 coro_stash = gv_stashpv ("Coro", TRUE);
1653 1820
1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1821 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1655 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1822 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1656 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1823 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1657 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1824 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1660 1827
1661 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1828 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1662 coro_ready[i] = newAV (); 1829 coro_ready[i] = newAV ();
1663 1830
1664 { 1831 {
1665 SV *sv = perl_get_sv("Coro::API", 1); 1832 SV *sv = perl_get_sv ("Coro::API", TRUE);
1833 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1666 1834
1667 coroapi.schedule = api_schedule; 1835 coroapi.schedule = api_schedule;
1668 coroapi.cede = api_cede; 1836 coroapi.cede = api_cede;
1669 coroapi.cede_notself = api_cede_notself; 1837 coroapi.cede_notself = api_cede_notself;
1670 coroapi.ready = api_ready; 1838 coroapi.ready = api_ready;
1721 CODE: 1889 CODE:
1722 RETVAL = coro_nready; 1890 RETVAL = coro_nready;
1723 OUTPUT: 1891 OUTPUT:
1724 RETVAL 1892 RETVAL
1725 1893
1894void
1895throw (Coro::State self, SV *throw = &PL_sv_undef)
1896 PROTOTYPE: $;$
1897 CODE:
1898 SvREFCNT_dec (self->throw);
1899 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1900
1726# for async_pool speedup 1901# for async_pool speedup
1727void 1902void
1728_pool_1 (SV *cb) 1903_pool_1 (SV *cb)
1729 CODE: 1904 CODE:
1730{ 1905{
1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1735 AV *invoke_av; 1910 AV *invoke_av;
1736 int i, len; 1911 int i, len;
1737 1912
1738 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1739 croak ("\3terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1740 1918
1741 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1743 1921
1744 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1772 1950
1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1952 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1953 {
1954 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1775 croak ("\3terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1776 1957
1777 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1780 1961

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines