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.205 by root, Tue Oct 9 14:07:02 2007 UTC vs.
Revision 1.244 by root, Sun Sep 21 18:29:39 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 {
254#define PRIO_IDLE -3 268#define PRIO_IDLE -3
255#define PRIO_MIN -4 269#define PRIO_MIN -4
256 270
257/* for Coro.pm */ 271/* for Coro.pm */
258static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
260static int coro_nready; 275static int coro_nready;
261static struct coro *coro_first; 276static struct coro *coro_first;
262 277
263/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
264 279
265static SV * 280static SV *
266coro_get_sv (const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
267{ 282{
268#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
269 /* 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 */
270 get_sv (name, create); 285 get_sv (name, create);
271#endif 286#endif
272 return get_sv (name, create); 287 return get_sv (name, create);
273} 288}
274 289
275static AV * 290static AV *
276coro_get_av (const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
277{ 292{
278#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
279 /* 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 */
280 get_av (name, create); 295 get_av (name, create);
281#endif 296#endif
282 return get_av (name, create); 297 return get_av (name, create);
283} 298}
284 299
285static HV * 300static HV *
286coro_get_hv (const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
287{ 302{
288#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
289 /* 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 */
290 get_hv (name, create); 305 get_hv (name, create);
291#endif 306#endif
292 return get_hv (name, create); 307 return get_hv (name, create);
293} 308}
298 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
299 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
300 315
301 newpadlist = newAV (); 316 newpadlist = newAV ();
302 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
303#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
305#else 320#else
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
307#endif 322#endif
308 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
351 SvREFCNT_dec (av); 366 SvREFCNT_dec (av);
352 367
353 return 0; 368 return 0;
354} 369}
355 370
356#define PERL_MAGIC_coro PERL_MAGIC_ext 371#define CORO_MAGIC_type_cv PERL_MAGIC_ext
372#define CORO_MAGIC_type_state PERL_MAGIC_ext
357 373
358static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 374static MGVTBL coro_cv_vtbl = {
375 0, 0, 0, 0,
376 coro_cv_free
377};
359 378
360#define CORO_MAGIC(cv) \ 379#define CORO_MAGIC(sv,type) \
361 SvMAGIC (cv) \ 380 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 381 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 382 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 383 : mg_find (sv, type) \
365 : 0 384 : 0
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
366 388
367static struct coro * 389static struct coro *
368SvSTATE_ (pTHX_ SV *coro) 390SvSTATE_ (pTHX_ SV *coro)
369{ 391{
370 HV *stash; 392 HV *stash;
382 /* very slow, but rare, check */ 404 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 406 croak ("Coro::State object required");
385 } 407 }
386 408
387 mg = CORO_MAGIC (coro); 409 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 410 return (struct coro *)mg->mg_ptr;
389} 411}
390 412
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 414
393/* the next two functions merely cache the padlists */ 415/* the next two functions merely cache the padlists */
394static void 416static void
395get_padlist (pTHX_ CV *cv) 417get_padlist (pTHX_ CV *cv)
396{ 418{
397 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 420 AV *av;
399 421
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 424 else
403 { 425 {
404#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
405 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
406 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
407 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
408 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
409 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
410#else 433#else
414} 437}
415 438
416static void 439static void
417put_padlist (pTHX_ CV *cv) 440put_padlist (pTHX_ CV *cv)
418{ 441{
419 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 443 AV *av;
421 444
422 if (expect_false (!mg)) 445 if (expect_false (!mg))
423 { 446 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
426 mg->mg_virtual = &vtbl_coro;
427 mg->mg_obj = (SV *)newAV ();
428 }
429 447
430 av = (AV *)mg->mg_obj; 448 av = (AV *)mg->mg_obj;
431 449
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 450 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 451 av_extend (av, AvMAX (av) + 1);
451 GvSV (irsgv) = slot->irsgv; 469 GvSV (irsgv) = slot->irsgv;
452 470
453 #define VAR(name,type) PL_ ## name = slot->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 472 # include "state.h"
455 #undef VAR 473 #undef VAR
456
457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
459 474
460 { 475 {
461 dSP; 476 dSP;
462 477
463 CV *cv; 478 CV *cv;
502 517
503 if (expect_true (CvDEPTH (cv))) 518 if (expect_true (CvDEPTH (cv)))
504 { 519 {
505 EXTEND (SP, 3); 520 EXTEND (SP, 3);
506 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
507 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
508 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
509 524
510 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
511 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
512 } 527 }
592 607
593 New(54,PL_savestack,24,ANY); 608 New(54,PL_savestack,24,ANY);
594 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
595 PL_savestack_max = 24; 610 PL_savestack_max = 24;
596 611
597#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
598 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
599 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
600 PL_retstack_max = 4; 615 PL_retstack_max = 4;
601#endif 616#endif
602} 617}
625 640
626 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
627 Safefree (PL_markstack); 642 Safefree (PL_markstack);
628 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
629 Safefree (PL_savestack); 644 Safefree (PL_savestack);
630#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
631 Safefree (PL_retstack); 646 Safefree (PL_retstack);
632#endif 647#endif
633} 648}
634 649
635static size_t 650static size_t
659 rss += slot->tmps_max * sizeof (SV *); 674 rss += slot->tmps_max * sizeof (SV *);
660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 675 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
661 rss += slot->scopestack_max * sizeof (I32); 676 rss += slot->scopestack_max * sizeof (I32);
662 rss += slot->savestack_max * sizeof (ANY); 677 rss += slot->savestack_max * sizeof (ANY);
663 678
664#if !PERL_VERSION_ATLEAST (5,9,0) 679#if !PERL_VERSION_ATLEAST (5,10,0)
665 rss += slot->retstack_max * sizeof (OP *); 680 rss += slot->retstack_max * sizeof (OP *);
666#endif 681#endif
667 } 682 }
668 683
669 return rss; 684 return rss;
670} 685}
671 686
672/** coroutine stack handling ************************************************/ 687/** coroutine stack handling ************************************************/
688
689static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
690static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
691static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
692
693/* apparently < 5.8.8 */
694#ifndef MgPV_nolen_const
695#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
696 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
697 (const char*)(mg)->mg_ptr)
698#endif
699
700/*
701 * This overrides the default magic get method of %SIG elements.
702 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
703 * and instead of tryign to save and restore the hash elements, we just provide
704 * readback here.
705 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
706 * not expecting this to actually change the hook. This is a potential problem
707 * when a schedule happens then, but we ignore this.
708 */
709static int
710coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
711{
712 const char *s = MgPV_nolen_const (mg);
713
714 if (*s == '_')
715 {
716 SV **svp = 0;
717
718 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
719 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
720
721 if (svp)
722 {
723 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
724 return 0;
725 }
726 }
727
728 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
729}
730
731static int
732coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
733{
734 const char *s = MgPV_nolen_const (mg);
735
736 if (*s == '_')
737 {
738 SV **svp = 0;
739
740 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
741 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
742
743 if (svp)
744 {
745 SV *old = *svp;
746 *svp = 0;
747 SvREFCNT_dec (old);
748 return 0;
749 }
750 }
751
752 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
753}
754
755static int
756coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
757{
758 const char *s = MgPV_nolen_const (mg);
759
760 if (*s == '_')
761 {
762 SV **svp = 0;
763
764 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
765 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
766
767 if (svp)
768 {
769 SV *old = *svp;
770 *svp = newSVsv (sv);
771 SvREFCNT_dec (old);
772 return 0;
773 }
774 }
775
776 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
777}
673 778
674static void 779static void
675coro_setup (pTHX_ struct coro *coro) 780coro_setup (pTHX_ struct coro *coro)
676{ 781{
677 /* 782 /*
686 PL_curpm = 0; 791 PL_curpm = 0;
687 PL_curpad = 0; 792 PL_curpad = 0;
688 PL_localizing = 0; 793 PL_localizing = 0;
689 PL_dirty = 0; 794 PL_dirty = 0;
690 PL_restartop = 0; 795 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 796#if PERL_VERSION_ATLEAST (5,10,0)
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 797 PL_parser = 0;
798#endif
799
800 /* recreate the die/warn hooks */
801 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
802 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
693 803
694 GvSV (PL_defgv) = newSV (0); 804 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 805 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 806 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 807 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
712 PL_op = (OP *)&myop; 822 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 823 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 824 SPAGAIN;
715 } 825 }
716 826
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 827 /* this newly created coroutine might be run on an existing cctx which most
828 * likely was suspended in set_stacklevel, called from entersub.
829 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
830 * so we ENTER here for symmetry
831 */
832 ENTER;
718} 833}
719 834
720static void 835static void
721coro_destroy (pTHX_ struct coro *coro) 836coro_destroy (pTHX_ struct coro *coro)
722{ 837{
806 PUSHMARK (SP); 921 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 922 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 923 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 924 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 925 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 926 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 927 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 928 SPAGAIN;
814 FREETMPS; 929 FREETMPS;
815 LEAVE; 930 LEAVE;
816 PL_runops = runops_trace; 931 PL_runops = runops_trace;
843 SAVETMPS; 958 SAVETMPS;
844 EXTEND (SP, 3); 959 EXTEND (SP, 3);
845 PUSHMARK (SP); 960 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 961 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 962 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 963 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 964 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 965 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 966 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 967 SPAGAIN;
853 FREETMPS; 968 FREETMPS;
854 LEAVE; 969 LEAVE;
855 PL_runops = runops_trace; 970 PL_runops = runops_trace;
869 PL_runops = RUNOPS_DEFAULT; 984 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 985 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 986 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 987 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 988 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 989 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 990 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 991 SPAGAIN;
877 FREETMPS; 992 FREETMPS;
878 LEAVE; 993 LEAVE;
879 PL_runops = runops_trace; 994 PL_runops = runops_trace;
953 coro_cctx *cctx; 1068 coro_cctx *cctx;
954 void *stack_start; 1069 void *stack_start;
955 size_t stack_size; 1070 size_t stack_size;
956 1071
957 ++cctx_count; 1072 ++cctx_count;
958 fprintf (stderr, "bp1\n");//D
959 1073
960 Newz (0, cctx, 1, coro_cctx); 1074 Newz (0, cctx, 1, coro_cctx);
961 1075
962#if HAVE_MMAP 1076#if HAVE_MMAP
963 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1077 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1070 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1184 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1071 1185
1072 if (expect_false (next->flags & CF_DESTROYED)) 1186 if (expect_false (next->flags & CF_DESTROYED))
1073 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1187 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1074 1188
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0) 1189#if !PERL_VERSION_ATLEAST (5,10,0)
1077 expect_false (PL_parser)
1078#else
1079 expect_false (PL_lex_state != LEX_NOTPARSING) 1190 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1080#endif
1081 )
1082 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1191 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1192#endif
1083 } 1193 }
1084} 1194}
1085 1195
1086/* always use the TRANSFER macro */ 1196/* always use the TRANSFER macro */
1087static void NOINLINE 1197static void NOINLINE
1088transfer (pTHX_ struct coro *prev, struct coro *next) 1198transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1089{ 1199{
1090 dSTACKLEVEL; 1200 dSTACKLEVEL;
1201 static volatile int has_throw;
1091 1202
1092 /* sometimes transfer is only called to set idle_sp */ 1203 /* sometimes transfer is only called to set idle_sp */
1093 if (expect_false (!next)) 1204 if (expect_false (!next))
1094 { 1205 {
1095 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1206 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1110 prev->flags &= ~CF_RUNNING; 1221 prev->flags &= ~CF_RUNNING;
1111 next->flags |= CF_RUNNING; 1222 next->flags |= CF_RUNNING;
1112 1223
1113 LOCK; 1224 LOCK;
1114 1225
1226 /* first get rid of the old state */
1227 save_perl (aTHX_ prev);
1228
1115 if (expect_false (next->flags & CF_NEW)) 1229 if (expect_false (next->flags & CF_NEW))
1116 { 1230 {
1117 /* need to start coroutine */ 1231 /* need to start coroutine */
1118 next->flags &= ~CF_NEW; 1232 next->flags &= ~CF_NEW;
1119 /* first get rid of the old state */
1120 save_perl (aTHX_ prev);
1121 /* setup coroutine call */ 1233 /* setup coroutine call */
1122 coro_setup (aTHX_ next); 1234 coro_setup (aTHX_ next);
1123 } 1235 }
1124 else 1236 else
1125 {
1126 /* coroutine already started */
1127 save_perl (aTHX_ prev);
1128 load_perl (aTHX_ next); 1237 load_perl (aTHX_ next);
1129 }
1130 1238
1131 prev__cctx = prev->cctx; 1239 prev__cctx = prev->cctx;
1132 1240
1133 /* possibly "free" the cctx */ 1241 /* possibly "free" the cctx */
1134 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1242 if (expect_true (
1243 prev__cctx->idle_sp == STACKLEVEL
1244 && !(prev__cctx->flags & CC_TRACE)
1245 && !force_cctx
1246 ))
1135 { 1247 {
1136 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1248 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1137 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1249 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1138 1250
1139 prev->cctx = 0; 1251 prev->cctx = 0;
1149 1261
1150 ++next->usecount; 1262 ++next->usecount;
1151 1263
1152 if (expect_true (!next->cctx)) 1264 if (expect_true (!next->cctx))
1153 next->cctx = cctx_get (aTHX); 1265 next->cctx = cctx_get (aTHX);
1266
1267 has_throw = !!next->throw;
1154 1268
1155 if (expect_false (prev__cctx != next->cctx)) 1269 if (expect_false (prev__cctx != next->cctx))
1156 { 1270 {
1157 prev__cctx->top_env = PL_top_env; 1271 prev__cctx->top_env = PL_top_env;
1158 PL_top_env = next->cctx->top_env; 1272 PL_top_env = next->cctx->top_env;
1160 } 1274 }
1161 1275
1162 free_coro_mortal (aTHX); 1276 free_coro_mortal (aTHX);
1163 UNLOCK; 1277 UNLOCK;
1164 1278
1165 if (expect_false (prev->throw || next->throw)) 1279 if (expect_false (has_throw))
1166 { 1280 {
1167 struct coro *coro = SvSTATE (coro_current); 1281 struct coro *coro = SvSTATE (coro_current);
1168 1282
1169 if (coro->throw) 1283 if (coro->throw)
1170 { 1284 {
1180struct transfer_args 1294struct transfer_args
1181{ 1295{
1182 struct coro *prev, *next; 1296 struct coro *prev, *next;
1183}; 1297};
1184 1298
1185#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1299#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1186#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1300#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1187 1301
1188/** high level stuff ********************************************************/ 1302/** high level stuff ********************************************************/
1189 1303
1190static int 1304static int
1284{ 1398{
1285 dTHX; 1399 dTHX;
1286 struct transfer_args ta; 1400 struct transfer_args ta;
1287 1401
1288 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1402 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1289 TRANSFER (ta); 1403 TRANSFER (ta, 1);
1290} 1404}
1291 1405
1292/** Coro ********************************************************************/ 1406/** Coro ********************************************************************/
1293 1407
1294static void 1408static void
1296{ 1410{
1297 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1411 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1298} 1412}
1299 1413
1300static SV * 1414static SV *
1301coro_deq (pTHX_ int min_prio) 1415coro_deq (pTHX)
1302{ 1416{
1303 int prio = PRIO_MAX - PRIO_MIN; 1417 int prio;
1304 1418
1305 min_prio -= PRIO_MIN;
1306 if (min_prio < 0)
1307 min_prio = 0;
1308
1309 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1419 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1310 if (AvFILLp (coro_ready [prio]) >= 0) 1420 if (AvFILLp (coro_ready [prio]) >= 0)
1311 return av_shift (coro_ready [prio]); 1421 return av_shift (coro_ready [prio]);
1312 1422
1313 return 0; 1423 return 0;
1314} 1424}
1316static int 1426static int
1317api_ready (SV *coro_sv) 1427api_ready (SV *coro_sv)
1318{ 1428{
1319 dTHX; 1429 dTHX;
1320 struct coro *coro; 1430 struct coro *coro;
1431 SV *sv_hook;
1432 void (*xs_hook)(void);
1321 1433
1322 if (SvROK (coro_sv)) 1434 if (SvROK (coro_sv))
1323 coro_sv = SvRV (coro_sv); 1435 coro_sv = SvRV (coro_sv);
1324 1436
1325 coro = SvSTATE (coro_sv); 1437 coro = SvSTATE (coro_sv);
1328 return 0; 1440 return 0;
1329 1441
1330 coro->flags |= CF_READY; 1442 coro->flags |= CF_READY;
1331 1443
1332 LOCK; 1444 LOCK;
1445
1446 sv_hook = coro_nready ? 0 : coro_readyhook;
1447 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1448
1333 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1449 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1334 ++coro_nready; 1450 ++coro_nready;
1451
1335 UNLOCK; 1452 UNLOCK;
1453
1454 if (sv_hook)
1455 {
1456 dSP;
1457
1458 ENTER;
1459 SAVETMPS;
1460
1461 PUSHMARK (SP);
1462 PUTBACK;
1463 call_sv (sv_hook, G_DISCARD);
1464 SPAGAIN;
1465
1466 FREETMPS;
1467 LEAVE;
1468 }
1469
1470 if (xs_hook)
1471 xs_hook ();
1336 1472
1337 return 1; 1473 return 1;
1338} 1474}
1339 1475
1340static int 1476static int
1350 SV *prev_sv, *next_sv; 1486 SV *prev_sv, *next_sv;
1351 1487
1352 for (;;) 1488 for (;;)
1353 { 1489 {
1354 LOCK; 1490 LOCK;
1355 next_sv = coro_deq (aTHX_ PRIO_MIN); 1491 next_sv = coro_deq (aTHX);
1356 1492
1357 /* nothing to schedule: call the idle handler */ 1493 /* nothing to schedule: call the idle handler */
1358 if (expect_false (!next_sv)) 1494 if (expect_false (!next_sv))
1359 { 1495 {
1360 dSP; 1496 dSP;
1364 SAVETMPS; 1500 SAVETMPS;
1365 1501
1366 PUSHMARK (SP); 1502 PUSHMARK (SP);
1367 PUTBACK; 1503 PUTBACK;
1368 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1504 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1505 SPAGAIN;
1369 1506
1370 FREETMPS; 1507 FREETMPS;
1371 LEAVE; 1508 LEAVE;
1372 continue; 1509 continue;
1373 } 1510 }
1428{ 1565{
1429 dTHX; 1566 dTHX;
1430 struct transfer_args ta; 1567 struct transfer_args ta;
1431 1568
1432 prepare_schedule (aTHX_ &ta); 1569 prepare_schedule (aTHX_ &ta);
1433 TRANSFER (ta); 1570 TRANSFER (ta, 1);
1434} 1571}
1435 1572
1436static int 1573static int
1437api_cede (void) 1574api_cede (void)
1438{ 1575{
1441 1578
1442 prepare_cede (aTHX_ &ta); 1579 prepare_cede (aTHX_ &ta);
1443 1580
1444 if (expect_true (ta.prev != ta.next)) 1581 if (expect_true (ta.prev != ta.next))
1445 { 1582 {
1446 TRANSFER (ta); 1583 TRANSFER (ta, 1);
1447 return 1; 1584 return 1;
1448 } 1585 }
1449 else 1586 else
1450 return 0; 1587 return 0;
1451} 1588}
1456 dTHX; 1593 dTHX;
1457 struct transfer_args ta; 1594 struct transfer_args ta;
1458 1595
1459 if (prepare_cede_notself (aTHX_ &ta)) 1596 if (prepare_cede_notself (aTHX_ &ta))
1460 { 1597 {
1461 TRANSFER (ta); 1598 TRANSFER (ta, 1);
1462 return 1; 1599 return 1;
1463 } 1600 }
1464 else 1601 else
1465 return 0; 1602 return 0;
1466} 1603}
1489 else 1626 else
1490 coro->slot->runops = RUNOPS_DEFAULT; 1627 coro->slot->runops = RUNOPS_DEFAULT;
1491 } 1628 }
1492} 1629}
1493 1630
1631static int
1632coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1633{
1634 AV *padlist;
1635 AV *av = (AV *)mg->mg_obj;
1636
1637 abort ();
1638
1639 return 0;
1640}
1641
1642static MGVTBL coro_gensub_vtbl = {
1643 0, 0, 0, 0,
1644 coro_gensub_free
1645};
1646
1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1647MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1495 1648
1496PROTOTYPES: DISABLE 1649PROTOTYPES: DISABLE
1497 1650
1498BOOT: 1651BOOT:
1503 BOOT_PAGESIZE; 1656 BOOT_PAGESIZE;
1504 1657
1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1658 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1659 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507 1660
1661 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1662 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1663 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1664
1508 hv_sig = coro_get_hv ("SIG", TRUE); 1665 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1666 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1667 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1511
1512 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1513 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1514 1668
1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1669 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1516 1670
1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1671 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1672 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1523 main_top_env = PL_top_env; 1677 main_top_env = PL_top_env;
1524 1678
1525 while (main_top_env->je_prev) 1679 while (main_top_env->je_prev)
1526 main_top_env = main_top_env->je_prev; 1680 main_top_env = main_top_env->je_prev;
1527 1681
1528 coroapi.ver = CORO_API_VERSION; 1682 coroapi.ver = CORO_API_VERSION;
1683 coroapi.rev = CORO_API_REVISION;
1529 coroapi.transfer = api_transfer; 1684 coroapi.transfer = api_transfer;
1530 1685
1531 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1686 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1532} 1687}
1533 1688
1534SV * 1689SV *
1535new (char *klass, ...) 1690new (char *klass, ...)
1536 CODE: 1691 CODE:
1537{ 1692{
1538 struct coro *coro; 1693 struct coro *coro;
1694 MAGIC *mg;
1539 HV *hv; 1695 HV *hv;
1540 int i; 1696 int i;
1541 1697
1542 Newz (0, coro, 1, struct coro); 1698 Newz (0, coro, 1, struct coro);
1543 coro->args = newAV (); 1699 coro->args = newAV ();
1546 if (coro_first) coro_first->prev = coro; 1702 if (coro_first) coro_first->prev = coro;
1547 coro->next = coro_first; 1703 coro->next = coro_first;
1548 coro_first = coro; 1704 coro_first = coro;
1549 1705
1550 coro->hv = hv = newHV (); 1706 coro->hv = hv = newHV ();
1551 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1707 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1708 mg->mg_flags |= MGf_DUP;
1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1709 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1553 1710
1554 av_extend (coro->args, items - 1); 1711 av_extend (coro->args, items - 1);
1555 for (i = 1; i < items; i++) 1712 for (i = 1; i < items; i++)
1556 av_push (coro->args, newSVsv (ST (i))); 1713 av_push (coro->args, newSVsv (ST (i)));
1570 Coro::cede_notself = 4 1727 Coro::cede_notself = 4
1571 CODE: 1728 CODE:
1572{ 1729{
1573 struct transfer_args ta; 1730 struct transfer_args ta;
1574 1731
1732 PUTBACK;
1575 switch (ix) 1733 switch (ix)
1576 { 1734 {
1577 case 0: 1735 case 0:
1578 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1736 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1579 ta.next = 0; 1737 ta.next = 0;
1598 if (!prepare_cede_notself (aTHX_ &ta)) 1756 if (!prepare_cede_notself (aTHX_ &ta))
1599 XSRETURN_EMPTY; 1757 XSRETURN_EMPTY;
1600 1758
1601 break; 1759 break;
1602 } 1760 }
1761 SPAGAIN;
1603 1762
1604 BARRIER; 1763 BARRIER;
1764 PUTBACK;
1605 TRANSFER (ta); 1765 TRANSFER (ta, 0);
1606 1766 SPAGAIN; /* might be the sp of a different coroutine now */
1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1767 /* be extra careful not to ever do anything after TRANSFER */
1608 XSRETURN_YES;
1609} 1768}
1610 1769
1611bool 1770bool
1612_destroy (SV *coro_sv) 1771_destroy (SV *coro_sv)
1613 CODE: 1772 CODE:
1614 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1773 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1615 OUTPUT: 1774 OUTPUT:
1616 RETVAL 1775 RETVAL
1617 1776
1618void 1777void
1619_exit (code) 1778_exit (int code)
1620 int code
1621 PROTOTYPE: $ 1779 PROTOTYPE: $
1622 CODE: 1780 CODE:
1623 _exit (code); 1781 _exit (code);
1624 1782
1625int 1783int
1665 { 1823 {
1666 struct coro temp; 1824 struct coro temp;
1667 1825
1668 if (!(coro->flags & CF_RUNNING)) 1826 if (!(coro->flags & CF_RUNNING))
1669 { 1827 {
1828 PUTBACK;
1670 save_perl (aTHX_ &temp); 1829 save_perl (aTHX_ &temp);
1671 load_perl (aTHX_ coro); 1830 load_perl (aTHX_ coro);
1672 } 1831 }
1673 1832
1674 { 1833 {
1675 dSP; 1834 dSP;
1676 ENTER; 1835 ENTER;
1677 SAVETMPS; 1836 SAVETMPS;
1837 PUTBACK;
1838 PUSHSTACK;
1678 PUSHMARK (SP); 1839 PUSHMARK (SP);
1679 PUTBACK;
1680 1840
1681 if (ix) 1841 if (ix)
1682 eval_sv (coderef, 0); 1842 eval_sv (coderef, 0);
1683 else 1843 else
1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1844 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685 1845
1846 POPSTACK;
1686 SPAGAIN; 1847 SPAGAIN;
1687 FREETMPS; 1848 FREETMPS;
1688 LEAVE; 1849 LEAVE;
1689 PUTBACK; 1850 PUTBACK;
1690 } 1851 }
1691 1852
1692 if (!(coro->flags & CF_RUNNING)) 1853 if (!(coro->flags & CF_RUNNING))
1693 { 1854 {
1694 save_perl (aTHX_ coro); 1855 save_perl (aTHX_ coro);
1695 load_perl (aTHX_ &temp); 1856 load_perl (aTHX_ &temp);
1857 SPAGAIN;
1696 } 1858 }
1697 } 1859 }
1698} 1860}
1699 1861
1700SV * 1862SV *
1712 1874
1713void 1875void
1714api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1876api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1715 1877
1716SV * 1878SV *
1717has_stack (Coro::State coro) 1879has_cctx (Coro::State coro)
1718 PROTOTYPE: $ 1880 PROTOTYPE: $
1719 CODE: 1881 CODE:
1720 RETVAL = boolSV (!!coro->cctx); 1882 RETVAL = boolSV (!!coro->cctx);
1721 OUTPUT: 1883 OUTPUT:
1722 RETVAL 1884 RETVAL
1741 case 1: RETVAL = coro->usecount; break; 1903 case 1: RETVAL = coro->usecount; break;
1742 } 1904 }
1743 OUTPUT: 1905 OUTPUT:
1744 RETVAL 1906 RETVAL
1745 1907
1908void
1909force_cctx ()
1910 CODE:
1911 struct coro *coro = SvSTATE (coro_current);
1912 coro->cctx->idle_sp = 0;
1913
1914void
1915throw (Coro::State self, SV *throw = &PL_sv_undef)
1916 PROTOTYPE: $;$
1917 CODE:
1918 SvREFCNT_dec (self->throw);
1919 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1920
1921void
1922swap_defsv (Coro::State self)
1923 PROTOTYPE: $
1924 ALIAS:
1925 swap_defav = 1
1926 CODE:
1927 if (!self->slot)
1928 croak ("cannot swap state with coroutine that has no saved state");
1929 else
1930 {
1931 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1932 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1933
1934 SV *tmp = *src; *src = *dst; *dst = tmp;
1935 }
1746 1936
1747MODULE = Coro::State PACKAGE = Coro 1937MODULE = Coro::State PACKAGE = Coro
1748 1938
1749BOOT: 1939BOOT:
1750{ 1940{
1751 int i; 1941 int i;
1752 1942
1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1943 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1756 1946
1757 coro_current = coro_get_sv ("Coro::current", FALSE); 1947 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1758 SvREADONLY_on (coro_current); 1948 SvREADONLY_on (coro_current);
1759 1949
1760 coro_stash = gv_stashpv ("Coro", TRUE); 1950 coro_stash = gv_stashpv ("Coro", TRUE);
1761 1951
1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1792 PROTOTYPE: $ 1982 PROTOTYPE: $
1793 CODE: 1983 CODE:
1794 SvREFCNT_dec (SvRV (coro_current)); 1984 SvREFCNT_dec (SvRV (coro_current));
1795 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1985 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1796 1986
1987void
1988_set_readyhook (SV *hook)
1989 PROTOTYPE: $
1990 CODE:
1991 LOCK;
1992 SvREFCNT_dec (coro_readyhook);
1993 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1994 UNLOCK;
1995
1797int 1996int
1798prio (Coro::State coro, int newprio = 0) 1997prio (Coro::State coro, int newprio = 0)
1799 ALIAS: 1998 ALIAS:
1800 nice = 1 1999 nice = 1
1801 CODE: 2000 CODE:
1830 CODE: 2029 CODE:
1831 RETVAL = coro_nready; 2030 RETVAL = coro_nready;
1832 OUTPUT: 2031 OUTPUT:
1833 RETVAL 2032 RETVAL
1834 2033
1835void
1836throw (Coro::State self, SV *throw = &PL_sv_undef)
1837 PROTOTYPE: $;$
1838 CODE:
1839 SvREFCNT_dec (self->throw);
1840 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1841
1842# for async_pool speedup 2034# for async_pool speedup
1843void 2035void
1844_pool_1 (SV *cb) 2036_pool_1 (SV *cb)
1845 CODE: 2037 CODE:
1846{ 2038{
1847 struct coro *coro = SvSTATE (coro_current); 2039 struct coro *coro = SvSTATE (coro_current);
1848 HV *hv = (HV *)SvRV (coro_current); 2040 HV *hv = (HV *)SvRV (coro_current);
1849 AV *defav = GvAV (PL_defgv); 2041 AV *defav = GvAV (PL_defgv);
1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2042 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1851 AV *invoke_av; 2043 AV *invoke_av;
1852 int i, len; 2044 int i, len;
1853 2045
1854 if (!invoke) 2046 if (!invoke)
2047 {
2048 SV *old = PL_diehook;
2049 PL_diehook = 0;
2050 SvREFCNT_dec (old);
1855 croak ("\3async_pool terminate\2\n"); 2051 croak ("\3async_pool terminate\2\n");
2052 }
1856 2053
1857 SvREFCNT_dec (coro->saved_deffh); 2054 SvREFCNT_dec (coro->saved_deffh);
1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2055 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1859 2056
1860 hv_store (hv, "desc", sizeof ("desc") - 1, 2057 hv_store (hv, "desc", sizeof ("desc") - 1,
1861 newSVpvn (strpair ("[async_pool]")), 0); 2058 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1862 2059
1863 invoke_av = (AV *)SvRV (invoke); 2060 invoke_av = (AV *)SvRV (invoke);
1864 len = av_len (invoke_av); 2061 len = av_len (invoke_av);
1865 2062
1866 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2063 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2083 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1887 coro->saved_deffh = 0; 2084 coro->saved_deffh = 0;
1888 2085
1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2086 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2087 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2088 {
2089 SV *old = PL_diehook;
2090 PL_diehook = 0;
2091 SvREFCNT_dec (old);
1891 croak ("\3async_pool terminate\2\n"); 2092 croak ("\3async_pool terminate\2\n");
2093 }
1892 2094
1893 av_clear (GvAV (PL_defgv)); 2095 av_clear (GvAV (PL_defgv));
1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2096 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1895 newSVpvn (strpair ("[async_pool idle]")), 0); 2097 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1896 2098
1897 coro->prio = 0; 2099 coro->prio = 0;
1898 2100
1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2101 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1900 api_trace (coro_current, 0); 2102 api_trace (coro_current, 0);
1901 2103
1902 av_push (av_async_pool, newSVsv (coro_current)); 2104 av_push (av_async_pool, newSVsv (coro_current));
1903} 2105}
2106
2107#if 0
2108
2109void
2110_generator_call (...)
2111 PROTOTYPE: @
2112 PPCODE:
2113 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2114 xxxx
2115 abort ();
2116
2117SV *
2118gensub (SV *sub, ...)
2119 PROTOTYPE: &;@
2120 CODE:
2121{
2122 struct coro *coro;
2123 MAGIC *mg;
2124 CV *xcv;
2125 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2126 int i;
2127
2128 CvGV (ncv) = CvGV (cv);
2129 CvFILE (ncv) = CvFILE (cv);
2130
2131 Newz (0, coro, 1, struct coro);
2132 coro->args = newAV ();
2133 coro->flags = CF_NEW;
2134
2135 av_extend (coro->args, items - 1);
2136 for (i = 1; i < items; i++)
2137 av_push (coro->args, newSVsv (ST (i)));
2138
2139 CvISXSUB_on (ncv);
2140 CvXSUBANY (ncv).any_ptr = (void *)coro;
2141
2142 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2143
2144 CvXSUB (ncv) = CvXSUB (xcv);
2145 CvANON_on (ncv);
2146
2147 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2148 RETVAL = newRV_noinc ((SV *)ncv);
2149}
2150 OUTPUT:
2151 RETVAL
2152
2153#endif
1904 2154
1905 2155
1906MODULE = Coro::State PACKAGE = Coro::AIO 2156MODULE = Coro::State PACKAGE = Coro::AIO
1907 2157
1908SV * 2158SV *
1935 PL_laststype = data->laststype; 2185 PL_laststype = data->laststype;
1936 PL_laststatval = data->laststatval; 2186 PL_laststatval = data->laststatval;
1937 PL_statcache = data->statcache; 2187 PL_statcache = data->statcache;
1938} 2188}
1939 2189
2190
2191MODULE = Coro::State PACKAGE = Coro::AnyEvent
2192
2193BOOT:
2194 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2195
2196SV *
2197_schedule (...)
2198 PROTOTYPE: @
2199 CODE:
2200{
2201 static int incede;
2202
2203 api_cede_notself ();
2204
2205 ++incede;
2206 while (coro_nready >= incede && api_cede ())
2207 ;
2208
2209 sv_setsv (sv_activity, &PL_sv_undef);
2210 if (coro_nready >= incede)
2211 {
2212 PUSHMARK (SP);
2213 PUTBACK;
2214 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2215 SPAGAIN;
2216 }
2217
2218 --incede;
2219}
2220

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines