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.200 by root, Sun Oct 7 15:08:23 2007 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC

10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
22# include <inttypes.h> /* most portable stdint.h */
23#endif
15 24
16#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
17# include <unistd.h> 26# include <unistd.h>
18# include <sys/mman.h> 27# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
71# ifndef IS_PADCONST 80# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
73# endif 82# endif
74#endif 83#endif
75 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
76/* 5.8.7 */ 98/* 5.8.7 */
77#ifndef SvRV_set 99#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
79#endif
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 101#endif
88 102
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
91#endif 105#endif
130#else 144#else
131# define LOCK (void)0 145# define LOCK (void)0
132# define UNLOCK (void)0 146# define UNLOCK (void)0
133#endif 147#endif
134 148
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 149/* helper storage struct for Coro::AIO */
138struct io_state 150struct io_state
139{ 151{
140 int errorno; 152 int errorno;
141 I32 laststype; 153 I32 laststype;
146static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 161static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
152 164
153static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
155 167static SV *rv_diehook;
168static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 170
160/* async_pool helper stuff */ 171/* async_pool helper stuff */
161static SV *sv_pool_rss; 172static SV *sv_pool_rss;
162static SV *sv_pool_size; 173static SV *sv_pool_size;
163static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
164 178
165static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
166static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
167 181
168enum { 182enum {
221 235
222 /* process data */ 236 /* process data */
223 AV *mainstack; 237 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
225 239
226 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
227 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
228 int refcnt;
229 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
243 HV *hv; /* the perl hash associated with this coro, if any */
230 244
231 /* statistics */ 245 /* statistics */
232 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
233 247
234 /* coro process data */ 248 /* coro process data */
235 int prio; 249 int prio;
236 SV *throw; 250 SV *throw; /* exception to be thrown */
237 251
238 /* async_pool */ 252 /* async_pool */
239 SV *saved_deffh; 253 SV *saved_deffh;
240 254
241 /* linked list */ 255 /* linked list */
242 struct coro *next, *prev; 256 struct coro *next, *prev;
243 HV *hv; /* the perl hash associated with this coro, if any */
244}; 257};
245 258
246typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
247typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
248 261
255#define PRIO_IDLE -3 268#define PRIO_IDLE -3
256#define PRIO_MIN -4 269#define PRIO_MIN -4
257 270
258/* for Coro.pm */ 271/* for Coro.pm */
259static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
261static int coro_nready; 275static int coro_nready;
262static struct coro *coro_first; 276static struct coro *coro_first;
263 277
264/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
265 279
266static SV * 280static SV *
267coro_get_sv (const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
268{ 282{
269#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 285 get_sv (name, create);
272#endif 286#endif
273 return get_sv (name, create); 287 return get_sv (name, create);
274} 288}
275 289
276static AV * 290static AV *
277coro_get_av (const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
278{ 292{
279#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 295 get_av (name, create);
282#endif 296#endif
283 return get_av (name, create); 297 return get_av (name, create);
284} 298}
285 299
286static HV * 300static HV *
287coro_get_hv (const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
288{ 302{
289#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 305 get_hv (name, create);
292#endif 306#endif
293 return get_hv (name, create); 307 return get_hv (name, create);
294} 308}
299 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
300 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
301 315
302 newpadlist = newAV (); 316 newpadlist = newAV ();
303 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
304#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
306#else 320#else
307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
308#endif 322#endif
309 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
347 361
348 /* casting is fun. */ 362 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
351 365
352 SvREFCNT_dec (av);
353
354 return 0; 366 return 0;
355} 367}
356 368
357#define PERL_MAGIC_coro PERL_MAGIC_ext 369#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 371
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 372static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0,
374 coro_cv_free
375};
360 376
361#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
366 : 0 382 : 0
383
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 386
368static struct coro * 387static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
370{ 389{
371 HV *stash; 390 HV *stash;
383 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
386 } 405 }
387 406
388 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
390} 409}
391 410
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 412
394/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
395static void 414static void
396get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
397{ 416{
398 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 418 AV *av;
400 419
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 422 else
415} 434}
416 435
417static void 436static void
418put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
419{ 438{
420 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 440 AV *av;
422 441
423 if (expect_false (!mg)) 442 if (expect_false (!mg))
424 { 443 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 444
431 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
432 446
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
500 514
501 if (expect_true (CvDEPTH (cv))) 515 if (expect_true (CvDEPTH (cv)))
502 { 516 {
503 EXTEND (SP, 3); 517 EXTEND (SP, 3);
504 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
505 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
506 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
507 521
508 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
509 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
510 } 524 }
521 535
522 PUTBACK; 536 PUTBACK;
523 } 537 }
524 538
525 /* allocate some space on the context stack for our purposes */ 539 /* allocate some space on the context stack for our purposes */
540 /* we manually unroll here, as usually 2 slots is enough */
541 if (SLOT_COUNT >= 1) CXINC;
542 if (SLOT_COUNT >= 2) CXINC;
543 if (SLOT_COUNT >= 3) CXINC;
526 { 544 {
527 /* we manually unroll here, as usually 2 slots is enough */
528 int i; 545 int i;
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 for (i = 3; i < SLOT_COUNT; ++i) 546 for (i = 3; i < SLOT_COUNT; ++i)
533 CXINC; 547 CXINC;
534
535 cxstack_ix -= SLOT_COUNT; /* undo allocation */
536 } 548 }
549 cxstack_ix -= SLOT_COUNT; /* undo allocation */
537 550
538 c->mainstack = PL_mainstack; 551 c->mainstack = PL_mainstack;
539 552
540 { 553 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 554 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
591 604
592 New(54,PL_savestack,24,ANY); 605 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 607 PL_savestack_max = 24;
595 608
596#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 612 PL_retstack_max = 4;
600#endif 613#endif
601} 614}
624 637
625 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 639 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 641 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 643 Safefree (PL_retstack);
631#endif 644#endif
632} 645}
633 646
634static size_t 647static size_t
658 rss += slot->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
662 675
663#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
665#endif 678#endif
666 } 679 }
667 680
668 return rss; 681 return rss;
669} 682}
670 683
671/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
685
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689
690/* apparently < 5.8.8 */
691#undef MgPV_nolen_const
692#ifndef MgPV_nolen_const
693#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
694 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \
695 (const char*)(mg)->mg_ptr)
696#endif
697
698/*
699 * This overrides the default magic get method of %SIG elements.
700 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
701 * and instead of tryign to save and restore the hash elements, we just provide
702 * readback here.
703 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
704 * not expecting this to actually change the hook. This is a potential problem
705 * when a schedule happens then, but we ignore this.
706 */
707static int
708coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
709{
710 const char *s = MgPV_nolen_const (mg);
711
712 if (*s == '_')
713 {
714 SV **svp = 0;
715
716 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
717 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
718
719 if (svp)
720 {
721 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
722 return 0;
723 }
724 }
725
726 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
727}
728
729static int
730coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
731{
732 const char *s = MgPV_nolen_const (mg);
733
734 if (*s == '_')
735 {
736 SV **svp = 0;
737
738 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
739 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
740
741 if (svp)
742 {
743 SV *old = *svp;
744 *svp = 0;
745 SvREFCNT_dec (old);
746 return 0;
747 }
748 }
749
750 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
751}
752
753static int
754coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
755{
756 const char *s = MgPV_nolen_const (mg);
757
758 if (*s == '_')
759 {
760 SV **svp = 0;
761
762 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
763 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
764
765 if (svp)
766 {
767 SV *old = *svp;
768 *svp = newSVsv (sv);
769 SvREFCNT_dec (old);
770 return 0;
771 }
772 }
773
774 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
775}
672 776
673static void 777static void
674coro_setup (pTHX_ struct coro *coro) 778coro_setup (pTHX_ struct coro *coro)
675{ 779{
676 /* 780 /*
685 PL_curpm = 0; 789 PL_curpm = 0;
686 PL_curpad = 0; 790 PL_curpad = 0;
687 PL_localizing = 0; 791 PL_localizing = 0;
688 PL_dirty = 0; 792 PL_dirty = 0;
689 PL_restartop = 0; 793 PL_restartop = 0;
690 SvREFCNT_inc (PL_diehook ); hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 794#if PERL_VERSION_ATLEAST (5,10,0)
691 SvREFCNT_inc (PL_warnhook); hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 795 PL_parser = 0;
796#endif
797
798 /* recreate the die/warn hooks */
799 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
800 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 801
693 GvSV (PL_defgv) = newSV (0); 802 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 803 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 804 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 805 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
711 PL_op = (OP *)&myop; 820 PL_op = (OP *)&myop;
712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 821 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
713 SPAGAIN; 822 SPAGAIN;
714 } 823 }
715 824
716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 825 /* this newly created coroutine might be run on an existing cctx which most
826 * likely was suspended in set_stacklevel, called from entersub.
827 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
828 * so we ENTER here for symmetry
829 */
830 ENTER;
717} 831}
718 832
719static void 833static void
720coro_destroy (pTHX_ struct coro *coro) 834coro_destroy (pTHX_ struct coro *coro)
721{ 835{
805 PUSHMARK (SP); 919 PUSHMARK (SP);
806 PUSHs (&PL_sv_no); 920 PUSHs (&PL_sv_no);
807 PUSHs (fullname); 921 PUSHs (fullname);
808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 922 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
809 PUTBACK; 923 PUTBACK;
810 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 924 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
811 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 925 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
812 SPAGAIN; 926 SPAGAIN;
813 FREETMPS; 927 FREETMPS;
814 LEAVE; 928 LEAVE;
815 PL_runops = runops_trace; 929 PL_runops = runops_trace;
842 SAVETMPS; 956 SAVETMPS;
843 EXTEND (SP, 3); 957 EXTEND (SP, 3);
844 PUSHMARK (SP); 958 PUSHMARK (SP);
845 PUSHs (&PL_sv_yes); 959 PUSHs (&PL_sv_yes);
846 PUSHs (fullname); 960 PUSHs (fullname);
847 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 961 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
848 PUTBACK; 962 PUTBACK;
849 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 963 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
850 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 964 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
851 SPAGAIN; 965 SPAGAIN;
852 FREETMPS; 966 FREETMPS;
853 LEAVE; 967 LEAVE;
854 PL_runops = runops_trace; 968 PL_runops = runops_trace;
868 PL_runops = RUNOPS_DEFAULT; 982 PL_runops = RUNOPS_DEFAULT;
869 PUSHMARK (SP); 983 PUSHMARK (SP);
870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 984 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 985 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
872 PUTBACK; 986 PUTBACK;
873 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 987 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
874 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 988 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
875 SPAGAIN; 989 SPAGAIN;
876 FREETMPS; 990 FREETMPS;
877 LEAVE; 991 LEAVE;
878 PL_runops = runops_trace; 992 PL_runops = runops_trace;
888 1002
889/* inject a fake call to Coro::State::_cctx_init into the execution */ 1003/* inject a fake call to Coro::State::_cctx_init into the execution */
890/* _cctx_init should be careful, as it could be called at almost any time */ 1004/* _cctx_init should be careful, as it could be called at almost any time */
891/* during execution of a perl program */ 1005/* during execution of a perl program */
892static void NOINLINE 1006static void NOINLINE
893prepare_cctx (pTHX_ coro_cctx *cctx) 1007cctx_prepare (pTHX_ coro_cctx *cctx)
894{ 1008{
895 dSP; 1009 dSP;
896 LOGOP myop; 1010 LOGOP myop;
897 1011
898 PL_top_env = &PL_start_env; 1012 PL_top_env = &PL_start_env;
916 1030
917/* 1031/*
918 * this is a _very_ stripped down perl interpreter ;) 1032 * this is a _very_ stripped down perl interpreter ;)
919 */ 1033 */
920static void 1034static void
921coro_run (void *arg) 1035cctx_run (void *arg)
922{ 1036{
923 dTHX; 1037 dTHX;
924 1038
925 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1039 /* cctx_run is the alternative tail of transfer(), so unlock here. */
926 UNLOCK; 1040 UNLOCK;
927 1041
928 /* we now skip the entersub that lead to transfer() */ 1042 /* we now skip the entersub that lead to transfer() */
929 PL_op = PL_op->op_next; 1043 PL_op = PL_op->op_next;
930 1044
931 /* inject a fake subroutine call to cctx_init */ 1045 /* inject a fake subroutine call to cctx_init */
932 prepare_cctx (aTHX_ (coro_cctx *)arg); 1046 cctx_prepare (aTHX_ (coro_cctx *)arg);
933 1047
934 /* somebody or something will hit me for both perl_run and PL_restartop */ 1048 /* somebody or something will hit me for both perl_run and PL_restartop */
935 PL_restartop = PL_op; 1049 PL_restartop = PL_op;
936 perl_run (PL_curinterp); 1050 perl_run (PL_curinterp);
937 1051
956 ++cctx_count; 1070 ++cctx_count;
957 1071
958 Newz (0, cctx, 1, coro_cctx); 1072 Newz (0, cctx, 1, coro_cctx);
959 1073
960#if HAVE_MMAP 1074#if HAVE_MMAP
961
962 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1075 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
963 /* mmap supposedly does allocate-on-write for us */ 1076 /* mmap supposedly does allocate-on-write for us */
964 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1077 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
965 1078
966 if (cctx->sptr != (void *)-1) 1079 if (cctx->sptr != (void *)-1)
987 stack_start = cctx->sptr; 1100 stack_start = cctx->sptr;
988 stack_size = cctx->ssize; 1101 stack_size = cctx->ssize;
989 } 1102 }
990 1103
991 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1104 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
992 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1105 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
993 1106
994 return cctx; 1107 return cctx;
995} 1108}
996 1109
997static void 1110static void
1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1182 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1070 1183
1071 if (expect_false (next->flags & CF_DESTROYED)) 1184 if (expect_false (next->flags & CF_DESTROYED))
1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1185 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1073 1186
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1187#if !PERL_VERSION_ATLEAST (5,10,0)
1076 expect_false (PL_parser)
1077#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1188 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1079#endif
1080 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1189 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1190#endif
1082 } 1191 }
1083} 1192}
1084 1193
1085/* always use the TRANSFER macro */ 1194/* always use the TRANSFER macro */
1086static void NOINLINE 1195static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1196transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1088{ 1197{
1089 dSTACKLEVEL; 1198 dSTACKLEVEL;
1199 static volatile int has_throw;
1090 1200
1091 /* sometimes transfer is only called to set idle_sp */ 1201 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1202 if (expect_false (!next))
1093 { 1203 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1204 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1109 prev->flags &= ~CF_RUNNING; 1219 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1220 next->flags |= CF_RUNNING;
1111 1221
1112 LOCK; 1222 LOCK;
1113 1223
1224 /* first get rid of the old state */
1225 save_perl (aTHX_ prev);
1226
1114 if (expect_false (next->flags & CF_NEW)) 1227 if (expect_false (next->flags & CF_NEW))
1115 { 1228 {
1116 /* need to start coroutine */ 1229 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1230 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1231 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1232 coro_setup (aTHX_ next);
1122 } 1233 }
1123 else 1234 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1235 load_perl (aTHX_ next);
1128 }
1129 1236
1130 prev__cctx = prev->cctx; 1237 prev__cctx = prev->cctx;
1131 1238
1132 /* possibly "free" the cctx */ 1239 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1240 if (expect_true (
1241 prev__cctx->idle_sp == STACKLEVEL
1242 && !(prev__cctx->flags & CC_TRACE)
1243 && !force_cctx
1244 ))
1134 { 1245 {
1135 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1246 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1247 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1137 1248
1138 prev->cctx = 0; 1249 prev->cctx = 0;
1139 1250
1140 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1251 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1141 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1252 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1142 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1253 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1254 if (!next->cctx)
1143 next->cctx = cctx_get (aTHX); 1255 next->cctx = cctx_get (aTHX);
1144 1256
1145 cctx_put (prev__cctx); 1257 cctx_put (prev__cctx);
1146 } 1258 }
1147 1259
1148 ++next->usecount; 1260 ++next->usecount;
1149 1261
1150 if (expect_true (!next->cctx)) 1262 if (expect_true (!next->cctx))
1151 next->cctx = cctx_get (aTHX); 1263 next->cctx = cctx_get (aTHX);
1264
1265 has_throw = !!next->throw;
1152 1266
1153 if (expect_false (prev__cctx != next->cctx)) 1267 if (expect_false (prev__cctx != next->cctx))
1154 { 1268 {
1155 prev__cctx->top_env = PL_top_env; 1269 prev__cctx->top_env = PL_top_env;
1156 PL_top_env = next->cctx->top_env; 1270 PL_top_env = next->cctx->top_env;
1158 } 1272 }
1159 1273
1160 free_coro_mortal (aTHX); 1274 free_coro_mortal (aTHX);
1161 UNLOCK; 1275 UNLOCK;
1162 1276
1163 if (expect_false (prev->throw || next->throw)) 1277 if (expect_false (has_throw))
1164 { 1278 {
1165 struct coro *coro = SvSTATE (coro_current); 1279 struct coro *coro = SvSTATE (coro_current);
1166 1280
1167 if (coro->throw) 1281 if (coro->throw)
1168 { 1282 {
1178struct transfer_args 1292struct transfer_args
1179{ 1293{
1180 struct coro *prev, *next; 1294 struct coro *prev, *next;
1181}; 1295};
1182 1296
1183#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1297#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1184#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1298#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1185 1299
1186/** high level stuff ********************************************************/ 1300/** high level stuff ********************************************************/
1187 1301
1188static int 1302static int
1282{ 1396{
1283 dTHX; 1397 dTHX;
1284 struct transfer_args ta; 1398 struct transfer_args ta;
1285 1399
1286 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1400 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1287 TRANSFER (ta); 1401 TRANSFER (ta, 1);
1288} 1402}
1289 1403
1290/** Coro ********************************************************************/ 1404/** Coro ********************************************************************/
1291 1405
1292static void 1406static void
1294{ 1408{
1295 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1409 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1296} 1410}
1297 1411
1298static SV * 1412static SV *
1299coro_deq (pTHX_ int min_prio) 1413coro_deq (pTHX)
1300{ 1414{
1301 int prio = PRIO_MAX - PRIO_MIN; 1415 int prio;
1302 1416
1303 min_prio -= PRIO_MIN;
1304 if (min_prio < 0)
1305 min_prio = 0;
1306
1307 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1417 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1308 if (AvFILLp (coro_ready [prio]) >= 0) 1418 if (AvFILLp (coro_ready [prio]) >= 0)
1309 return av_shift (coro_ready [prio]); 1419 return av_shift (coro_ready [prio]);
1310 1420
1311 return 0; 1421 return 0;
1312} 1422}
1314static int 1424static int
1315api_ready (SV *coro_sv) 1425api_ready (SV *coro_sv)
1316{ 1426{
1317 dTHX; 1427 dTHX;
1318 struct coro *coro; 1428 struct coro *coro;
1429 SV *sv_hook;
1430 void (*xs_hook)(void);
1319 1431
1320 if (SvROK (coro_sv)) 1432 if (SvROK (coro_sv))
1321 coro_sv = SvRV (coro_sv); 1433 coro_sv = SvRV (coro_sv);
1322 1434
1323 coro = SvSTATE (coro_sv); 1435 coro = SvSTATE (coro_sv);
1326 return 0; 1438 return 0;
1327 1439
1328 coro->flags |= CF_READY; 1440 coro->flags |= CF_READY;
1329 1441
1330 LOCK; 1442 LOCK;
1443
1444 sv_hook = coro_nready ? 0 : coro_readyhook;
1445 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1446
1331 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1447 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1332 ++coro_nready; 1448 ++coro_nready;
1449
1333 UNLOCK; 1450 UNLOCK;
1451
1452 if (sv_hook)
1453 {
1454 dSP;
1455
1456 ENTER;
1457 SAVETMPS;
1458
1459 PUSHMARK (SP);
1460 PUTBACK;
1461 call_sv (sv_hook, G_DISCARD);
1462 SPAGAIN;
1463
1464 FREETMPS;
1465 LEAVE;
1466 }
1467
1468 if (xs_hook)
1469 xs_hook ();
1334 1470
1335 return 1; 1471 return 1;
1336} 1472}
1337 1473
1338static int 1474static int
1348 SV *prev_sv, *next_sv; 1484 SV *prev_sv, *next_sv;
1349 1485
1350 for (;;) 1486 for (;;)
1351 { 1487 {
1352 LOCK; 1488 LOCK;
1353 next_sv = coro_deq (aTHX_ PRIO_MIN); 1489 next_sv = coro_deq (aTHX);
1354 1490
1355 /* nothing to schedule: call the idle handler */ 1491 /* nothing to schedule: call the idle handler */
1356 if (expect_false (!next_sv)) 1492 if (expect_false (!next_sv))
1357 { 1493 {
1358 dSP; 1494 dSP;
1362 SAVETMPS; 1498 SAVETMPS;
1363 1499
1364 PUSHMARK (SP); 1500 PUSHMARK (SP);
1365 PUTBACK; 1501 PUTBACK;
1366 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1502 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1503 SPAGAIN;
1367 1504
1368 FREETMPS; 1505 FREETMPS;
1369 LEAVE; 1506 LEAVE;
1370 continue; 1507 continue;
1371 } 1508 }
1426{ 1563{
1427 dTHX; 1564 dTHX;
1428 struct transfer_args ta; 1565 struct transfer_args ta;
1429 1566
1430 prepare_schedule (aTHX_ &ta); 1567 prepare_schedule (aTHX_ &ta);
1431 TRANSFER (ta); 1568 TRANSFER (ta, 1);
1432} 1569}
1433 1570
1434static int 1571static int
1435api_cede (void) 1572api_cede (void)
1436{ 1573{
1439 1576
1440 prepare_cede (aTHX_ &ta); 1577 prepare_cede (aTHX_ &ta);
1441 1578
1442 if (expect_true (ta.prev != ta.next)) 1579 if (expect_true (ta.prev != ta.next))
1443 { 1580 {
1444 TRANSFER (ta); 1581 TRANSFER (ta, 1);
1445 return 1; 1582 return 1;
1446 } 1583 }
1447 else 1584 else
1448 return 0; 1585 return 0;
1449} 1586}
1454 dTHX; 1591 dTHX;
1455 struct transfer_args ta; 1592 struct transfer_args ta;
1456 1593
1457 if (prepare_cede_notself (aTHX_ &ta)) 1594 if (prepare_cede_notself (aTHX_ &ta))
1458 { 1595 {
1459 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1460 return 1; 1597 return 1;
1461 } 1598 }
1462 else 1599 else
1463 return 0; 1600 return 0;
1464} 1601}
1501 BOOT_PAGESIZE; 1638 BOOT_PAGESIZE;
1502 1639
1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1640 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1504 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1641 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1505 1642
1643 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1644 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1645 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1646
1506 hv_sig = coro_get_hv ("SIG", TRUE); 1647 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1507 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1648 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1508 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1649 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1509
1510 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1511 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1512 1650
1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1651 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1514 1652
1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1653 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1654 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1521 main_top_env = PL_top_env; 1659 main_top_env = PL_top_env;
1522 1660
1523 while (main_top_env->je_prev) 1661 while (main_top_env->je_prev)
1524 main_top_env = main_top_env->je_prev; 1662 main_top_env = main_top_env->je_prev;
1525 1663
1526 coroapi.ver = CORO_API_VERSION; 1664 coroapi.ver = CORO_API_VERSION;
1665 coroapi.rev = CORO_API_REVISION;
1527 coroapi.transfer = api_transfer; 1666 coroapi.transfer = api_transfer;
1528 1667
1529 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1668 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1530} 1669}
1531 1670
1532SV * 1671SV *
1533new (char *klass, ...) 1672new (char *klass, ...)
1534 CODE: 1673 CODE:
1535{ 1674{
1536 struct coro *coro; 1675 struct coro *coro;
1676 MAGIC *mg;
1537 HV *hv; 1677 HV *hv;
1538 int i; 1678 int i;
1539 1679
1540 Newz (0, coro, 1, struct coro); 1680 Newz (0, coro, 1, struct coro);
1541 coro->args = newAV (); 1681 coro->args = newAV ();
1544 if (coro_first) coro_first->prev = coro; 1684 if (coro_first) coro_first->prev = coro;
1545 coro->next = coro_first; 1685 coro->next = coro_first;
1546 coro_first = coro; 1686 coro_first = coro;
1547 1687
1548 coro->hv = hv = newHV (); 1688 coro->hv = hv = newHV ();
1549 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1689 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1690 mg->mg_flags |= MGf_DUP;
1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1691 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1551 1692
1552 av_extend (coro->args, items - 1); 1693 av_extend (coro->args, items - 1);
1553 for (i = 1; i < items; i++) 1694 for (i = 1; i < items; i++)
1554 av_push (coro->args, newSVsv (ST (i))); 1695 av_push (coro->args, newSVsv (ST (i)));
1568 Coro::cede_notself = 4 1709 Coro::cede_notself = 4
1569 CODE: 1710 CODE:
1570{ 1711{
1571 struct transfer_args ta; 1712 struct transfer_args ta;
1572 1713
1714 PUTBACK;
1573 switch (ix) 1715 switch (ix)
1574 { 1716 {
1575 case 0: 1717 case 0:
1576 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1718 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1577 ta.next = 0; 1719 ta.next = 0;
1596 if (!prepare_cede_notself (aTHX_ &ta)) 1738 if (!prepare_cede_notself (aTHX_ &ta))
1597 XSRETURN_EMPTY; 1739 XSRETURN_EMPTY;
1598 1740
1599 break; 1741 break;
1600 } 1742 }
1743 SPAGAIN;
1601 1744
1602 BARRIER; 1745 BARRIER;
1746 PUTBACK;
1603 TRANSFER (ta); 1747 TRANSFER (ta, 0);
1604 1748 SPAGAIN; /* might be the sp of a different coroutine now */
1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1749 /* be extra careful not to ever do anything after TRANSFER */
1606 XSRETURN_YES;
1607} 1750}
1608 1751
1609bool 1752bool
1610_destroy (SV *coro_sv) 1753_destroy (SV *coro_sv)
1611 CODE: 1754 CODE:
1612 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1755 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1613 OUTPUT: 1756 OUTPUT:
1614 RETVAL 1757 RETVAL
1615 1758
1616void 1759void
1617_exit (code) 1760_exit (int code)
1618 int code
1619 PROTOTYPE: $ 1761 PROTOTYPE: $
1620 CODE: 1762 CODE:
1621 _exit (code); 1763 _exit (code);
1622 1764
1623int 1765int
1663 { 1805 {
1664 struct coro temp; 1806 struct coro temp;
1665 1807
1666 if (!(coro->flags & CF_RUNNING)) 1808 if (!(coro->flags & CF_RUNNING))
1667 { 1809 {
1810 PUTBACK;
1668 save_perl (aTHX_ &temp); 1811 save_perl (aTHX_ &temp);
1669 load_perl (aTHX_ coro); 1812 load_perl (aTHX_ coro);
1670 } 1813 }
1671 1814
1672 { 1815 {
1673 dSP; 1816 dSP;
1674 ENTER; 1817 ENTER;
1675 SAVETMPS; 1818 SAVETMPS;
1819 PUTBACK;
1820 PUSHSTACK;
1676 PUSHMARK (SP); 1821 PUSHMARK (SP);
1677 PUTBACK;
1678 1822
1679 if (ix) 1823 if (ix)
1680 eval_sv (coderef, 0); 1824 eval_sv (coderef, 0);
1681 else 1825 else
1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1826 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683 1827
1828 POPSTACK;
1684 SPAGAIN; 1829 SPAGAIN;
1685 FREETMPS; 1830 FREETMPS;
1686 LEAVE; 1831 LEAVE;
1687 PUTBACK; 1832 PUTBACK;
1688 } 1833 }
1689 1834
1690 if (!(coro->flags & CF_RUNNING)) 1835 if (!(coro->flags & CF_RUNNING))
1691 { 1836 {
1692 save_perl (aTHX_ coro); 1837 save_perl (aTHX_ coro);
1693 load_perl (aTHX_ &temp); 1838 load_perl (aTHX_ &temp);
1839 SPAGAIN;
1694 } 1840 }
1695 } 1841 }
1696} 1842}
1697 1843
1698SV * 1844SV *
1710 1856
1711void 1857void
1712api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1858api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1713 1859
1714SV * 1860SV *
1715has_stack (Coro::State coro) 1861has_cctx (Coro::State coro)
1716 PROTOTYPE: $ 1862 PROTOTYPE: $
1717 CODE: 1863 CODE:
1718 RETVAL = boolSV (!!coro->cctx); 1864 RETVAL = boolSV (!!coro->cctx);
1719 OUTPUT: 1865 OUTPUT:
1720 RETVAL 1866 RETVAL
1739 case 1: RETVAL = coro->usecount; break; 1885 case 1: RETVAL = coro->usecount; break;
1740 } 1886 }
1741 OUTPUT: 1887 OUTPUT:
1742 RETVAL 1888 RETVAL
1743 1889
1890void
1891force_cctx ()
1892 CODE:
1893 struct coro *coro = SvSTATE (coro_current);
1894 coro->cctx->idle_sp = 0;
1744 1895
1745MODULE = Coro::State PACKAGE = Coro 1896MODULE = Coro::State PACKAGE = Coro
1746 1897
1747BOOT: 1898BOOT:
1748{ 1899{
1749 int i; 1900 int i;
1750 1901
1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1902 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1903 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1904 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1754 1905
1755 coro_current = coro_get_sv ("Coro::current", FALSE); 1906 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1756 SvREADONLY_on (coro_current); 1907 SvREADONLY_on (coro_current);
1757 1908
1758 coro_stash = gv_stashpv ("Coro", TRUE); 1909 coro_stash = gv_stashpv ("Coro", TRUE);
1759 1910
1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1911 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1790 PROTOTYPE: $ 1941 PROTOTYPE: $
1791 CODE: 1942 CODE:
1792 SvREFCNT_dec (SvRV (coro_current)); 1943 SvREFCNT_dec (SvRV (coro_current));
1793 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1944 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1794 1945
1946void
1947_set_readyhook (SV *hook)
1948 PROTOTYPE: $
1949 CODE:
1950 LOCK;
1951 SvREFCNT_dec (coro_readyhook);
1952 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1953 UNLOCK;
1954
1795int 1955int
1796prio (Coro::State coro, int newprio = 0) 1956prio (Coro::State coro, int newprio = 0)
1797 ALIAS: 1957 ALIAS:
1798 nice = 1 1958 nice = 1
1799 CODE: 1959 CODE:
1835 PROTOTYPE: $;$ 1995 PROTOTYPE: $;$
1836 CODE: 1996 CODE:
1837 SvREFCNT_dec (self->throw); 1997 SvREFCNT_dec (self->throw);
1838 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1998 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1839 1999
2000void
2001swap_defsv (Coro::State self)
2002 PROTOTYPE: $
2003 ALIAS:
2004 swap_defav = 1
2005 CODE:
2006 if (!self->slot)
2007 croak ("cannot swap state with coroutine that has no saved state");
2008 else
2009 {
2010 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2011 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2012
2013 SV *tmp = *src; *src = *dst; *dst = tmp;
2014 }
2015
1840# for async_pool speedup 2016# for async_pool speedup
1841void 2017void
1842_pool_1 (SV *cb) 2018_pool_1 (SV *cb)
1843 CODE: 2019 CODE:
1844{ 2020{
1845 struct coro *coro = SvSTATE (coro_current); 2021 struct coro *coro = SvSTATE (coro_current);
1846 HV *hv = (HV *)SvRV (coro_current); 2022 HV *hv = (HV *)SvRV (coro_current);
1847 AV *defav = GvAV (PL_defgv); 2023 AV *defav = GvAV (PL_defgv);
1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2024 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1849 AV *invoke_av; 2025 AV *invoke_av;
1850 int i, len; 2026 int i, len;
1851 2027
1852 if (!invoke) 2028 if (!invoke)
2029 {
2030 SV *old = PL_diehook;
2031 PL_diehook = 0;
2032 SvREFCNT_dec (old);
1853 croak ("\3async_pool terminate\2\n"); 2033 croak ("\3async_pool terminate\2\n");
2034 }
1854 2035
1855 SvREFCNT_dec (coro->saved_deffh); 2036 SvREFCNT_dec (coro->saved_deffh);
1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2037 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1857 2038
1858 hv_store (hv, "desc", sizeof ("desc") - 1, 2039 hv_store (hv, "desc", sizeof ("desc") - 1,
1859 newSVpvn (strpair ("[async_pool]")), 0); 2040 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1860 2041
1861 invoke_av = (AV *)SvRV (invoke); 2042 invoke_av = (AV *)SvRV (invoke);
1862 len = av_len (invoke_av); 2043 len = av_len (invoke_av);
1863 2044
1864 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2045 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2065 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1885 coro->saved_deffh = 0; 2066 coro->saved_deffh = 0;
1886 2067
1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2068 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2069 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2070 {
2071 SV *old = PL_diehook;
2072 PL_diehook = 0;
2073 SvREFCNT_dec (old);
1889 croak ("\3async_pool terminate\2\n"); 2074 croak ("\3async_pool terminate\2\n");
2075 }
1890 2076
1891 av_clear (GvAV (PL_defgv)); 2077 av_clear (GvAV (PL_defgv));
1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2078 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1893 newSVpvn (strpair ("[async_pool idle]")), 0); 2079 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1894 2080
1895 coro->prio = 0; 2081 coro->prio = 0;
1896 2082
1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2083 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1898 api_trace (coro_current, 0); 2084 api_trace (coro_current, 0);
1933 PL_laststype = data->laststype; 2119 PL_laststype = data->laststype;
1934 PL_laststatval = data->laststatval; 2120 PL_laststatval = data->laststatval;
1935 PL_statcache = data->statcache; 2121 PL_statcache = data->statcache;
1936} 2122}
1937 2123
2124
2125MODULE = Coro::State PACKAGE = Coro::AnyEvent
2126
2127BOOT:
2128 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2129
2130SV *
2131_schedule (...)
2132 PROTOTYPE: @
2133 CODE:
2134{
2135 static int incede;
2136
2137 api_cede_notself ();
2138
2139 ++incede;
2140 while (coro_nready >= incede && api_cede ())
2141 ;
2142
2143 sv_setsv (sv_activity, &PL_sv_undef);
2144 if (coro_nready >= incede)
2145 {
2146 PUSHMARK (SP);
2147 PUTBACK;
2148 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2149 SPAGAIN;
2150 }
2151
2152 --incede;
2153}
2154

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines