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.197 by root, Sat Oct 6 19:25:00 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 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
70# ifndef IS_PADCONST 72# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
72# endif 74# endif
73#endif 75#endif
74 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
75/* 5.8.7 */ 90/* 5.8.7 */
76#ifndef SvRV_set 91#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif 93#endif
87 94
88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
89# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
90#endif 97#endif
143static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 153static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
149 156
150static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook;
160static SV *rv_warnhook;
161static HV *hv_sig; /* %SIG */
152 162
153/* async_pool helper stuff */ 163/* async_pool helper stuff */
154static SV *sv_pool_rss; 164static SV *sv_pool_rss;
155static SV *sv_pool_size; 165static SV *sv_pool_size;
156static AV *av_async_pool; 166static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 205};
196 206
207/* the structure where most of the perl state is stored, overlaid on the cxstack */
208typedef struct {
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213#define VAR(name,type) type name;
214# include "state.h"
215#undef VAR
216} perl_slots;
217
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219
197/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
198struct coro { 221struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 223 coro_cctx *cctx;
201 224
225 /* process data */
226 AV *mainstack;
227 perl_slots *slot; /* basically the saved sp */
228
202 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
206 232 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 233
219 /* statistics */ 234 /* statistics */
220 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
221 236
222 /* coro process data */ 237 /* coro process data */
223 int prio; 238 int prio;
224 SV *throw; 239 SV *throw; /* exception to be thrown */
225 240
226 /* async_pool */ 241 /* async_pool */
227 SV *saved_deffh; 242 SV *saved_deffh;
228 243
229 /* linked list */ 244 /* linked list */
230 struct coro *next, *prev; 245 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 246};
233 247
234typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
236 250
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 262static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249static int coro_nready; 263static int coro_nready;
250static struct coro *coro_first; 264static struct coro *coro_first;
251 265
252/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
267
268static SV *
269coro_get_sv (pTHX_ const char *name, int create)
270{
271#if PERL_VERSION_ATLEAST (5,9,0)
272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
273 get_sv (name, create);
274#endif
275 return get_sv (name, create);
276}
277
278static AV *
279coro_get_av (pTHX_ const char *name, int create)
280{
281#if PERL_VERSION_ATLEAST (5,9,0)
282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
283 get_av (name, create);
284#endif
285 return get_av (name, create);
286}
287
288static HV *
289coro_get_hv (pTHX_ const char *name, int create)
290{
291#if PERL_VERSION_ATLEAST (5,9,0)
292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
293 get_hv (name, create);
294#endif
295 return get_hv (name, create);
296}
253 297
254static AV * 298static AV *
255coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
256{ 300{
257 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
305 349
306 /* casting is fun. */ 350 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
309 353
310 SvREFCNT_dec (av);
311
312 return 0; 354 return 0;
313} 355}
314 356
315#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 359
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
318 364
319#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
324 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 374
326static struct coro * 375static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
328{ 377{
329 HV *stash; 378 HV *stash;
341 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
344 } 393 }
345 394
346 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
348} 397}
349 398
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 400
352/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
353static void 402static void
354get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
355{ 404{
356 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 406 AV *av;
358 407
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 410 else
373} 422}
374 423
375static void 424static void
376put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
377{ 426{
378 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 428 AV *av;
380 429
381 if (expect_false (!mg)) 430 if (expect_false (!mg))
382 { 431 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 432
389 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
390 434
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 441/** load & save, init *******************************************************/
398 442
399static void 443static void
400load_perl (pTHX_ Coro__State c) 444load_perl (pTHX_ Coro__State c)
401{ 445{
446 perl_slots *slot = c->slot;
447 c->slot = 0;
448
449 PL_mainstack = c->mainstack;
450
451 GvSV (PL_defgv) = slot->defsv;
452 GvAV (PL_defgv) = slot->defav;
453 GvSV (PL_errgv) = slot->errsv;
454 GvSV (irsgv) = slot->irsgv;
455
402#define VAR(name,type) PL_ ## name = c->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 457 # include "state.h"
404#undef VAR 458 #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 459
411 { 460 {
412 dSP; 461 dSP;
462
413 CV *cv; 463 CV *cv;
414 464
415 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
417 { 467 {
472 } 522 }
473 523
474 PUTBACK; 524 PUTBACK;
475 } 525 }
476 526
527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 {
533 int i;
534 for (i = 3; i < SLOT_COUNT; ++i)
535 CXINC;
536 }
537 cxstack_ix -= SLOT_COUNT; /* undo allocation */
538
539 c->mainstack = PL_mainstack;
540
541 {
542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
543
477 c->defav = GvAV (PL_defgv); 544 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 545 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 546 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 547 slot->irsgv = GvSV (irsgv);
481 548
482#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 550 # include "state.h"
484#undef VAR 551 #undef VAR
552 }
485} 553}
486 554
487/* 555/*
488 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
495#else 563#else
496static void 564static void
497coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
498{ 566{
499 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 571
504 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 575
508 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 579 PL_tmps_max = 32;
512 580
513 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
516 584
517#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
519#endif 587#endif
520 588
521 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
524 592
525 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 595 PL_savestack_max = 24;
528 596
529#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,9,0)
530 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 600 PL_retstack_max = 4;
569{ 637{
570 size_t rss = sizeof (*coro); 638 size_t rss = sizeof (*coro);
571 639
572 if (coro->mainstack) 640 if (coro->mainstack)
573 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
574 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
575 { 646 {
647 slot = &tmp_slot;
648
576 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 650 # include "state.h"
578 #undef VAR 651 #undef VAR
579 } 652 }
653 else
654 slot = coro->slot;
580 655
581 rss += sizeof (coro->curstackinfo); 656 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); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
589 663
590#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,9,0)
591 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
592#endif 666#endif
593 } 667 }
594 668
595 return rss; 669 return rss;
596} 670}
597 671
598/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
599 723
600static void 724static void
601coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
602{ 726{
603 /* 727 /*
612 PL_curpm = 0; 736 PL_curpm = 0;
613 PL_curpad = 0; 737 PL_curpad = 0;
614 PL_localizing = 0; 738 PL_localizing = 0;
615 PL_dirty = 0; 739 PL_dirty = 0;
616 PL_restartop = 0; 740 PL_restartop = 0;
741
742 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
617 745
618 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
619 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
620 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
621 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
636 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
637 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
638 SPAGAIN; 766 SPAGAIN;
639 } 767 }
640 768
641 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 769 /* this newly created coroutine might be run on an existing cctx which most
770 * likely was suspended in set_stacklevel, called from entersub.
771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
772 * so we ENTER here for symmetry
773 */
774 ENTER;
642} 775}
643 776
644static void 777static void
645coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
646{ 779{
666 SvREFCNT_dec (GvSV (PL_errgv)); 799 SvREFCNT_dec (GvSV (PL_errgv));
667 SvREFCNT_dec (PL_defoutgv); 800 SvREFCNT_dec (PL_defoutgv);
668 SvREFCNT_dec (PL_rs); 801 SvREFCNT_dec (PL_rs);
669 SvREFCNT_dec (GvSV (irsgv)); 802 SvREFCNT_dec (GvSV (irsgv));
670 803
804 SvREFCNT_dec (PL_diehook);
805 SvREFCNT_dec (PL_warnhook);
806
671 SvREFCNT_dec (coro->saved_deffh); 807 SvREFCNT_dec (coro->saved_deffh);
672 SvREFCNT_dec (coro->throw); 808 SvREFCNT_dec (coro->throw);
673 809
674 coro_destroy_stacks (aTHX); 810 coro_destroy_stacks (aTHX);
675} 811}
764 SAVETMPS; 900 SAVETMPS;
765 EXTEND (SP, 3); 901 EXTEND (SP, 3);
766 PUSHMARK (SP); 902 PUSHMARK (SP);
767 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
768 PUSHs (fullname); 904 PUSHs (fullname);
769 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 905 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
770 PUTBACK; 906 PUTBACK;
771 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
772 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 908 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
773 SPAGAIN; 909 SPAGAIN;
774 FREETMPS; 910 FREETMPS;
810 946
811/* inject a fake call to Coro::State::_cctx_init into the execution */ 947/* inject a fake call to Coro::State::_cctx_init into the execution */
812/* _cctx_init should be careful, as it could be called at almost any time */ 948/* _cctx_init should be careful, as it could be called at almost any time */
813/* during execution of a perl program */ 949/* during execution of a perl program */
814static void NOINLINE 950static void NOINLINE
815prepare_cctx (pTHX_ coro_cctx *cctx) 951cctx_prepare (pTHX_ coro_cctx *cctx)
816{ 952{
817 dSP; 953 dSP;
818 LOGOP myop; 954 LOGOP myop;
819 955
820 PL_top_env = &PL_start_env; 956 PL_top_env = &PL_start_env;
838 974
839/* 975/*
840 * this is a _very_ stripped down perl interpreter ;) 976 * this is a _very_ stripped down perl interpreter ;)
841 */ 977 */
842static void 978static void
843coro_run (void *arg) 979cctx_run (void *arg)
844{ 980{
845 dTHX; 981 dTHX;
846 982
847 /* coro_run is the alternative tail of transfer(), so unlock here. */ 983 /* cctx_run is the alternative tail of transfer(), so unlock here. */
848 UNLOCK; 984 UNLOCK;
849 985
850 /* we now skip the entersub that lead to transfer() */ 986 /* we now skip the entersub that lead to transfer() */
851 PL_op = PL_op->op_next; 987 PL_op = PL_op->op_next;
852 988
853 /* inject a fake subroutine call to cctx_init */ 989 /* inject a fake subroutine call to cctx_init */
854 prepare_cctx (aTHX_ (coro_cctx *)arg); 990 cctx_prepare (aTHX_ (coro_cctx *)arg);
855 991
856 /* somebody or something will hit me for both perl_run and PL_restartop */ 992 /* somebody or something will hit me for both perl_run and PL_restartop */
857 PL_restartop = PL_op; 993 PL_restartop = PL_op;
858 perl_run (PL_curinterp); 994 perl_run (PL_curinterp);
859 995
878 ++cctx_count; 1014 ++cctx_count;
879 1015
880 Newz (0, cctx, 1, coro_cctx); 1016 Newz (0, cctx, 1, coro_cctx);
881 1017
882#if HAVE_MMAP 1018#if HAVE_MMAP
883
884 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1019 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885 /* mmap supposedly does allocate-on-write for us */ 1020 /* mmap supposedly does allocate-on-write for us */
886 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1021 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
887 1022
888 if (cctx->sptr != (void *)-1) 1023 if (cctx->sptr != (void *)-1)
909 stack_start = cctx->sptr; 1044 stack_start = cctx->sptr;
910 stack_size = cctx->ssize; 1045 stack_size = cctx->ssize;
911 } 1046 }
912 1047
913 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1048 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
914 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1049 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915 1050
916 return cctx; 1051 return cctx;
917} 1052}
918 1053
919static void 1054static void
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1126 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992 1127
993 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
994 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995 1130
1131 if (
1132#if PERL_VERSION_ATLEAST (5,9,0)
1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1134#else
996 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1136#endif
1137 )
997 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1138 croak ("Coro::State::transfer called while parsing, but this is not supported");
998 } 1139 }
999} 1140}
1000 1141
1001/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1002static void NOINLINE 1143static void NOINLINE
1003transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1004{ 1145{
1005 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1006 1148
1007 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1008 if (expect_false (!next)) 1150 if (expect_false (!next))
1009 { 1151 {
1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1025 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1026 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1027 1169
1028 LOCK; 1170 LOCK;
1029 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1030 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1031 { 1176 {
1032 /* need to start coroutine */ 1177 /* need to start coroutine */
1033 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1034 /* first get rid of the old state */
1035 save_perl (aTHX_ prev);
1036 /* setup coroutine call */ 1179 /* setup coroutine call */
1037 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1038 } 1181 }
1039 else 1182 else
1040 {
1041 /* coroutine already started */
1042 save_perl (aTHX_ prev);
1043 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1044 }
1045 1184
1046 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1047 1186
1048 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1188 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1054 prev->cctx = 0; 1193 prev->cctx = 0;
1055 1194
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1195 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1057 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1196 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1197 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1198 if (!next->cctx)
1059 next->cctx = cctx_get (aTHX); 1199 next->cctx = cctx_get (aTHX);
1060 1200
1061 cctx_put (prev__cctx); 1201 cctx_put (prev__cctx);
1062 } 1202 }
1063 1203
1064 ++next->usecount; 1204 ++next->usecount;
1065 1205
1066 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1067 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1068 1210
1069 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1070 { 1212 {
1071 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1072 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
1074 } 1216 }
1075 1217
1076 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1077 UNLOCK; 1219 UNLOCK;
1078 1220
1079 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1080 { 1222 {
1081 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1082 1224
1083 if (coro->throw) 1225 if (coro->throw)
1084 { 1226 {
1130 save_perl (aTHX_ &temp); 1272 save_perl (aTHX_ &temp);
1131 load_perl (aTHX_ coro); 1273 load_perl (aTHX_ coro);
1132 1274
1133 coro_destroy (aTHX_ coro); 1275 coro_destroy (aTHX_ coro);
1134 1276
1135 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1277 load_perl (aTHX_ &temp);
1136 1278
1137 coro->mainstack = 0; 1279 coro->slot = 0;
1138 } 1280 }
1139 1281
1140 cctx_destroy (coro->cctx); 1282 cctx_destroy (coro->cctx);
1141 SvREFCNT_dec (coro->args); 1283 SvREFCNT_dec (coro->args);
1142 1284
1210{ 1352{
1211 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1353 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1212} 1354}
1213 1355
1214static SV * 1356static SV *
1215coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1216{ 1358{
1217 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1218 1360
1219 min_prio -= PRIO_MIN;
1220 if (min_prio < 0)
1221 min_prio = 0;
1222
1223 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1224 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1225 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1226 1364
1227 return 0; 1365 return 0;
1228} 1366}
1264 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1265 1403
1266 for (;;) 1404 for (;;)
1267 { 1405 {
1268 LOCK; 1406 LOCK;
1269 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1270 1408
1271 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1272 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1273 { 1411 {
1274 dSP; 1412 dSP;
1278 SAVETMPS; 1416 SAVETMPS;
1279 1417
1280 PUSHMARK (SP); 1418 PUSHMARK (SP);
1281 PUTBACK; 1419 PUTBACK;
1282 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1283 1422
1284 FREETMPS; 1423 FREETMPS;
1285 LEAVE; 1424 LEAVE;
1286 continue; 1425 continue;
1287 } 1426 }
1399 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1538 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1400 1539
1401 if (coro->flags & CF_RUNNING) 1540 if (coro->flags & CF_RUNNING)
1402 PL_runops = RUNOPS_DEFAULT; 1541 PL_runops = RUNOPS_DEFAULT;
1403 else 1542 else
1404 coro->runops = RUNOPS_DEFAULT; 1543 coro->slot->runops = RUNOPS_DEFAULT;
1405 } 1544 }
1406} 1545}
1407 1546
1408MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1547MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1409 1548
1416#endif 1555#endif
1417 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1418 1557
1419 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1420 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1560
1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1562 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1563 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1564 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1565
1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1421 1569
1422 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1423 1571
1424 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1425 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1431 1579
1432 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1433 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1434 1582
1435 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1436 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1437 1586
1438 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1439} 1588}
1440 1589
1441SV * 1590SV *
1442new (char *klass, ...) 1591new (char *klass, ...)
1443 CODE: 1592 CODE:
1444{ 1593{
1445 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1446 HV *hv; 1596 HV *hv;
1447 int i; 1597 int i;
1448 1598
1449 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1450 coro->args = newAV (); 1600 coro->args = newAV ();
1453 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1454 coro->next = coro_first; 1604 coro->next = coro_first;
1455 coro_first = coro; 1605 coro_first = coro;
1456 1606
1457 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1458 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1608 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1609 mg->mg_flags |= MGf_DUP;
1459 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1460 1611
1461 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1462 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1463 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
1477 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1478 CODE: 1629 CODE:
1479{ 1630{
1480 struct transfer_args ta; 1631 struct transfer_args ta;
1481 1632
1633 PUTBACK;
1482 switch (ix) 1634 switch (ix)
1483 { 1635 {
1484 case 0: 1636 case 0:
1485 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1486 ta.next = 0; 1638 ta.next = 0;
1505 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1506 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1507 1659
1508 break; 1660 break;
1509 } 1661 }
1662 SPAGAIN;
1510 1663
1511 BARRIER; 1664 BARRIER;
1665 PUTBACK;
1512 TRANSFER (ta); 1666 TRANSFER (ta);
1513 1667 SPAGAIN; /* might be the sp of a different coroutine now */
1514 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1668 /* be extra careful not to ever do anything after TRANSFER */
1515 XSRETURN_YES;
1516} 1669}
1517 1670
1518bool 1671bool
1519_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1520 CODE: 1673 CODE:
1569 CODE: 1722 CODE:
1570{ 1723{
1571 if (coro->mainstack) 1724 if (coro->mainstack)
1572 { 1725 {
1573 struct coro temp; 1726 struct coro temp;
1574 Zero (&temp, 1, struct coro);
1575 1727
1576 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1577 { 1729 {
1730 PUTBACK;
1578 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1579 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1580 } 1733 }
1581 1734
1582 { 1735 {
1583 dSP; 1736 dSP;
1584 ENTER; 1737 ENTER;
1585 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1586 PUSHMARK (SP); 1741 PUSHMARK (SP);
1587 PUTBACK; 1742
1588 if (ix) 1743 if (ix)
1589 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1590 else 1745 else
1591 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1747
1748 POPSTACK;
1592 SPAGAIN; 1749 SPAGAIN;
1593 FREETMPS; 1750 FREETMPS;
1594 LEAVE; 1751 LEAVE;
1595 PUTBACK; 1752 PUTBACK;
1596 } 1753 }
1597 1754
1598 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1599 { 1756 {
1600 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1601 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1602 } 1760 }
1603 } 1761 }
1604} 1762}
1605 1763
1606SV * 1764SV *
1654 1812
1655BOOT: 1813BOOT:
1656{ 1814{
1657 int i; 1815 int i;
1658 1816
1659 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1817 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1660 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1818 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1661 av_async_pool = get_av ("Coro::async_pool", TRUE); 1819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1662 1820
1663 coro_current = get_sv ("Coro::current", FALSE); 1821 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1664 SvREADONLY_on (coro_current); 1822 SvREADONLY_on (coro_current);
1665 1823
1666 coro_stash = gv_stashpv ("Coro", TRUE); 1824 coro_stash = gv_stashpv ("Coro", TRUE);
1667 1825
1668 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1669 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1670 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1671 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1829 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1674 1832
1675 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1833 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1676 coro_ready[i] = newAV (); 1834 coro_ready[i] = newAV ();
1677 1835
1678 { 1836 {
1679 SV *sv = perl_get_sv("Coro::API", 1); 1837 SV *sv = perl_get_sv ("Coro::API", TRUE);
1838 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1680 1839
1681 coroapi.schedule = api_schedule; 1840 coroapi.schedule = api_schedule;
1682 coroapi.cede = api_cede; 1841 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1842 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1843 coroapi.ready = api_ready;
1755 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1914 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1756 AV *invoke_av; 1915 AV *invoke_av;
1757 int i, len; 1916 int i, len;
1758 1917
1759 if (!invoke) 1918 if (!invoke)
1919 {
1920 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1760 croak ("\3async_pool terminate\2\n"); 1921 croak ("\3async_pool terminate\2\n");
1922 }
1761 1923
1762 SvREFCNT_dec (coro->saved_deffh); 1924 SvREFCNT_dec (coro->saved_deffh);
1763 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1764 1926
1765 hv_store (hv, "desc", sizeof ("desc") - 1, 1927 hv_store (hv, "desc", sizeof ("desc") - 1,
1791 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1792 coro->saved_deffh = 0; 1954 coro->saved_deffh = 0;
1793 1955
1794 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1795 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1958 {
1959 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1796 croak ("\3async_pool terminate\2\n"); 1960 croak ("\3async_pool terminate\2\n");
1961 }
1797 1962
1798 av_clear (GvAV (PL_defgv)); 1963 av_clear (GvAV (PL_defgv));
1799 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1964 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1800 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1965 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1801 1966

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines