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.202 by root, Mon Oct 8 02:50:23 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);
452 GvSV (irsgv) = slot->irsgv; 469 GvSV (irsgv) = slot->irsgv;
453 470
454 #define VAR(name,type) PL_ ## name = slot->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 472 # include "state.h"
456 #undef VAR 473 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
460 474
461 { 475 {
462 dSP; 476 dSP;
463 477
464 CV *cv; 478 CV *cv;
503 517
504 if (expect_true (CvDEPTH (cv))) 518 if (expect_true (CvDEPTH (cv)))
505 { 519 {
506 EXTEND (SP, 3); 520 EXTEND (SP, 3);
507 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
508 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
509 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
510 524
511 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
512 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
513 } 527 }
557 * allocate various perl stacks. This is an exact copy 571 * allocate various perl stacks. This is an exact copy
558 * of perl.c:init_stacks, except that it uses less memory 572 * of perl.c:init_stacks, except that it uses less memory
559 * on the (sometimes correct) assumption that coroutines do 573 * on the (sometimes correct) assumption that coroutines do
560 * not usually need a lot of stackspace. 574 * not usually need a lot of stackspace.
561 */ 575 */
562#if 1 576#if CORO_PREFER_PERL_FUNCTIONS
563# define coro_init_stacks init_stacks 577# define coro_init_stacks init_stacks
564#else 578#else
565static void 579static void
566coro_init_stacks (pTHX) 580coro_init_stacks (pTHX)
567{ 581{
593 607
594 New(54,PL_savestack,24,ANY); 608 New(54,PL_savestack,24,ANY);
595 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
596 PL_savestack_max = 24; 610 PL_savestack_max = 24;
597 611
598#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
599 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
600 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
601 PL_retstack_max = 4; 615 PL_retstack_max = 4;
602#endif 616#endif
603} 617}
626 640
627 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
628 Safefree (PL_markstack); 642 Safefree (PL_markstack);
629 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
630 Safefree (PL_savestack); 644 Safefree (PL_savestack);
631#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
632 Safefree (PL_retstack); 646 Safefree (PL_retstack);
633#endif 647#endif
634} 648}
635 649
636static size_t 650static size_t
652 #undef VAR 666 #undef VAR
653 } 667 }
654 else 668 else
655 slot = coro->slot; 669 slot = coro->slot;
656 670
671 if (slot)
672 {
657 rss += sizeof (slot->curstackinfo); 673 rss += sizeof (slot->curstackinfo);
658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 674 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
659 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 *);
660 rss += slot->tmps_max * sizeof (SV *); 676 rss += slot->tmps_max * sizeof (SV *);
661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 677 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
662 rss += slot->scopestack_max * sizeof (I32); 678 rss += slot->scopestack_max * sizeof (I32);
663 rss += slot->savestack_max * sizeof (ANY); 679 rss += slot->savestack_max * sizeof (ANY);
664 680
665#if !PERL_VERSION_ATLEAST (5,9,0) 681#if !PERL_VERSION_ATLEAST (5,10,0)
666 rss += slot->retstack_max * sizeof (OP *); 682 rss += slot->retstack_max * sizeof (OP *);
667#endif 683#endif
684 }
668 } 685 }
669 686
670 return rss; 687 return rss;
671} 688}
672 689
673/** 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}
674 781
675static void 782static void
676coro_setup (pTHX_ struct coro *coro) 783coro_setup (pTHX_ struct coro *coro)
677{ 784{
678 /* 785 /*
687 PL_curpm = 0; 794 PL_curpm = 0;
688 PL_curpad = 0; 795 PL_curpad = 0;
689 PL_localizing = 0; 796 PL_localizing = 0;
690 PL_dirty = 0; 797 PL_dirty = 0;
691 PL_restartop = 0; 798 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 799#if PERL_VERSION_ATLEAST (5,10,0)
693 PL_warnhook = 0; 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);
694 806
695 GvSV (PL_defgv) = newSV (0); 807 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 808 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 809 GvSV (PL_errgv) = newSV (0);
698 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);
713 PL_op = (OP *)&myop; 825 PL_op = (OP *)&myop;
714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 826 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
715 SPAGAIN; 827 SPAGAIN;
716 } 828 }
717 829
718 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;
719} 836}
720 837
721static void 838static void
722coro_destroy (pTHX_ struct coro *coro) 839coro_destroy (pTHX_ struct coro *coro)
723{ 840{
807 PUSHMARK (SP); 924 PUSHMARK (SP);
808 PUSHs (&PL_sv_no); 925 PUSHs (&PL_sv_no);
809 PUSHs (fullname); 926 PUSHs (fullname);
810 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 927 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
811 PUTBACK; 928 PUTBACK;
812 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);
813 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);
814 SPAGAIN; 931 SPAGAIN;
815 FREETMPS; 932 FREETMPS;
816 LEAVE; 933 LEAVE;
817 PL_runops = runops_trace; 934 PL_runops = runops_trace;
844 SAVETMPS; 961 SAVETMPS;
845 EXTEND (SP, 3); 962 EXTEND (SP, 3);
846 PUSHMARK (SP); 963 PUSHMARK (SP);
847 PUSHs (&PL_sv_yes); 964 PUSHs (&PL_sv_yes);
848 PUSHs (fullname); 965 PUSHs (fullname);
849 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);
850 PUTBACK; 967 PUTBACK;
851 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);
852 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);
853 SPAGAIN; 970 SPAGAIN;
854 FREETMPS; 971 FREETMPS;
855 LEAVE; 972 LEAVE;
856 PL_runops = runops_trace; 973 PL_runops = runops_trace;
870 PL_runops = RUNOPS_DEFAULT; 987 PL_runops = RUNOPS_DEFAULT;
871 PUSHMARK (SP); 988 PUSHMARK (SP);
872 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 989 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
873 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 990 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
874 PUTBACK; 991 PUTBACK;
875 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);
876 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);
877 SPAGAIN; 994 SPAGAIN;
878 FREETMPS; 995 FREETMPS;
879 LEAVE; 996 LEAVE;
880 PL_runops = runops_trace; 997 PL_runops = runops_trace;
1070 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");
1071 1188
1072 if (expect_false (next->flags & CF_DESTROYED)) 1189 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"); 1190 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1074 1191
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0) 1192#if !PERL_VERSION_ATLEAST (5,10,0)
1077 expect_false (PL_parser)
1078#else
1079 expect_false (PL_lex_state != LEX_NOTPARSING) 1193 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1080#endif
1081 )
1082 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
1083 } 1196 }
1084} 1197}
1085 1198
1086/* always use the TRANSFER macro */ 1199/* always use the TRANSFER macro */
1087static void NOINLINE 1200static void NOINLINE
1088transfer (pTHX_ struct coro *prev, struct coro *next) 1201transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1089{ 1202{
1090 dSTACKLEVEL; 1203 dSTACKLEVEL;
1204 static volatile int has_throw;
1091 1205
1092 /* sometimes transfer is only called to set idle_sp */ 1206 /* sometimes transfer is only called to set idle_sp */
1093 if (expect_false (!next)) 1207 if (expect_false (!next))
1094 { 1208 {
1095 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1209 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1110 prev->flags &= ~CF_RUNNING; 1224 prev->flags &= ~CF_RUNNING;
1111 next->flags |= CF_RUNNING; 1225 next->flags |= CF_RUNNING;
1112 1226
1113 LOCK; 1227 LOCK;
1114 1228
1229 /* first get rid of the old state */
1230 save_perl (aTHX_ prev);
1231
1115 if (expect_false (next->flags & CF_NEW)) 1232 if (expect_false (next->flags & CF_NEW))
1116 { 1233 {
1117 /* need to start coroutine */ 1234 /* need to start coroutine */
1118 next->flags &= ~CF_NEW; 1235 next->flags &= ~CF_NEW;
1119 /* first get rid of the old state */
1120 save_perl (aTHX_ prev);
1121 /* setup coroutine call */ 1236 /* setup coroutine call */
1122 coro_setup (aTHX_ next); 1237 coro_setup (aTHX_ next);
1123 } 1238 }
1124 else 1239 else
1125 {
1126 /* coroutine already started */
1127 save_perl (aTHX_ prev);
1128 load_perl (aTHX_ next); 1240 load_perl (aTHX_ next);
1129 }
1130 1241
1131 prev__cctx = prev->cctx; 1242 prev__cctx = prev->cctx;
1132 1243
1133 /* possibly "free" the cctx */ 1244 /* possibly "free" the cctx */
1134 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 ))
1135 { 1250 {
1136 /* 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 */
1137 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));
1138 1253
1139 prev->cctx = 0; 1254 prev->cctx = 0;
1149 1264
1150 ++next->usecount; 1265 ++next->usecount;
1151 1266
1152 if (expect_true (!next->cctx)) 1267 if (expect_true (!next->cctx))
1153 next->cctx = cctx_get (aTHX); 1268 next->cctx = cctx_get (aTHX);
1269
1270 has_throw = !!next->throw;
1154 1271
1155 if (expect_false (prev__cctx != next->cctx)) 1272 if (expect_false (prev__cctx != next->cctx))
1156 { 1273 {
1157 prev__cctx->top_env = PL_top_env; 1274 prev__cctx->top_env = PL_top_env;
1158 PL_top_env = next->cctx->top_env; 1275 PL_top_env = next->cctx->top_env;
1160 } 1277 }
1161 1278
1162 free_coro_mortal (aTHX); 1279 free_coro_mortal (aTHX);
1163 UNLOCK; 1280 UNLOCK;
1164 1281
1165 if (expect_false (prev->throw || next->throw)) 1282 if (expect_false (has_throw))
1166 { 1283 {
1167 struct coro *coro = SvSTATE (coro_current); 1284 struct coro *coro = SvSTATE (coro_current);
1168 1285
1169 if (coro->throw) 1286 if (coro->throw)
1170 { 1287 {
1180struct transfer_args 1297struct transfer_args
1181{ 1298{
1182 struct coro *prev, *next; 1299 struct coro *prev, *next;
1183}; 1300};
1184 1301
1185#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1302#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) 1303#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1187 1304
1188/** high level stuff ********************************************************/ 1305/** high level stuff ********************************************************/
1189 1306
1190static int 1307static int
1284{ 1401{
1285 dTHX; 1402 dTHX;
1286 struct transfer_args ta; 1403 struct transfer_args ta;
1287 1404
1288 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1405 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1289 TRANSFER (ta); 1406 TRANSFER (ta, 1);
1290} 1407}
1291 1408
1292/** Coro ********************************************************************/ 1409/** Coro ********************************************************************/
1293 1410
1294static void 1411static void
1296{ 1413{
1297 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);
1298} 1415}
1299 1416
1300static SV * 1417static SV *
1301coro_deq (pTHX_ int min_prio) 1418coro_deq (pTHX)
1302{ 1419{
1303 int prio = PRIO_MAX - PRIO_MIN; 1420 int prio;
1304 1421
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; ) 1422 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1310 if (AvFILLp (coro_ready [prio]) >= 0) 1423 if (AvFILLp (coro_ready [prio]) >= 0)
1311 return av_shift (coro_ready [prio]); 1424 return av_shift (coro_ready [prio]);
1312 1425
1313 return 0; 1426 return 0;
1314} 1427}
1316static int 1429static int
1317api_ready (SV *coro_sv) 1430api_ready (SV *coro_sv)
1318{ 1431{
1319 dTHX; 1432 dTHX;
1320 struct coro *coro; 1433 struct coro *coro;
1434 SV *sv_hook;
1435 void (*xs_hook)(void);
1321 1436
1322 if (SvROK (coro_sv)) 1437 if (SvROK (coro_sv))
1323 coro_sv = SvRV (coro_sv); 1438 coro_sv = SvRV (coro_sv);
1324 1439
1325 coro = SvSTATE (coro_sv); 1440 coro = SvSTATE (coro_sv);
1328 return 0; 1443 return 0;
1329 1444
1330 coro->flags |= CF_READY; 1445 coro->flags |= CF_READY;
1331 1446
1332 LOCK; 1447 LOCK;
1448
1449 sv_hook = coro_nready ? 0 : coro_readyhook;
1450 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1451
1333 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1452 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1334 ++coro_nready; 1453 ++coro_nready;
1454
1335 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 ();
1336 1475
1337 return 1; 1476 return 1;
1338} 1477}
1339 1478
1340static int 1479static int
1350 SV *prev_sv, *next_sv; 1489 SV *prev_sv, *next_sv;
1351 1490
1352 for (;;) 1491 for (;;)
1353 { 1492 {
1354 LOCK; 1493 LOCK;
1355 next_sv = coro_deq (aTHX_ PRIO_MIN); 1494 next_sv = coro_deq (aTHX);
1356 1495
1357 /* nothing to schedule: call the idle handler */ 1496 /* nothing to schedule: call the idle handler */
1358 if (expect_false (!next_sv)) 1497 if (expect_false (!next_sv))
1359 { 1498 {
1360 dSP; 1499 dSP;
1364 SAVETMPS; 1503 SAVETMPS;
1365 1504
1366 PUSHMARK (SP); 1505 PUSHMARK (SP);
1367 PUTBACK; 1506 PUTBACK;
1368 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1507 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1508 SPAGAIN;
1369 1509
1370 FREETMPS; 1510 FREETMPS;
1371 LEAVE; 1511 LEAVE;
1372 continue; 1512 continue;
1373 } 1513 }
1428{ 1568{
1429 dTHX; 1569 dTHX;
1430 struct transfer_args ta; 1570 struct transfer_args ta;
1431 1571
1432 prepare_schedule (aTHX_ &ta); 1572 prepare_schedule (aTHX_ &ta);
1433 TRANSFER (ta); 1573 TRANSFER (ta, 1);
1434} 1574}
1435 1575
1436static int 1576static int
1437api_cede (void) 1577api_cede (void)
1438{ 1578{
1441 1581
1442 prepare_cede (aTHX_ &ta); 1582 prepare_cede (aTHX_ &ta);
1443 1583
1444 if (expect_true (ta.prev != ta.next)) 1584 if (expect_true (ta.prev != ta.next))
1445 { 1585 {
1446 TRANSFER (ta); 1586 TRANSFER (ta, 1);
1447 return 1; 1587 return 1;
1448 } 1588 }
1449 else 1589 else
1450 return 0; 1590 return 0;
1451} 1591}
1456 dTHX; 1596 dTHX;
1457 struct transfer_args ta; 1597 struct transfer_args ta;
1458 1598
1459 if (prepare_cede_notself (aTHX_ &ta)) 1599 if (prepare_cede_notself (aTHX_ &ta))
1460 { 1600 {
1461 TRANSFER (ta); 1601 TRANSFER (ta, 1);
1462 return 1; 1602 return 1;
1463 } 1603 }
1464 else 1604 else
1465 return 0; 1605 return 0;
1466} 1606}
1489 else 1629 else
1490 coro->slot->runops = RUNOPS_DEFAULT; 1630 coro->slot->runops = RUNOPS_DEFAULT;
1491 } 1631 }
1492} 1632}
1493 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
1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1495 1651
1496PROTOTYPES: DISABLE 1652PROTOTYPES: DISABLE
1497 1653
1498BOOT: 1654BOOT:
1503 BOOT_PAGESIZE; 1659 BOOT_PAGESIZE;
1504 1660
1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1661 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1662 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507 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
1508 hv_sig = coro_get_hv ("SIG", TRUE); 1668 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1670 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 1671
1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1516 1673
1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1674 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1675 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1523 main_top_env = PL_top_env; 1680 main_top_env = PL_top_env;
1524 1681
1525 while (main_top_env->je_prev) 1682 while (main_top_env->je_prev)
1526 main_top_env = main_top_env->je_prev; 1683 main_top_env = main_top_env->je_prev;
1527 1684
1528 coroapi.ver = CORO_API_VERSION; 1685 coroapi.ver = CORO_API_VERSION;
1686 coroapi.rev = CORO_API_REVISION;
1529 coroapi.transfer = api_transfer; 1687 coroapi.transfer = api_transfer;
1530 1688
1531 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1689 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1532} 1690}
1533 1691
1534SV * 1692SV *
1535new (char *klass, ...) 1693new (char *klass, ...)
1536 CODE: 1694 CODE:
1537{ 1695{
1538 struct coro *coro; 1696 struct coro *coro;
1697 MAGIC *mg;
1539 HV *hv; 1698 HV *hv;
1540 int i; 1699 int i;
1541 1700
1542 Newz (0, coro, 1, struct coro); 1701 Newz (0, coro, 1, struct coro);
1543 coro->args = newAV (); 1702 coro->args = newAV ();
1546 if (coro_first) coro_first->prev = coro; 1705 if (coro_first) coro_first->prev = coro;
1547 coro->next = coro_first; 1706 coro->next = coro_first;
1548 coro_first = coro; 1707 coro_first = coro;
1549 1708
1550 coro->hv = hv = newHV (); 1709 coro->hv = hv = newHV ();
1551 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;
1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1712 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1553 1713
1554 av_extend (coro->args, items - 1); 1714 av_extend (coro->args, items - 1);
1555 for (i = 1; i < items; i++) 1715 for (i = 1; i < items; i++)
1556 av_push (coro->args, newSVsv (ST (i))); 1716 av_push (coro->args, newSVsv (ST (i)));
1570 Coro::cede_notself = 4 1730 Coro::cede_notself = 4
1571 CODE: 1731 CODE:
1572{ 1732{
1573 struct transfer_args ta; 1733 struct transfer_args ta;
1574 1734
1735 PUTBACK;
1575 switch (ix) 1736 switch (ix)
1576 { 1737 {
1577 case 0: 1738 case 0:
1578 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1739 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1579 ta.next = 0; 1740 ta.next = 0;
1598 if (!prepare_cede_notself (aTHX_ &ta)) 1759 if (!prepare_cede_notself (aTHX_ &ta))
1599 XSRETURN_EMPTY; 1760 XSRETURN_EMPTY;
1600 1761
1601 break; 1762 break;
1602 } 1763 }
1764 SPAGAIN;
1603 1765
1604 BARRIER; 1766 BARRIER;
1767 PUTBACK;
1605 TRANSFER (ta); 1768 TRANSFER (ta, 0);
1606 1769 SPAGAIN; /* might be the sp of a different coroutine now */
1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1770 /* be extra careful not to ever do anything after TRANSFER */
1608 XSRETURN_YES;
1609} 1771}
1610 1772
1611bool 1773bool
1612_destroy (SV *coro_sv) 1774_destroy (SV *coro_sv)
1613 CODE: 1775 CODE:
1614 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1776 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1615 OUTPUT: 1777 OUTPUT:
1616 RETVAL 1778 RETVAL
1617 1779
1618void 1780void
1619_exit (code) 1781_exit (int code)
1620 int code
1621 PROTOTYPE: $ 1782 PROTOTYPE: $
1622 CODE: 1783 CODE:
1623 _exit (code); 1784 _exit (code);
1624 1785
1625int 1786int
1659call (Coro::State coro, SV *coderef) 1820call (Coro::State coro, SV *coderef)
1660 ALIAS: 1821 ALIAS:
1661 eval = 1 1822 eval = 1
1662 CODE: 1823 CODE:
1663{ 1824{
1664 if (coro->mainstack) 1825 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1665 { 1826 {
1666 struct coro temp; 1827 struct coro temp;
1667 1828
1668 if (!(coro->flags & CF_RUNNING)) 1829 if (!(coro->flags & CF_RUNNING))
1669 { 1830 {
1831 PUTBACK;
1670 save_perl (aTHX_ &temp); 1832 save_perl (aTHX_ &temp);
1671 load_perl (aTHX_ coro); 1833 load_perl (aTHX_ coro);
1672 } 1834 }
1673 1835
1674 { 1836 {
1675 dSP; 1837 dSP;
1676 ENTER; 1838 ENTER;
1677 SAVETMPS; 1839 SAVETMPS;
1840 PUTBACK;
1841 PUSHSTACK;
1678 PUSHMARK (SP); 1842 PUSHMARK (SP);
1679 PUTBACK;
1680 1843
1681 if (ix) 1844 if (ix)
1682 eval_sv (coderef, 0); 1845 eval_sv (coderef, 0);
1683 else 1846 else
1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1847 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685 1848
1849 POPSTACK;
1686 SPAGAIN; 1850 SPAGAIN;
1687 FREETMPS; 1851 FREETMPS;
1688 LEAVE; 1852 LEAVE;
1689 PUTBACK; 1853 PUTBACK;
1690 } 1854 }
1691 1855
1692 if (!(coro->flags & CF_RUNNING)) 1856 if (!(coro->flags & CF_RUNNING))
1693 { 1857 {
1694 save_perl (aTHX_ coro); 1858 save_perl (aTHX_ coro);
1695 load_perl (aTHX_ &temp); 1859 load_perl (aTHX_ &temp);
1860 SPAGAIN;
1696 } 1861 }
1697 } 1862 }
1698} 1863}
1699 1864
1700SV * 1865SV *
1712 1877
1713void 1878void
1714api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1879api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1715 1880
1716SV * 1881SV *
1717has_stack (Coro::State coro) 1882has_cctx (Coro::State coro)
1718 PROTOTYPE: $ 1883 PROTOTYPE: $
1719 CODE: 1884 CODE:
1720 RETVAL = boolSV (!!coro->cctx); 1885 RETVAL = boolSV (!!coro->cctx);
1721 OUTPUT: 1886 OUTPUT:
1722 RETVAL 1887 RETVAL
1741 case 1: RETVAL = coro->usecount; break; 1906 case 1: RETVAL = coro->usecount; break;
1742 } 1907 }
1743 OUTPUT: 1908 OUTPUT:
1744 RETVAL 1909 RETVAL
1745 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 }
1746 1939
1747MODULE = Coro::State PACKAGE = Coro 1940MODULE = Coro::State PACKAGE = Coro
1748 1941
1749BOOT: 1942BOOT:
1750{ 1943{
1751 int i; 1944 int i;
1752 1945
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); 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);
1756 1949
1757 coro_current = coro_get_sv ("Coro::current", FALSE); 1950 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1758 SvREADONLY_on (coro_current); 1951 SvREADONLY_on (coro_current);
1759 1952
1760 coro_stash = gv_stashpv ("Coro", TRUE); 1953 coro_stash = gv_stashpv ("Coro", TRUE);
1761 1954
1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1955 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1792 PROTOTYPE: $ 1985 PROTOTYPE: $
1793 CODE: 1986 CODE:
1794 SvREFCNT_dec (SvRV (coro_current)); 1987 SvREFCNT_dec (SvRV (coro_current));
1795 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1988 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1796 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
1797int 1999int
1798prio (Coro::State coro, int newprio = 0) 2000prio (Coro::State coro, int newprio = 0)
1799 ALIAS: 2001 ALIAS:
1800 nice = 1 2002 nice = 1
1801 CODE: 2003 CODE:
1830 CODE: 2032 CODE:
1831 RETVAL = coro_nready; 2033 RETVAL = coro_nready;
1832 OUTPUT: 2034 OUTPUT:
1833 RETVAL 2035 RETVAL
1834 2036
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 2037# for async_pool speedup
1843void 2038void
1844_pool_1 (SV *cb) 2039_pool_1 (SV *cb)
1845 CODE: 2040 CODE:
1846{ 2041{
1847 struct coro *coro = SvSTATE (coro_current); 2042 struct coro *coro = SvSTATE (coro_current);
1848 HV *hv = (HV *)SvRV (coro_current); 2043 HV *hv = (HV *)SvRV (coro_current);
1849 AV *defav = GvAV (PL_defgv); 2044 AV *defav = GvAV (PL_defgv);
1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2045 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1851 AV *invoke_av; 2046 AV *invoke_av;
1852 int i, len; 2047 int i, len;
1853 2048
1854 if (!invoke) 2049 if (!invoke)
2050 {
2051 SV *old = PL_diehook;
2052 PL_diehook = 0;
2053 SvREFCNT_dec (old);
1855 croak ("\3async_pool terminate\2\n"); 2054 croak ("\3async_pool terminate\2\n");
2055 }
1856 2056
1857 SvREFCNT_dec (coro->saved_deffh); 2057 SvREFCNT_dec (coro->saved_deffh);
1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2058 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1859 2059
1860 hv_store (hv, "desc", sizeof ("desc") - 1, 2060 hv_store (hv, "desc", sizeof ("desc") - 1,
1861 newSVpvn (strpair ("[async_pool]")), 0); 2061 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1862 2062
1863 invoke_av = (AV *)SvRV (invoke); 2063 invoke_av = (AV *)SvRV (invoke);
1864 len = av_len (invoke_av); 2064 len = av_len (invoke_av);
1865 2065
1866 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2066 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2086 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1887 coro->saved_deffh = 0; 2087 coro->saved_deffh = 0;
1888 2088
1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2089 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1890 || 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);
1891 croak ("\3async_pool terminate\2\n"); 2095 croak ("\3async_pool terminate\2\n");
2096 }
1892 2097
1893 av_clear (GvAV (PL_defgv)); 2098 av_clear (GvAV (PL_defgv));
1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2099 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1895 newSVpvn (strpair ("[async_pool idle]")), 0); 2100 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1896 2101
1897 coro->prio = 0; 2102 coro->prio = 0;
1898 2103
1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2104 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1900 api_trace (coro_current, 0); 2105 api_trace (coro_current, 0);
1901 2106
1902 av_push (av_async_pool, newSVsv (coro_current)); 2107 av_push (av_async_pool, newSVsv (coro_current));
1903} 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
1904 2157
1905 2158
1906MODULE = Coro::State PACKAGE = Coro::AIO 2159MODULE = Coro::State PACKAGE = Coro::AIO
1907 2160
1908SV * 2161SV *
1935 PL_laststype = data->laststype; 2188 PL_laststype = data->laststype;
1936 PL_laststatval = data->laststatval; 2189 PL_laststatval = data->laststatval;
1937 PL_statcache = data->statcache; 2190 PL_statcache = data->statcache;
1938} 2191}
1939 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