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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines